diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-13 07:03:26 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-07-12 03:10:12 +0200 |
| commit | 0ce3c289ca3be20fffd55a3829b8c6d60c71ecc1 (patch) | |
| tree | 1a10da19520afc52060c90bd736c7ab722bf4bf5 | |
| parent | be0559116f94bda6b404d255d004b729c59425d5 (diff) | |
only dump existing properties
Change-Id: Ia7e3c7766ef8d9d86bd65945a6e6daae05c93b75
| -rw-r--r-- | drawinglayer/source/dumper/XShapeDumper.cxx | 6 | ||||
| -rw-r--r-- | sd/qa/unit/regression-test.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index 20454dc84b62..daf78c23631a 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -35,7 +35,7 @@ #include <rtl/strbuf.hxx> -#define DEBUG_DUMPER 1 +#define DEBUG_DUMPER 0 using namespace com::sun::star; //class XShapeDumper @@ -1006,6 +1006,8 @@ namespace { } if(xServiceInfo->supportsService("com.sun.star.drawing.TextProperties")) { + uno::Reference< beans::XPropertySetInfo> xInfo = xPropSet->getPropertySetInfo(); + if(xInfo->hasPropertyByName("IsNumbering")) { uno::Any anotherAny = xPropSet->getPropertyValue("IsNumbering"); sal_Bool bIsNumbering; @@ -1450,6 +1452,7 @@ namespace { if(xServiceInfo->supportsService("com.sun.star.drawing.Shape")) { + uno::Reference< beans::XPropertySetInfo> xInfo = xPropSet->getPropertySetInfo(); { uno::Any anotherAny = xPropSet->getPropertyValue("ZOrder"); sal_Int32 aZOrder; @@ -1510,6 +1513,7 @@ namespace { if(anotherAny >>= aNavigationOrder) dumpNavigationOrderAsAttribute(aNavigationOrder, xmlWriter); } + if(xInfo->hasPropertyByName("Hyperlink")) { uno::Any anotherAny = xPropSet->getPropertyValue("Hyperlink"); rtl::OUString sHyperlink; diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index 169b891d5d91..d5e089bd03e3 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -196,8 +196,6 @@ void SdFiltersTest::test() std::cout << aString << std::endl; } xDocShRef->DoClose(); - - CPPUNIT_ASSERT(false); } bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, |