diff options
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 5 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 4 | ||||
| -rw-r--r-- | sw/qa/extras/globalfilter/globalfilter.cxx | 16 |
3 files changed, 7 insertions, 18 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index cdc7532fb457..7c1de6bb2502 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -2304,8 +2304,7 @@ void ScExportTest::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_EQUAL_MESSAGE( - sFailedMessage.getStr(), OUString("vnd.sun.star.GraphicObject:10000000000002620000017D9F4CD7A2"), sURL); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); } // Check size { @@ -2323,7 +2322,7 @@ void ScExportTest::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("vnd.sun.star.GraphicObject:1000000000000384000002580A24B597"), sURL); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); } // Check size { diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 08f854779fe4..e907e4702a73 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -539,7 +539,7 @@ void SdExportTest::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("vnd.sun.star.GraphicObject:10000000000002620000017D9F4CD7A2"), sURL); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); } // Check size { @@ -559,7 +559,7 @@ void SdExportTest::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), OUString("vnd.sun.star.GraphicObject:1000000000000384000002580A24B597"), sURL); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); } // Check size { diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 1fd43319594e..6a28692de8c4 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -81,8 +81,7 @@ void Test::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - CPPUNIT_ASSERT_EQUAL_MESSAGE( - sFailedMessage.getStr(), OUString("vnd.sun.star.GraphicObject:10000000000002620000017D9F4CD7A2"), sURL); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); } // Check size { @@ -101,17 +100,8 @@ void Test::testSwappedOutImageExport() { OUString sURL; XPropSet->getPropertyValue("GraphicURL") >>= sURL; - // HTML filter changes the name, but the real indicater here is the "null" URL. - if( aFilterNames[nFilter] == "HTML (StarWriter)" ) - { - CPPUNIT_ASSERT_MESSAGE( - sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); - } - else - { - CPPUNIT_ASSERT_EQUAL_MESSAGE( - sFailedMessage.getStr(), OUString("vnd.sun.star.GraphicObject:1000000000000384000002580A24B597"), sURL); - } + CPPUNIT_ASSERT_MESSAGE( + sFailedMessage.getStr(), sURL != OUString("vnd.sun.star.GraphicObject:00000000000000000000000000000000")); } // Check size { |