diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-11-10 10:24:35 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-10 10:36:17 +0100 |
| commit | e49725438d34df305e7a4730c72034144994306d (patch) | |
| tree | 2a59fe6718f04eec91611e137cdc12eef50d7c42 /sw/qa/extras/globalfilter | |
| parent | 62ddb5bb8c87b69a578c838ac33325ab8e7007d5 (diff) | |
Fix build.
Change-Id: I91599766e607b26d2c71006c9543a2bd952e228a
Diffstat (limited to 'sw/qa/extras/globalfilter')
| -rw-r--r-- | sw/qa/extras/globalfilter/globalfilter.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 9f7d603b9a48..a08c916e6eaa 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -33,7 +33,7 @@ public: void Test::testSwappedOutImageExport() { - const OUString aFilterNames[] = { + const char* aFilterNames[] = { "writer8", "Rich Text Format", "MS Word 97", @@ -53,14 +53,11 @@ void Test::testSwappedOutImageExport() mxComponent->dispose(); mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/globalfilter/data/document_with_two_images.odt"), "com.sun.star.text.TextDocument"); - const OString sFailedMessage = OString("Failed on filter: ") - + OUStringToOString(aFilterNames[nFilter], RTL_TEXTENCODING_ASCII_US); - // Export the document and import again for a check uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["FilterName"] <<= aFilterNames[nFilter]; + aMediaDescriptor["FilterName"] <<= OUString::createFromAscii(aFilterNames[nFilter]); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); @@ -72,6 +69,8 @@ void Test::testSwappedOutImageExport() // Check whether graphic exported well after it was swapped out uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); + + const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), static_cast<sal_Int32>(2), xDraws->getCount()); // First image |