diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-15 15:19:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-15 16:00:52 +0100 |
| commit | 6be63430c0a73549e0e5d49f6bb4fd1573a854b1 (patch) | |
| tree | 4fd165ed3a514f8fa344527156b5877421f1270c /oox | |
| parent | 08eaac43602964029beac4e05102267bcb05c407 (diff) | |
oox: these are expected to be UTF-8
Change-Id: I2e9cb96948d7f990dd8be5f4505f00306fa62f8f
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapepresetdata.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 0eadef15cbbc..2edc40c6be99 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -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 { |