From 4d341228fc9988fbf22695494197ace5a342426c Mon Sep 17 00:00:00 2001 From: Matteo Casalin Date: Sun, 10 Feb 2019 16:29:42 +0100 Subject: Simplify: getToken+comparison ==> startsWith Change-Id: I69d714db155fe27c27ff1769ae5f71161d1de5cf Reviewed-on: https://gerrit.libreoffice.org/67641 Tested-by: Jenkins Reviewed-by: Matteo Casalin --- sd/source/ui/view/viewshel.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'sd/source/ui/view/viewshel.cxx') diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index c0fb2aa674a6..09af5e774e4a 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -534,17 +534,10 @@ OString ViewShell::GetTextSelection(const OString& _aMimeType, OString& rUsedMim uno::Reference xTransferable = rEditView.GetEditEngine()->CreateTransferable(rEditView.GetSelection()); // Take care of UTF-8 text here. - bool bConvert = false; - sal_Int32 nIndex = 0; OString aMimeType = _aMimeType; - if (aMimeType.getToken(0, ';', nIndex) == "text/plain") - { - if (aMimeType.getToken(0, ';', nIndex) == "charset=utf-8") - { - aMimeType = "text/plain;charset=utf-16"; - bConvert = true; - } - } + const bool bConvert{ aMimeType.startsWith("text/plain;charset=utf-8") }; + if (bConvert) + aMimeType = "text/plain;charset=utf-16"; datatransfer::DataFlavor aFlavor; aFlavor.MimeType = OUString::fromUtf8(aMimeType.getStr()); -- cgit