Kaydet (Commit) 193d4c37 authored tarafından Matteo Casalin's avatar Matteo Casalin

Revert "getToken+comparison ==> startsWith, reuse available information"

Not equivalent to original code, may cause problems in the future.

This reverts commit 0ae87659.

Change-Id: Ifbec90620168903d8d3e807f2ca6751b3a82b85f
Reviewed-on: https://gerrit.libreoffice.org/68176
Tested-by: Jenkins
Reviewed-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
üst c50357ff
......@@ -833,13 +833,20 @@ OString ScModelObj::getTextSelection(const char* pMimeType, OString& rUsedMimeTy
// Take care of UTF-8 text here.
OString aMimeType(pMimeType);
bool bConvert{ aMimeType.startsWith("text/plain;charset=utf-8") };
if (bConvert)
aMimeType = "text/plain;charset=utf-16";
bool bConvert = false;
sal_Int32 nIndex = 0;
if (aMimeType.getToken(0, ';', nIndex) == "text/plain")
{
if (aMimeType.getToken(0, ';', nIndex) == "charset=utf-8")
{
aMimeType = "text/plain;charset=utf-16";
bConvert = true;
}
}
datatransfer::DataFlavor aFlavor;
aFlavor.MimeType = OUString::fromUtf8(aMimeType.getStr());
if (bConvert || aMimeType == "text/plain;charset=utf-16")
if (aMimeType == "text/plain;charset=utf-16")
aFlavor.DataType = cppu::UnoType<OUString>::get();
else
aFlavor.DataType = cppu::UnoType< uno::Sequence<sal_Int8> >::get();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment