drawinglayer/inc/drawinglayer/XShapeDumper.hxx | 6
drawinglayer/source/dumper/XShapeDumper.cxx | 192 +++++++++++++++++++------
2 files changed, 156 insertions(+), 42 deletions(-)
New commits:
commit e3ad7324a744f2dac57c30791db16a91330d5873
Author: Artur Dorda <artur.dorda+l...@gmail.com>
Date: Sat Jun 9 02:20:54 2012 +0200
Added dumping [property] LineEnd
Change-Id: I591107b78463a60f6b0d9cbd842d94ac4a58b74a
diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index f233bba..71183ff 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -92,6 +92,7 @@ private:
void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName,
xmlTextWriterPtr xmlWriter);
void
dumpPolyPolygonBezierCoords(com::sun::star::drawing::PolyPolygonBezierCoords
aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter);
void
dumpLineStartAsElement(com::sun::star::drawing::PolyPolygonBezierCoords
aLineStart, xmlTextWriterPtr xmlWriter);
+ void dumpLineEndAsElement(com::sun::star::drawing::PolyPolygonBezierCoords
aLineEnd, xmlTextWriterPtr xmlWriter);
void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint,
xmlTextWriterPtr xmlWriter);
void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize,
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index d1bb6a6..0223dbb 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -499,6 +499,13 @@ namespace {
xmlTextWriterEndElement( xmlWriter );
}
+ void XShapeDumper::dumpLineEndAsElement(drawing::PolyPolygonBezierCoords
aLineEnd, xmlTextWriterPtr xmlWriter)
+ {
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "LineEnd" ));
+ dumpPolyPolygonBezierCoords(aLineEnd, xmlWriter);
+ xmlTextWriterEndElement( xmlWriter );
+ }
+
void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint,
xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"),
"%" SAL_PRIdINT32, rPoint.X);
@@ -762,6 +769,12 @@ namespace {
if(anotherAny >>= aLineStart)
dumpLineStartAsElement(aLineStart,
xmlWriter);
}
+ {
+ uno::Any anotherAny =
xPropSet->getPropertyValue("LineEnd");
+ drawing::PolyPolygonBezierCoords aLineEnd;
+ if(anotherAny >>= aLineEnd)
+ dumpLineEndAsElement(aLineEnd,
xmlWriter);
+ }
}
commit 3b81fbe35db3bf799902294701e54283ea20976b
Author: Artur Dorda <artur.dorda+l...@gmail.com>
Date: Sat Jun 9 02:18:09 2012 +0200
Added dumping [property] LineStart
Change-Id: I99e792692a2d92e67240925c255d8038345ea6d0
diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 3eae1af..f233bba 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -91,6 +91,7 @@ private:
void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName,
xmlTextWriterPtr xmlWriter);
void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName,
xmlTextWriterPtr xmlWriter);
void
dumpPolyPolygonBezierCoords(com::sun::star::drawing::PolyPolygonBezierCoords
aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter);
+ void
dumpLineStartAsElement(com::sun::star::drawing::PolyPolygonBezierCoords
aLineStart, xmlTextWriterPtr xmlWriter);
void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint,
xmlTextWriterPtr xmlWriter);
void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize,
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 1134eac..d1bb6a6 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -492,6 +492,13 @@ namespace {
}
+ void XShapeDumper::dumpLineStartAsElement(drawing::PolyPolygonBezierCoords
aLineStart, xmlTextWriterPtr xmlWriter)
+ {
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "LineStart" ));
+ dumpPolyPolygonBezierCoords(aLineStart, xmlWriter);
+ xmlTextWriterEndElement( xmlWriter );
+ }
+
void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint,
xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"),
"%" SAL_PRIdINT32, rPoint.X);
@@ -749,6 +756,12 @@ namespace {
if(anotherAny >>= sLineEndName)
dumpLineEndNameAsAttribute(sLineEndName, xmlWriter);
}
+ {
+ uno::Any anotherAny =
xPropSet->getPropertyValue("LineStart");
+ drawing::PolyPolygonBezierCoords aLineStart;
+ if(anotherAny >>= aLineStart)
+ dumpLineStartAsElement(aLineStart,
xmlWriter);
+ }
}
commit 1864598b12bc7fb3b8269cdfd7ff66850e525ccd
Author: Artur Dorda <artur.dorda+l...@gmail.com>
Date: Sat Jun 9 02:15:23 2012 +0200
Added separate method to dump drawing::PolyPolygonBezierCoords properties
Change-Id: Ia45d5dbad3fb575d39c4e9ddc6c7f65aa1d74a55
diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 9b7ba66..3eae1af 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -40,6 +40,7 @@
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/LineDash.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
#ifndef ChartViewDumper_hxx
#define ChartViewDumper_hxx
@@ -88,6 +89,8 @@ private:
void dumpLineWidthAsAttribute(sal_Int32 aLineWidth, xmlTextWriterPtr
xmlWriter);
void dumpLineJointAsAttribute(com::sun::star::drawing::LineJoint
eLineJoint, xmlTextWriterPtr xmlWriter);
void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName,
xmlTextWriterPtr xmlWriter);
+ void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName,
xmlTextWriterPtr xmlWriter);
+ void
dumpPolyPolygonBezierCoords(com::sun::star::drawing::PolyPolygonBezierCoords
aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter);
void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint,
xmlTextWriterPtr xmlWriter);
void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize,
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 7a58592..1134eac 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -390,44 +390,107 @@ namespace {
}
void XShapeDumper::dumpLineTransparenceAsAttribute(sal_Int32
aLineTransparence, xmlTextWriterPtr xmlWriter)
- {
- xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("lineTransparence"), "%" SAL_PRIdINT32, aLineTransparence);
- }
+ {
+ xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("lineTransparence"), "%" SAL_PRIdINT32, aLineTransparence);
+ }
void XShapeDumper::dumpLineWidthAsAttribute(sal_Int32 aLineWidth,
xmlTextWriterPtr xmlWriter)
- {
- xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("lineWidth"), "%" SAL_PRIdINT32, aLineWidth);
- }
+ {
+ xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineWidth"),
"%" SAL_PRIdINT32, aLineWidth);
+ }
void XShapeDumper::dumpLineJointAsAttribute(drawing::LineJoint eLineJoint,
xmlTextWriterPtr xmlWriter)
- {
- switch(eLineJoint)
- {
- case drawing::LineJoint_NONE:
- xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "NONE");
- break;
- case drawing::LineJoint_MIDDLE:
- xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "MIDDLE");
- break;
- case drawing::LineJoint_BEVEL:
- xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "BEVEL");
- break;
- case drawing::LineJoint_MITER:
- xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "MITER");
- break;
- case drawing::LineJoint_ROUND:
- xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "ROUND");
- break;
- default:
- break;
- }
- }
+ {
+ switch(eLineJoint)
+ {
+ case drawing::LineJoint_NONE:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "NONE");
+ break;
+ case drawing::LineJoint_MIDDLE:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "MIDDLE");
+ break;
+ case drawing::LineJoint_BEVEL:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "BEVEL");
+ break;
+ case drawing::LineJoint_MITER:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "MITER");
+ break;
+ case drawing::LineJoint_ROUND:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("lineJoint"), "%s", "ROUND");
+ break;
+ default:
+ break;
+ }
+ }
void XShapeDumper::dumpLineStartNameAsAttribute(rtl::OUString
sLineStartName, xmlTextWriterPtr xmlWriter)
- {
- xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("lineStartName"), "%s",
- rtl::OUStringToOString(sLineStartName,
RTL_TEXTENCODING_UTF8).getStr());
- }
+ {
+ xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("lineStartName"), "%s",
+ rtl::OUStringToOString(sLineStartName,
RTL_TEXTENCODING_UTF8).getStr());
+ }
+
+ void XShapeDumper::dumpLineEndNameAsAttribute(rtl::OUString sLineEndName,
xmlTextWriterPtr xmlWriter)
+ {
+ xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineEndName"),
"%s",
+ rtl::OUStringToOString(sLineEndName, RTL_TEXTENCODING_UTF8).getStr());
+ }
+
+ void
XShapeDumper::dumpPolyPolygonBezierCoords(drawing::PolyPolygonBezierCoords
aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter)
+ {
+ uno::Sequence<uno::Sequence< awt::Point > > pointSequenceSequence =
aPolyPolygonBezierCoords.Coordinates;
+ sal_Int32 nPointsSequence = pointSequenceSequence.getLength();
+ for (sal_Int32 i = 0; i < nPointsSequence; ++i)
+ {
+ uno::Sequence< awt::Point > pointSequence =
pointSequenceSequence[i];
+ sal_Int32 nPoints = pointSequence.getLength();
+
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "pointSequence" ));
+
+ for(sal_Int32 j = 0; j < nPoints; ++j)
+ {
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "point" ));
+ xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("positionX"), "%" SAL_PRIdINT32, pointSequence[j].X);
+ xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("positionY"), "%" SAL_PRIdINT32, pointSequence[j].Y);
+ xmlTextWriterEndElement( xmlWriter );
+ }
+ xmlTextWriterEndElement( xmlWriter );
+ }
+
+ uno::Sequence<uno::Sequence< drawing::PolygonFlags > >
polygonFlagsSequenceSequence = aPolyPolygonBezierCoords.Flags;
+ sal_Int32 nFlagsSequence = polygonFlagsSequenceSequence.getLength();
+ for (sal_Int32 i = 0; i < nFlagsSequence; ++i)
+ {
+ uno::Sequence< drawing::PolygonFlags > polygonFlagsSequence =
polygonFlagsSequenceSequence[i];
+ sal_Int32 nFlags = polygonFlagsSequence.getLength();
+
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "flagsSequence" ));
+
+ for (sal_Int32 j = 0; j < nFlags; ++j)
+ {
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "polygonFlags"
));
+ switch(polygonFlagsSequence[j])
+ {
+ case drawing::PolygonFlags_NORMAL:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("polygonFlags"), "%s", "NORMAL");
+ break;
+ case drawing::PolygonFlags_SMOOTH:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("polygonFlags"), "%s", "SMOOTH");
+ break;
+ case drawing::PolygonFlags_CONTROL:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("polygonFlags"), "%s", "CONTROL");
+ break;
+ case drawing::PolygonFlags_SYMMETRIC:
+ xmlTextWriterWriteFormatAttribute( xmlWriter,
BAD_CAST("polygonFlags"), "%s", "SYMMETRIC");
+ break;
+ default:
+ break;
+ }
+ xmlTextWriterEndElement( xmlWriter );
+ }
+ xmlTextWriterEndElement( xmlWriter );
+ }
+
+ }
void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint,
xmlTextWriterPtr xmlWriter)
{
@@ -657,29 +720,36 @@ namespace {
dumpLineColorAsAttribute(aLineColor, xmlWriter);
}
{
- uno::Any anotherAny =
xPropSet->getPropertyValue("LineTransparence");
- sal_Int32 aLineTransparence;
- if(anotherAny >>= aLineTransparence)
-
dumpLineTransparenceAsAttribute(aLineTransparence, xmlWriter);
- }
- {
- uno::Any anotherAny =
xPropSet->getPropertyValue("LineWidth");
- sal_Int32 aLineWidth;
- if(anotherAny >>= aLineWidth)
- dumpLineWidthAsAttribute(aLineWidth,
xmlWriter);
- }
- {
- uno::Any anotherAny =
xPropSet->getPropertyValue("LineJoint");
- drawing::LineJoint eLineJoint;
- if(anotherAny >>= eLineJoint)
- dumpLineJointAsAttribute(eLineJoint,
xmlWriter);
- }
- {
- uno::Any anotherAny =
xPropSet->getPropertyValue("LineStartName");
- rtl::OUString sLineStartName;
- if(anotherAny >>= sLineStartName)
-
dumpLineStartNameAsAttribute(sLineStartName, xmlWriter);
- }
+ uno::Any anotherAny =
xPropSet->getPropertyValue("LineTransparence");
+ sal_Int32 aLineTransparence;
+ if(anotherAny >>= aLineTransparence)
+ dumpLineTransparenceAsAttribute(aLineTransparence,
xmlWriter);
+ }
+ {
+ uno::Any anotherAny = xPropSet->getPropertyValue("LineWidth");
+ sal_Int32 aLineWidth;
+ if(anotherAny >>= aLineWidth)
+ dumpLineWidthAsAttribute(aLineWidth, xmlWriter);
+ }
+ {
+ uno::Any anotherAny = xPropSet->getPropertyValue("LineJoint");
+ drawing::LineJoint eLineJoint;
+ if(anotherAny >>= eLineJoint)
+ dumpLineJointAsAttribute(eLineJoint, xmlWriter);
+ }
+ {
+ uno::Any anotherAny =
xPropSet->getPropertyValue("LineStartName");
+ rtl::OUString sLineStartName;
+ if(anotherAny >>= sLineStartName)
+ dumpLineStartNameAsAttribute(sLineStartName, xmlWriter);
+ }
+ {
+ uno::Any anotherAny =
xPropSet->getPropertyValue("LineEndName");
+ rtl::OUString sLineEndName;
+ if(anotherAny >>= sLineEndName)
+ dumpLineEndNameAsAttribute(sLineEndName, xmlWriter);
+ }
+
}
#if DEBUG_DUMPER
commit 498778b9ffa5d1804e950d3f8fadd021689fb8f4
Author: Artur Dorda <artur.dorda+l...@gmail.com>
Date: Fri Jun 8 22:34:01 2012 +0200
Added dumping [property] LineStartName
Change-Id: I2ad328ab32d88ddb53c69d5caa3ce801b7200002
diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index d912ec1..9b7ba66 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -87,6 +87,7 @@ private:
void dumpLineTransparenceAsAttribute(sal_Int32 aLineTransparence,
xmlTextWriterPtr xmlWriter);
void dumpLineWidthAsAttribute(sal_Int32 aLineWidth, xmlTextWriterPtr
xmlWriter);
void dumpLineJointAsAttribute(com::sun::star::drawing::LineJoint
eLineJoint, xmlTextWriterPtr xmlWriter);
+ void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName,
xmlTextWriterPtr xmlWriter);
void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint,
xmlTextWriterPtr xmlWriter);
void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize,
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 3965b1a..7a58592 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -423,6 +423,12 @@ namespace {
}
}
+ void XShapeDumper::dumpLineStartNameAsAttribute(rtl::OUString
sLineStartName, xmlTextWriterPtr xmlWriter)
+ {
+ xmlTextWriterWriteFormatAttribute(xmlWriter,
BAD_CAST("lineStartName"), "%s",
+ rtl::OUStringToOString(sLineStartName,
RTL_TEXTENCODING_UTF8).getStr());
+ }
+
void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint,
xmlTextWriterPtr xmlWriter)
{
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"),
"%" SAL_PRIdINT32, rPoint.X);
@@ -668,6 +674,12 @@ namespace {
if(anotherAny >>= eLineJoint)
dumpLineJointAsAttribute(eLineJoint,
xmlWriter);
}
+ {
+ uno::Any anotherAny =
xPropSet->getPropertyValue("LineStartName");
+ rtl::OUString sLineStartName;
+ if(anotherAny >>= sLineStartName)
+
dumpLineStartNameAsAttribute(sLineStartName, xmlWriter);
+ }
}
#if DEBUG_DUMPER
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
