mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVGIO: Check height and width of polypolygoncolor

Browse Source 
Change-Id: Ibc5844d4e4a89fae7bbc8d2b854384d0c433500f
Reviewed-on: https://gerrit.libreoffice.org/22883
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Xisco Faulí <anistenis@gmail.com>
This commit is contained in:
Xisco Fauli
2016-03-03 23:19:01 +01:00
committed by Xisco Faulí
parent 7df498c828
commit 31e037c348
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
svgio/qa/cppunit/SvgImportTest.cxx
View File

@@ -116,6 +116,8 @@ void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive)
CPPUNIT_ASSERT (pDocument); CPPUNIT_ASSERT (pDocument);
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#00cc00"); // rect background color assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#00cc00"); // rect background color
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "height", "100"); // rect background height
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", "100"); // rect background width
assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "color", "#ff0000"); // rect stroke color assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "color", "#ff0000"); // rect stroke color
assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "width", "3"); // rect stroke width assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke/line", "width", "3"); // rect stroke width
@@ -174,6 +176,8 @@ void Test::testTdf87309()
CPPUNIT_ASSERT (pDocument); CPPUNIT_ASSERT (pDocument);
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#000000"); assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#000000");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "height", "100");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", "100");
} }
void Test::testFontsizeKeywords() void Test::testFontsizeKeywords()
@@ -324,6 +328,8 @@ void Test::testTdf97543()
CPPUNIT_ASSERT (pDocument); CPPUNIT_ASSERT (pDocument);
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#00cc00"); assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#00cc00");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "height", "100");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", "100");
} }
void Test::testRGBColor() void Test::testRGBColor()
@@ -337,6 +343,8 @@ void Test::testRGBColor()
CPPUNIT_ASSERT (pDocument); CPPUNIT_ASSERT (pDocument);
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#646464"); assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color", "#646464");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "height", "100");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "width", "100");
} }
void Test::testRGBAColor() void Test::testRGBAColor()
@@ -364,7 +372,11 @@ void Test::testTdf97936()
CPPUNIT_ASSERT (pDocument); CPPUNIT_ASSERT (pDocument);
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]"); assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]", "height", "50");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]", "width", "50");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]"); assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]", "height", "50");
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]", "width", "50");
} }
CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_TEST_SUITE_REGISTRATION(Test);

5
test/source/primitive2dxmldump.cxx
View File

@@ -113,7 +113,6 @@ void Primitive2dXmlDump::decomposeAndWrite(
{ {
const TransformPrimitive2D& rTransformPrimitive2D = dynamic_cast<const TransformPrimitive2D&>(*pBasePrimitive); const TransformPrimitive2D& rTransformPrimitive2D = dynamic_cast<const TransformPrimitive2D&>(*pBasePrimitive);
rWriter.startElement("transform"); rWriter.startElement("transform");
//pTransformPrimitive2D->getTransformation()
decomposeAndWrite(rTransformPrimitive2D.getChildren(), rWriter); decomposeAndWrite(rTransformPrimitive2D.getChildren(), rWriter);
rWriter.endElement(); rWriter.endElement();
} }
@@ -125,6 +124,10 @@ void Primitive2dXmlDump::decomposeAndWrite(
rWriter.startElement("polypolygoncolor"); rWriter.startElement("polypolygoncolor");
rWriter.attribute("color", convertColorToString(rPolyPolygonColorPrimitive2D.getBColor())); rWriter.attribute("color", convertColorToString(rPolyPolygonColorPrimitive2D.getBColor()));
const basegfx::B2DPolyPolygon aB2DPolyPolygon(rPolyPolygonColorPrimitive2D.getB2DPolyPolygon());
const basegfx::B2DRange aB2DRange(aB2DPolyPolygon.getB2DRange());
rWriter.attribute("height", aB2DRange.getHeight());
rWriter.attribute("width", aB2DRange.getWidth());
rWriter.startElement("polypolygon"); rWriter.startElement("polypolygon");
rWriter.content(basegfx::tools::exportToSvgD(rPolyPolygonColorPrimitive2D.getB2DPolyPolygon(), true, true, false)); rWriter.content(basegfx::tools::exportToSvgD(rPolyPolygonColorPrimitive2D.getB2DPolyPolygon(), true, true, false));
rWriter.endElement(); rWriter.endElement();