summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-04-06 11:17:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-04-06 11:17:30 +0200
commit9458ce11084579b020650fecb1165052c16ee556 (patch)
tree8741901ea61e5102006070647ca5254ef1b3ff45
parentdea248f5cbf91c41007bbb93037a653c5a543080 (diff)
Revert "tdf#106792: Fix "Geometry" property of changed-to-bezier SvxShapePolyPolygon"
This reverts commit 26909d9de4c6e7165fc8f5d938ee6ef55b87cc5c, see <https://bugs.documentfoundation.org/show_bug.cgi?id=106792#c10> for why this was wrongly addressing symptoms, not the root cause. Work on a proper fix is ongoing.
-rw-r--r--svx/source/unodraw/unoshap2.cxx22
1 files changed, 3 insertions, 19 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1b1ad743f5fa..779155c1f51a 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1105,25 +1105,9 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
if(mpObj.is())
mpObj->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
- switch (getShapeKind()) {
- case OBJ_PATHLINE:
- case OBJ_PATHFILL:
- {
- drawing::PolyPolygonBezierCoords aRetval;
- basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(
- aNewPolyPolygon, aRetval);
- rValue <<= aRetval;
- break;
- }
- default:
- {
- drawing::PointSequenceSequence aRetval(aNewPolyPolygon.count());
- B2DPolyPolygonToSvxPointSequenceSequence(
- aNewPolyPolygon, aRetval);
- rValue <<= aRetval;
- break;
- }
- }
+ drawing::PointSequenceSequence aRetval(aNewPolyPolygon.count());
+ B2DPolyPolygonToSvxPointSequenceSequence(aNewPolyPolygon, aRetval);
+ rValue <<= aRetval;
break;
}
case OWN_ATTR_VALUE_POLYGON: