Skip to content

C
core
Kaydet (Commit) 6be63430 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

oox: these are expected to be UTF-8 

Change-Id: I2e9cb96948d7f990dd8be5f4505f00306fa62f8f
üst 08eaac43
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
oox/source/drawingml/customshapepresetdata.cxx
Dosyayı görüntüle @ 6be63430
......@@ -34,7 +34,7 @@ void lcl_parseAdjustmentValue(comphelper::SequenceAsVector<drawing::EnhancedCust
if (aToken.startsWith(aNamePrefix))
{
OString aName = aToken.copy(aNamePrefix.getLength(), aToken.getLength() - aNamePrefix.getLength() - strlen("\""));
aAdjustmentValue.Name = OStringToOUString(aName, RTL_TEXTENCODING_UTF8);
aAdjustmentValue.Name = OUString::fromUtf8(aName);
}
else if (aToken.startsWith(aValuePrefix))
{
......@@ -414,7 +414,7 @@ void lcl_parseEquations(comphelper::SequenceAsVector<OUString>& rEquations, cons
else if (rValue[i] == '"' && bInString)
{
bInString = false;
rEquations.push_back(OStringToOUString(rValue.copy(nStart + strlen("\""), i - nStart - strlen("\"")), RTL_TEXTENCODING_UTF8));
rEquations.push_back(OUString::fromUtf8(rValue.copy(nStart + strlen("\""), i - nStart - strlen("\""))));
}
}
}
......@@ -734,7 +734,7 @@ void CustomShapeProperties::initializePresetDataMap()
bFirst = false;
else
maPresetDataMap[StaticTokenMap::get().getTokenFromUnicode(aName)] = aPropertyMap;
aName = OStringToOUString(aLine.copy(aCommentPrefix.getLength(), aLine.getLength() - aCommentPrefix.getLength() - strlen(" */")), RTL_TEXTENCODING_UTF8);
aName = OUString::fromUtf8(aLine.copy(aCommentPrefix.getLength(), aLine.getLength() - aCommentPrefix.getLength() - strlen(" */")));
}
else
{
......
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