diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-06-21 19:31:32 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-15 11:01:30 +0200 |
| commit | 41f5459e5d4cbf5024995bce7d967104c7943830 (patch) | |
| tree | d85eca88a6ac13b4a6eeaf9893a69979947328e4 /drawinglayer/source/tools/emfpcustomlinecap.cxx | |
| parent | emfplus: some cleanup/streamlining (diff) | |
| download | core-41f5459e5d4cbf5024995bce7d967104c7943830.tar.gz core-41f5459e5d4cbf5024995bce7d967104c7943830.zip | |
emfplus: more corrections and rough geometry
Corrected/streamlined more, added 1st rough geometry
creation to have a proof of concept. Checked the
helper classes based on EMFPObject and their derivates.
First versions of EMFPPlusDrawPolygon and
EMFPPlusFillPolygon, but the complex info in the data
objects needs more complex primitive creation. Not sure
if primitive creators like createHairlineAndFillPrimitive
will be usable, these are based on PropertyHolder info.
Also added usage of HandleNewClipRegion, that should be
usable
Change-Id: I96119be290140bee252ee21a3e1187fad60e9c7d
Diffstat (limited to 'drawinglayer/source/tools/emfpcustomlinecap.cxx')
| -rw-r--r-- | drawinglayer/source/tools/emfpcustomlinecap.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drawinglayer/source/tools/emfpcustomlinecap.cxx b/drawinglayer/source/tools/emfpcustomlinecap.cxx index 9024a11a564e..d2d211d62d3e 100644 --- a/drawinglayer/source/tools/emfpcustomlinecap.cxx +++ b/drawinglayer/source/tools/emfpcustomlinecap.cxx @@ -46,7 +46,6 @@ namespace emfplushelper { const sal_uInt32 EmfPlusCustomLineCapDataTypeDefault = 0x00000000; const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x00000001; - const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x00000001; const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x00000002; @@ -75,17 +74,14 @@ namespace emfplushelper sal_Int32 pathLength; s.ReadInt32(pathLength); SAL_INFO("cppcanvas.emf", "EMF+\t\tpath length: " << pathLength); - sal_uInt32 pathHeader; sal_Int32 pathPoints, pathFlags; s.ReadUInt32(pathHeader).ReadInt32(pathPoints).ReadInt32(pathFlags); - SAL_INFO("cppcanvas.emf", "EMF+\t\tpath (custom cap line path)"); SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec); EMFPPath path(pathPoints); path.Read(s, pathFlags, rR); - polygon = path.GetPolygon(rR, false); mbIsFilled = bFill; @@ -93,16 +89,13 @@ namespace emfplushelper // expects B2DHomMatrix aMatrix; aMatrix.scale(1.0, -1.0); - polygon.transform(aMatrix); }; void EMFPCustomLineCap::Read(SvStream& s, EmfPlusHelperData& rR) { sal_uInt32 header; - s.ReadUInt32(header).ReadUInt32(type); - SAL_INFO("cppcanvas.emf", "EMF+\t\tcustom cap"); SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << header << " type: " << type << std::dec); |