[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source

[Caolán McNamara]

 xmloff/source/draw/ximpshap.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 6eac0306a61066e91ff748a7cb2a6a86a94820ac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 27 10:58:39 2014 +0000

    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/7685
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index d227f16..bb3a49f 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