summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-27 10:58:39 +0000
committerThorsten Behrens <thb@documentfoundation.org>2014-01-27 13:05:47 +0000
commit35e7cb39634b0afbbb364fc50fad1a02ce74573b (patch)
treeae0b5a6ad768293eb63495fbbf2248c933c1abe5
parentf59fc4e1ce2d6a506fe5a11123cc32e8c7f16540 (diff)
Resolves: fdo#73814 wrong name for drawing::PointSequenceSequence property
examining svx/source/unodraw/unoprov.cxx "Geometry" is a indeed a drawing::PolyPolygonBezierCoords for the BezierShapes and a drawing::PointSequenceSequence for the PolyShapes regression since e44335abe006d05f0f915279605a03ef084116d6 because after 223f6b631c1b087754c0f9051fb55f029f2503ce we started getting drawing::PointSequenceSequences in maPath which is the wrong type for the argument to property "PolyPolygonBezier" for those shapes. Which led me to incorrectly assume that the all PolyPolygonBezier properties were named "PolyPolygonBezier" which isn't the case. so reverting the non maPath hunks of e44335abe006d05f0f915279605a03ef084116d6 Change-Id: I013a66778d11a472fc4567e53a9e17e73e2b91ce (cherry picked from commit df2ad69d5df350636c1eb1772b16a2e203a88fa7) Reviewed-on: https://gerrit.libreoffice.org/7686 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
-rw-r--r--xmloff/source/draw/ximpshap.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index d227f166d9db..bb3a49fa878d 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1470,8 +1470,6 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aPolyPolygon,
aSourcePolyPolygon);
aAny <<= aSourcePolyPolygon;
-
- xPropSet->setPropertyValue(OUString("PolyPolygonBezier"), aAny);
}
else
{
@@ -1481,9 +1479,9 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aPolyPolygon,
aSourcePolyPolygon);
aAny <<= aSourcePolyPolygon;
-
- xPropSet->setPropertyValue(OUString("Geometry"), aAny);
}
+
+ xPropSet->setPropertyValue(OUString("Geometry"), aAny);
}
// set pos, size, shear and rotate