diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-05 20:44:08 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-07 02:38:28 +0100 |
commit | 27008aa028cde8d270e898c5743a9fe5c7701dab (patch) | |
tree | d3c8bbd6c1607122dc8009beeba68f7d0b89d256 /sw | |
parent | 5a4d6162f643050faf00ccf08d58feed00dcd781 (diff) |
xmloff: convert XMLTextParagraphExport to get rid of "GraphicURL"
Change-Id: I10cc1115bfe628dc296b67b75e386e1a2e4a6c46
Reviewed-on: https://gerrit.libreoffice.org/50789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/CppunitTest_sw_odfimport.mk | 1 | ||||
-rw-r--r-- | sw/qa/extras/globalfilter/globalfilter.cxx | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 302f24a86897..be599de21a48 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -83,6 +83,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ xmloff/util/xo \ + svgio/svgio \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_odfimport)) diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 7bd0c1bb2633..7c3082aec701 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -189,11 +189,7 @@ void Test::testLinkedGraphicRT() { SwGrfNode* pGrfNode = aNodes[nIndex]->GetGrfNode(); CPPUNIT_ASSERT(pGrfNode); - // RT via DOCX makes linked graphic embedded?! - if( aFilterNames[nFilter] != "Office Open XML Text" ) - { - CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pGrfNode->IsGrfLink()); - } + const GraphicObject& rGraphicObj = pGrfNode->GetGrfObj(true); CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), !rGraphicObj.IsSwappedOut()); CPPUNIT_ASSERT_EQUAL_MESSAGE( sFailedMessage.getStr(), int(GraphicType::Bitmap), int(rGraphicObj.GetType())); |