From ab3890b5f4ff4654eae7360d0cf34f3e26a1026f Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Wed, 21 Feb 2018 19:32:17 +0900 Subject: use "Graphic" property to transport Graphic for controls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently "ImageURL" property is used to transport the Graphic (as an string URL), which is being replaced by transporting XGraphic directly. There is already a property that all controls use - "Graphic", so use that instead. Change-Id: I2514b475735f3e430c2baa9b1685a231fc694b28 Reviewed-on: https://gerrit.libreoffice.org/50139 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- sd/qa/unit/activex-controls-tests.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sd') diff --git a/sd/qa/unit/activex-controls-tests.cxx b/sd/qa/unit/activex-controls-tests.cxx index f82f29e4eb98..186d9a737624 100644 --- a/sd/qa/unit/activex-controls-tests.cxx +++ b/sd/qa/unit/activex-controls-tests.cxx @@ -1119,9 +1119,9 @@ void SdActiveXControlsTest::testPictureProperties() CPPUNIT_ASSERT(xControlShape.is()); uno::Reference xPropertySet(xControlShape->getControl(), uno::UNO_QUERY); - OUString sImageURL; - xPropertySet->getPropertyValue("ImageURL") >>= sImageURL; - CPPUNIT_ASSERT(!sImageURL.isEmpty()); + uno::Reference xGraphic; + xPropertySet->getPropertyValue("Graphic") >>= xGraphic; + CPPUNIT_ASSERT(xGraphic.is()); sal_Int16 nColor; xPropertySet->getPropertyValue("ImagePosition") >>= nColor; @@ -1138,12 +1138,12 @@ void SdActiveXControlsTest::testPictureProperties() OString sMessage = "The wrong control's index is: " + OString::number(i); - OUString sImageURL; - xPropertySet->getPropertyValue("ImageURL") >>= sImageURL; + uno::Reference xGraphic; + xPropertySet->getPropertyValue("Graphic") >>= xGraphic; if (i == 0) // First control has no image specified - CPPUNIT_ASSERT_MESSAGE(sMessage.getStr(), sImageURL.isEmpty()); + CPPUNIT_ASSERT_MESSAGE(sMessage.getStr(), !xGraphic.is()); else - CPPUNIT_ASSERT_MESSAGE(sMessage.getStr(), !sImageURL.isEmpty()); + CPPUNIT_ASSERT_MESSAGE(sMessage.getStr(), xGraphic.is()); sal_Int16 nScaleMode; xPropertySet->getPropertyValue("ScaleMode") >>= nScaleMode; @@ -1225,4 +1225,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(SdActiveXControlsTest); CPPUNIT_PLUGIN_IMPLEMENT(); -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ -- cgit