From 1ebccdaf3df65a5f4b50844e0111ca364c0d133f Mon Sep 17 00:00:00 2001 From: Artur Dorda Date: Tue, 26 Jun 2012 19:13:22 +0200 Subject: Added service EnhancedCustomShapeExtrusion, properties Extrusion & Brightness Change-Id: Ie787fb90f2c8192632e0ad8a86c7affbb3315791 --- drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx | 3 +++ drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 15 +++++++++++++++ drawinglayer/source/dumper/XShapeDumper.cxx | 13 ++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx index 71b0fde3600f..777a00be2314 100644 --- a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx +++ b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx @@ -42,6 +42,9 @@ public: } + // EnhancedCustomShapeExtrusion.idl + void dumpExtrusionAsAttribute(sal_Bool bExtrusion); + void dumpBrightnessAsAttribute(double aBrightness); private: xmlTextWriterPtr xmlWriter; diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx index f68d3206dd62..19c60d4e236c 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx @@ -29,5 +29,20 @@ #include #include +// ------------------------------------------------------ +// ---------- EnhancedCustomShapeExtrusion.idl ---------- +// ------------------------------------------------------ +void EnhancedShapeDumper::dumpExtrusionAsAttribute(sal_Bool bExtrusion) +{ + if(bExtrusion) + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("extrusion"), "%s", "true"); + else + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("extrusion"), "%s", "false"); +} + +void EnhancedShapeDumper::dumpBrightnessAsAttribute(double aBrightness) +{ + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("brightness"), "%f", aBrightness); +} diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index 990e033b85a6..f17c4261a278 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -1620,7 +1620,18 @@ namespace { void XShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference< beans::XPropertySet > xPropSet, EnhancedShapeDumper enhancedDumper) { - + { + uno::Any anotherAny = xPropSet->getPropertyValue("Extrusion"); + sal_Bool bExtrusion; + if(anotherAny >>= bExtrusion) + enhancedDumper.dumpExtrusionAsAttribute(bExtrusion); + } + { + uno::Any anotherAny = xPropSet->getPropertyValue("Brightness"); + double aBrightness; + if(anotherAny >>= aBrightness) + enhancedDumper.dumpBrightnessAsAttribute(aBrightness); + } } void XShapeDumper::dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWriter) -- cgit v1.2.1