[Libreoffice-commits] core.git: writerfilter/source

Caolán McNamara caolanm at redhat.com
Fri Apr 28 13:47:42 UTC 2017


 writerfilter/source/dmapper/GraphicHelpers.cxx  |    2 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |    2 +-
 writerfilter/source/rtftok/rtftokenizer.cxx     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e4ad1d174bf2f991c83aee3572d8292a15ec8d8c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 28 14:44:49 2017 +0100

    drop toString
    
    Change-Id: If32d2bb0947d13c904da9514873f33c4c2641069

diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index eae2d27ca647..2096adf802c4 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -304,7 +304,7 @@ OUString GraphicNamingHelper::NameGraphic(const OUString& rTemplate)
     {
         // Empty template: then auto-generate a unique name.
         std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()));
-        OUString aPrefix(ResId(STR_ObjNameSingulGRAF, *pResMgr).toString());
+        OUString aPrefix(ResId(STR_ObjNameSingulGRAF, *pResMgr));
         aRet += aPrefix + OUString::number(++m_nCounter);
     }
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index b700f3087d56..089c0e2a8f26 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -462,7 +462,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
                     // Set the end position only here, so later it's enough to check if that is non-zero in incrementProgress().
                     mnProgressEndPos = nValue;
                     static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
-                    OUString aDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr).toString());
+                    OUString aDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr));
                     mxStatusIndicator->start(aDocLoad, mnProgressEndPos);
                     mnPercentSize = mnProgressEndPos / 100;
                 }
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 361928e468b0..5661d4137b5b 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -66,7 +66,7 @@ RTFError RTFTokenizer::resolveParse()
     if (m_xStatusIndicator.is())
     {
         static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
-        OUString sDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr).toString());
+        OUString sDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr));
 
         sal_uInt64 const nCurrentPos = Strm().Tell();
         sal_uInt64 const nEndPos = nCurrentPos + Strm().remainingSize();


More information about the Libreoffice-commits mailing list