diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:30:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:31 +0100 |
| commit | cb9e8bbdb9dd3f2f83ab862ffa6d734af7be79db (patch) | |
| tree | 3fca04a12a362514eccdb20e7f668dfe28232573 /sd/qa | |
| parent | b9def20cea8d8364ac1fa14aaf1da775128f0fd3 (diff) | |
sd: Use appropriate OUString functions on string constants
Change-Id: Ic402f5b5be1f657d9045091056bcb731b3407a9d
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/HtmlExportTest.cxx | 2 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 8 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx index 67c0560d3d68..50602707300c 100644 --- a/sd/qa/unit/HtmlExportTest.cxx +++ b/sd/qa/unit/HtmlExportTest.cxx @@ -20,7 +20,7 @@ private: htmlDocPtr exportAndParseHtml(sd::DrawDocShellRef& xDocShRef) { FileFormat* pFormat = getFormat(HTML); - OUString aExt = OUString( "." ) + OUString::createFromAscii(pFormat->pName); + OUString aExt = "." + OUString::createFromAscii(pFormat->pName); utl::TempFile aTempFile(OUString(), true, &aExt); aTempFile.EnableKillingFile(); exportTo(xDocShRef, pFormat, aTempFile); diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 4c4cf0908d84..037f8e51722a 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -559,7 +559,7 @@ void SdExportTest::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != "vnd.sun.star.GraphicObject:00000000000000000000000000000000"); } // Check size { @@ -579,7 +579,7 @@ void SdExportTest::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != "vnd.sun.star.GraphicObject:00000000000000000000000000000000"); } // Check size { @@ -685,7 +685,7 @@ void SdExportTest::testImageWithSpecialID() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != "vnd.sun.star.GraphicObject:00000000000000000000000000000000"); } // Check size { @@ -705,7 +705,7 @@ void SdExportTest::testImageWithSpecialID() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != "vnd.sun.star.GraphicObject:00000000000000000000000000000000"); } // Check size { diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 16d542f1a31b..1ee45bf677db 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -329,8 +329,8 @@ void SdImportTest::testN828390_2() SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>( pObj ); CPPUNIT_ASSERT( pTxtObj ); const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); - CPPUNIT_ASSERT(aEdit.GetText(0) == OUString("Linux ")); - CPPUNIT_ASSERT(aEdit.GetText(1) == OUString("Standard Platform")); + CPPUNIT_ASSERT(aEdit.GetText(0) == "Linux "); + CPPUNIT_ASSERT(aEdit.GetText(1) == "Standard Platform"); xDocShRef->DoClose(); } |