vcl: handle PDF data in Read/WriteImpGraphic()

Initially I wrote the test to cover
f7d6f3e4e3fda3cd4936880918e2831246634a3e (svtools: survive swapout/in of
graphic with embedded pdf, 2016-06-28), but as it turns out the actual
swapin/out code is in vcl, so extend that as well to support pdf data.

Change-Id: I320ea729dce9440b84a5089607807322ea7b0b04
Reviewed-on: https://gerrit.libreoffice.org/26755
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

3 files changed, 35 insertions, 30 deletions

diff --git a/svtools/CppunitTest_svtools_graphic.mk b/svtools/CppunitTest_svtools_graphic.mk
index 9636c7dc33c7..17056e51d0da 100644
--- a/svtools/CppunitTest_svtools_graphic.mk
+++ b/svtools/CppunitTest_svtools_graphic.mk
@@ -45,36 +45,7 @@ $(eval $(call gb_CppunitTest_use_custom_headers,svtools_graphic,\
 
 $(eval $(call gb_CppunitTest_use_configuration,svtools_graphic))
 
-$(eval $(call gb_CppunitTest_use_components,svtools_graphic,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    embeddedobj/util/embobj \
-    filter/source/config/cache/filterconfig1 \
-    filter/source/storagefilterdetect/storagefd \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    sfx2/util/sfx \
-    starmath/util/sm \
-    svl/source/fsstor/fsstorage \
-    svtools/util/svt \
-    sw/util/sw \
-    sw/util/swd \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/file/ucpfile1 \
-    unotools/util/utl \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    writerfilter/util/writerfilter \
-    $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
-    xmloff/util/xo \
-))
+$(eval $(call gb_CppunitTest_use_rdb,svtools_graphic,services))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,svtools_graphic, \
     svtools/qa/unit/GraphicObjectTest \
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx
index 22664425677f..c785fadd4890 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -41,6 +41,7 @@ public:
     void testSizeBasedAutoSwap();
     void testTdf88836();
     void testTdf88935();
+    void testPdf();
 
 
     virtual void setUp() override
@@ -59,6 +60,7 @@ private:
     CPPUNIT_TEST(testSizeBasedAutoSwap);
     CPPUNIT_TEST(testTdf88836);
     CPPUNIT_TEST(testTdf88935);
+    CPPUNIT_TEST(testPdf);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -307,6 +309,38 @@ void GraphicObjectTest::testTdf88935()
     xComponent->dispose();
 }
 
+void GraphicObjectTest::testPdf()
+{
+    uno::Reference<lang::XComponent> xComponent = loadFromDesktop(m_directories.getURLFromSrc("svtools/qa/unit/data/pdf.odt"), "com.sun.star.text.TextDocument");
+    SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument*>(xComponent.get());
+    CPPUNIT_ASSERT(pTxtDoc);
+    SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+    CPPUNIT_ASSERT(pDoc);
+    SwNodes& aNodes = pDoc->GetNodes();
+
+    // Find images
+    GraphicObject* pGraphicObject = nullptr;
+    for( sal_uLong nIndex = 0; nIndex < aNodes.Count(); ++nIndex)
+    {
+        if( aNodes[nIndex]->IsGrfNode() )
+        {
+            SwGrfNode* pGrfNode = aNodes[nIndex]->GetGrfNode();
+            CPPUNIT_ASSERT(pGrfNode);
+            pGraphicObject = const_cast<GraphicObject*>(&pGrfNode->GetGrfObj());
+            break;
+        }
+    }
+    CPPUNIT_ASSERT_MESSAGE("Missing image", pGraphicObject);
+
+    CPPUNIT_ASSERT(pGraphicObject->GetGraphic().getPdfData().hasElements());
+    pGraphicObject->SwapOut();
+    pGraphicObject->SwapIn();
+    // This failed, swap out + swap in lost the PDF data.
+    CPPUNIT_ASSERT(pGraphicObject->GetGraphic().getPdfData().hasElements());
+
+    xComponent->dispose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(GraphicObjectTest);
 
 }
diff --git a/svtools/qa/unit/data/pdf.odt b/svtools/qa/unit/data/pdf.odt
new file mode 100644
index 000000000000..f20b389207d6
--- /dev/null
+++ b/svtools/qa/unit/data/pdf.odt