Skip to content

C
core
Kaydet (Commit) e44335ab authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related #i123433# PolyPolygonBezier must be drawing::PolyPolygonBezierCoords 

Change-Id: Idc7e0a2651f2e0b499bbf8b8443ffb84b54a45b6
üst 223f6b63
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 21 deletions
xmloff/source/draw/ximpshap.cxx
Dosyayı görüntüle @ e44335ab
...@@ -1459,6 +1459,8 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib ...@@ -1459,6 +1459,8 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aPolyPolygon, aPolyPolygon,
aSourcePolyPolygon); aSourcePolyPolygon);
aAny <<= aSourcePolyPolygon; aAny <<= aSourcePolyPolygon;
xPropSet->setPropertyValue(OUString("PolyPolygonBezier"), aAny);
} }
else else
{ {
...@@ -1468,9 +1470,9 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib ...@@ -1468,9 +1470,9 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
aPolyPolygon, aPolyPolygon,
aSourcePolyPolygon); aSourcePolyPolygon);
aAny <<= aSourcePolyPolygon; aAny <<= aSourcePolyPolygon;
}
xPropSet->setPropertyValue(OUString("Geometry"), aAny); xPropSet->setPropertyValue(OUString("Geometry"), aAny);
}
} }
// set pos, size, shear and rotate // set pos, size, shear and rotate
...@@ -1832,25 +1834,12 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS ...@@ -1832,25 +1834,12 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS
{ {
if(aPolyPolygon.count()) if(aPolyPolygon.count())
{ {
// set polygon data drawing::PolyPolygonBezierCoords aSourcePolyPolygon;
if(aPolyPolygon.areControlPointsUsed())
{
drawing::PolyPolygonBezierCoords aSourcePolyPolygon;
basegfx::tools::B2DPolyPolygonToUnoPolyPolygonBezierCoords( basegfx::tools::B2DPolyPolygonToUnoPolyPolygonBezierCoords(
aPolyPolygon, aPolyPolygon,
aSourcePolyPolygon); aSourcePolyPolygon);
maPath <<= aSourcePolyPolygon; maPath <<= aSourcePolyPolygon;
}
else
{
drawing::PointSequenceSequence aSourcePolyPolygon;
basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(
aPolyPolygon,
aSourcePolyPolygon);
maPath <<= aSourcePolyPolygon;
}
} }
} }
} }
...@@ -1967,7 +1956,8 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA ...@@ -1967,7 +1956,8 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
if ( bApplySVGD ) if ( bApplySVGD )
{ {
xProps->setPropertyValue("PolyPolygonBezier", maPath ); assert(maPath.getValueType() == ::getCppuType((const drawing::PolyPolygonBezierCoords*)0));
xProps->setPropertyValue("PolyPolygonBezier", maPath);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment