diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 16:48:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:33:57 +0100 |
| commit | 62128cda92ee3355d43e959e96028b993a38162f (patch) | |
| tree | f50169071be182abe03f4180686dab387cc46808 /sd | |
| parent | 9ef0c8b2d59105e6a9dd7d6f4ed6942bc4745ef8 (diff) | |
Strength-reduce some OUStringToOString("..."+...)
...to "..."+OUStringToOString(...), in preparation of making OUStringToOString
take a std::u16string_view
Change-Id: Ic01ca249d4d0eb58ac959ffdf96471308a3715dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107600
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 5 | ||||
| -rw-r--r-- | sd/qa/unit/sdmodeltestbase.hxx | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index c35ecd6d4563..569a0559901d 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -66,8 +66,9 @@ static void assertMotionPath(const OUString &rStr1, const OUString &rStr2, const sal_Int32 nIdx1 = 0; sal_Int32 nIdx2 = 0; - OString sMessage = OUStringToOString("Motion path values mismatch.\nExpect: " + rStr1 + - "\nActual: " + rStr2, RTL_TEXTENCODING_UTF8); + OString sMessage = "Motion path values mismatch.\nExpect: " + + OUStringToOString(rStr1, RTL_TEXTENCODING_UTF8) + + "\nActual: " + OUStringToOString(rStr2, RTL_TEXTENCODING_UTF8); while(nIdx1 != -1 && nIdx2 != -1) { diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index 08f66de864f1..de163fbc38ef 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -157,7 +157,7 @@ protected: { if (xDocShRef.is()) xDocShRef->DoClose(); - CPPUNIT_ASSERT_MESSAGE( OUStringToOString( "failed to load Draw doc" + rURL, RTL_TEXTENCODING_UTF8 ).getStr(), false ); + CPPUNIT_ASSERT_MESSAGE( OString("failed to load Draw doc" + OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 )).getStr(), false ); } CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); return xDocShRef; @@ -182,7 +182,7 @@ protected: { if (xDocShRef.is()) xDocShRef->DoClose(); - CPPUNIT_ASSERT_MESSAGE( OUStringToOString( "failed to load " + rURL, RTL_TEXTENCODING_UTF8 ).getStr(), false ); + CPPUNIT_ASSERT_MESSAGE( OString("failed to load " + OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 )).getStr(), false ); } CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); return xDocShRef; |