diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-17 16:37:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-17 16:39:33 +0100 |
| commit | d0ec8c49017b07862f8228c039bebe348eb28b0c (patch) | |
| tree | 2784cb46d03901cd6c411d2f70f6f243cad6d8a6 /writerfilter | |
| parent | 0f5e9170248df98ef7c7c6d475ff7d2bb9fa2214 (diff) | |
rtl::OUStringLiteral to the rescue
...for cases where ? "a" : "bb" does not work, as well as to work around the
MSVC bug for cases like ? "a" : "b".
Change-Id: Id404716047aca5cc81440f291616d92365379b8f
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 151daa8f9a17..babc26612cb1 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -5202,8 +5202,8 @@ int RTFDocumentImpl::popState() break; // not for nested group OUString str(m_aStates.top().pDestinationText->makeStringAndClear()); // dmapper expects this as a field, so let's fake something... - OUString const field = OUString::createFromAscii( - (DESTINATION_INDEXENTRY == aState.nDestinationState) ? "XE" : "TC"); + OUString const field( + (DESTINATION_INDEXENTRY == aState.nDestinationState) ? OUStringLiteral("XE") : OUStringLiteral("TC")); str = field + " \"" + str.replaceAll("\"", "\\\"") + "\""; singleChar(0x13); Mapper().utext(reinterpret_cast<sal_uInt8 const*>(str.getStr()), str.getLength()); |