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

Extended loplugin:ostr: emfio

Browse Source 
Change-Id: Ida43018a83c68f5d20dbee30325b8f32099e5b1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159713
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2023-11-19 22:04:45 +01:00
parent 847db3fa12
commit e66ccbecfb
3 changed files with 607 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

828
emfio/qa/cppunit/emf/EmfImportTest.cxx
View File

File diff suppressed because it is too large Load Diff

334
emfio/qa/cppunit/wmf/wmfimporttest.cxx
View File

@@ -96,17 +96,17 @@ void WmfTest::testEOFWmf()
xmlDocUniquePtr pDoc = dumpAndParse(dumper, aGDIMetaFile);
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile/push", 2);
assertXPath(pDoc, "/metafile/push[2]", "flags", "PushClipRegion");
assertXPath(pDoc, "/metafile/push[2]/fillcolor", 2);
assertXPath(pDoc, "/metafile/push[2]/fillcolor[1]", "color", "#000000");
assertXPath(pDoc, "/metafile/push[2]/fillcolor[2]", "color", "#d0d0d0");
assertXPath(pDoc, "/metafile/push[2]/linecolor", 60);
assertXPath(pDoc, "/metafile/push[2]/polyline", 209);
assertXPath(pDoc, "/metafile/push[2]/polyline[1]/point", 5);
assertXPath(pDoc, "/metafile/push[2]/polyline[1]/point[3]", "x", "16906");
assertXPath(pDoc, "/metafile/push[2]/polyline[1]/point[3]", "y", "12673");
assertXPath(pDoc, "/metafile/push[2]/textarray", 307);
assertXPath(pDoc, "/metafile/push"_ostr, 2);
assertXPath(pDoc, "/metafile/push[2]"_ostr, "flags"_ostr, "PushClipRegion");
assertXPath(pDoc, "/metafile/push[2]/fillcolor"_ostr, 2);
assertXPath(pDoc, "/metafile/push[2]/fillcolor[1]"_ostr, "color"_ostr, "#000000");
assertXPath(pDoc, "/metafile/push[2]/fillcolor[2]"_ostr, "color"_ostr, "#d0d0d0");
assertXPath(pDoc, "/metafile/push[2]/linecolor"_ostr, 60);
assertXPath(pDoc, "/metafile/push[2]/polyline"_ostr, 209);
assertXPath(pDoc, "/metafile/push[2]/polyline[1]/point"_ostr, 5);
assertXPath(pDoc, "/metafile/push[2]/polyline[1]/point[3]"_ostr, "x"_ostr, "16906");
assertXPath(pDoc, "/metafile/push[2]/polyline[1]/point[3]"_ostr, "y"_ostr, "12673");
assertXPath(pDoc, "/metafile/push[2]/textarray"_ostr, 307);
}
void WmfTest::testNonPlaceableWmf()
@@ -124,20 +124,20 @@ void WmfTest::testNonPlaceableWmf()
CPPUNIT_ASSERT(pDoc);
// These values come from changes done in tdf#88163
assertXPath(pDoc, "/metafile/polyline[1]/point[1]", "x", "16813");
assertXPath(pDoc, "/metafile/polyline[1]/point[1]", "y", "1004");
assertXPath(pDoc, "/metafile/polyline[1]/point[1]"_ostr, "x"_ostr, "16813");
assertXPath(pDoc, "/metafile/polyline[1]/point[1]"_ostr, "y"_ostr, "1004");
assertXPath(pDoc, "/metafile/polyline[1]/point[2]", "x", "16813");
assertXPath(pDoc, "/metafile/polyline[1]/point[2]", "y", "7514");
assertXPath(pDoc, "/metafile/polyline[1]/point[2]"_ostr, "x"_ostr, "16813");
assertXPath(pDoc, "/metafile/polyline[1]/point[2]"_ostr, "y"_ostr, "7514");
assertXPath(pDoc, "/metafile/polyline[1]/point[3]", "x", "26112");
assertXPath(pDoc, "/metafile/polyline[1]/point[3]", "y", "7514");
assertXPath(pDoc, "/metafile/polyline[1]/point[3]"_ostr, "x"_ostr, "26112");
assertXPath(pDoc, "/metafile/polyline[1]/point[3]"_ostr, "y"_ostr, "7514");
assertXPath(pDoc, "/metafile/polyline[1]/point[4]", "x", "26112");
assertXPath(pDoc, "/metafile/polyline[1]/point[4]", "y", "1004");
assertXPath(pDoc, "/metafile/polyline[1]/point[4]"_ostr, "x"_ostr, "26112");
assertXPath(pDoc, "/metafile/polyline[1]/point[4]"_ostr, "y"_ostr, "1004");
assertXPath(pDoc, "/metafile/polyline[1]/point[5]", "x", "16813");
assertXPath(pDoc, "/metafile/polyline[1]/point[5]", "y", "1004");
assertXPath(pDoc, "/metafile/polyline[1]/point[5]"_ostr, "x"_ostr, "16813");
assertXPath(pDoc, "/metafile/polyline[1]/point[5]"_ostr, "y"_ostr, "1004");
}
void WmfTest::testTdf88163NonPlaceableWmf()
@@ -156,23 +156,23 @@ void WmfTest::testTdf88163NonPlaceableWmf()
// Fails without the fix
// With fix: 3272, without fix: ~ 8000
auto x = getXPath(pDoc, "/metafile/push[2]/font[1]", "height");
auto x = getXPath(pDoc, "/metafile/push[2]/font[1]"_ostr, "height"_ostr);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3272), x.toInt32());
// Fails without the fix: Expected: 7359, Actual: 7336
assertXPath(pDoc, "/metafile/push[2]/textarray[1]", "x", "7359");
assertXPath(pDoc, "/metafile/push[2]/textarray[1]"_ostr, "x"_ostr, "7359");
// Fails without the fix: Expected: 4118, Actual: 4104
assertXPath(pDoc, "/metafile/push[2]/textarray[1]", "y", "4118");
assertXPath(pDoc, "/metafile/push[2]/textarray[1]"_ostr, "y"_ostr, "4118");
// Fails without the fix: Expected: 5989, Actual: 5971
assertXPath(pDoc, "/metafile/push[2]/textarray[2]", "x", "5989");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "x"_ostr, "5989");
// Fails without the fix: Expected: 16264, Actual: 16208
assertXPath(pDoc, "/metafile/push[2]/textarray[2]", "y", "16264");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "y"_ostr, "16264");
// Fails without the fix: Expected: 20769, Actual: 20705
assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "x", "20769");
assertXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "x"_ostr, "20769");
// Fails without the fix: Expected: 4077, Actual: 4062
assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "y", "4077");
assertXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "y"_ostr, "4077");
}
void WmfTest::testTdf88163PlaceableWmf()
@@ -191,26 +191,26 @@ void WmfTest::testTdf88163PlaceableWmf()
// These values come from the fix for tdf#88163
// The fix does not affect the font size
auto x = getXPath(pDoc, "/metafile/push[2]/font[1]", "height");
auto x = getXPath(pDoc, "/metafile/push[2]/font[1]"_ostr, "height"_ostr);
CPPUNIT_ASSERT_EQUAL(sal_Int32(313), x.toInt32());
// Fails without the fix: Expected: 1900, Actual: 19818
assertXPath(pDoc, "/metafile", "height", "1900");
assertXPath(pDoc, "/metafile"_ostr, "height"_ostr, "1900");
// Fails without the fix: Expected: 704, Actual: 7336
assertXPath(pDoc, "/metafile/push[2]/textarray[1]", "x", "704");
assertXPath(pDoc, "/metafile/push[2]/textarray[1]"_ostr, "x"_ostr, "704");
// Fails without the fix: Expected: 394, Actual: 4110
assertXPath(pDoc, "/metafile/push[2]/textarray[1]", "y", "394");
assertXPath(pDoc, "/metafile/push[2]/textarray[1]"_ostr, "y"_ostr, "394");
// Fails without the fix: Expected: 573, Actual: 5971
assertXPath(pDoc, "/metafile/push[2]/textarray[2]", "x", "573");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "x"_ostr, "573");
// Fails without the fix: Expected: 1556, Actual: 16230
assertXPath(pDoc, "/metafile/push[2]/textarray[2]", "y", "1556");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "y"_ostr, "1556");
// Fails without the fix: Expected: 1987, Actual: 20706
assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "x", "1987");
assertXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "x"_ostr, "1987");
// Fails without the fix: Expected: 390, Actual: 4068
assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "y", "390");
assertXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "y"_ostr, "390");
}
void WmfTest::testSetTextAlignWmf()
@@ -226,80 +226,80 @@ void WmfTest::testSetTextAlignWmf()
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile", "height", "20999");
assertXPath(pDoc, "/metafile"_ostr, "height"_ostr, "20999");
assertXPath(pDoc, "/metafile/push[2]/textalign[2]", "align", "top");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]", "x", "11642");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]", "y", "212");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[2]/text", "textalignment:default");
assertXPath(pDoc, "/metafile/push[2]/textalign[2]"_ostr, "align"_ostr, "top");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "x"_ostr, "11642");
assertXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "y"_ostr, "212");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[2]/text"_ostr, "textalignment:default");
assertXPath(pDoc, "/metafile/push[2]/textalign[3]", "align", "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[3]", "x", 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "y", "212");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[3]/text", "textalignment:0x00");
assertXPath(pDoc, "/metafile/push[2]/textalign[3]"_ostr, "align"_ostr, "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "x"_ostr, 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "y"_ostr, "212");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[3]/text"_ostr, "textalignment:0x00");
assertXPath(pDoc, "/metafile/push[2]/textalign[4]", "align", "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[4]", "x", 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[4]", "y", "423");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[4]/text", "textalignment:0x02");
assertXPath(pDoc, "/metafile/push[2]/textalign[4]"_ostr, "align"_ostr, "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[4]"_ostr, "x"_ostr, 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[4]"_ostr, "y"_ostr, "423");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[4]/text"_ostr, "textalignment:0x02");
assertXPath(pDoc, "/metafile/push[2]/textalign[5]", "align", "top");
assertXPath(pDoc, "/metafile/push[2]/textalign[5]"_ostr, "align"_ostr, "top");
// Fails without the fix: Expected: 12026, Actual: 12350
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[5]", "x", 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[5]", "y", "635");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[5]/text", "textalignment:0x04");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[5]"_ostr, "x"_ostr, 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[5]"_ostr, "y"_ostr, "635");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[5]/text"_ostr, "textalignment:0x04");
assertXPath(pDoc, "/metafile/push[2]/textalign[6]", "align", "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[6]", "x", 12363, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[6]", "y", "847");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[6]/text", "textalignment:0x06");
assertXPath(pDoc, "/metafile/push[2]/textalign[6]"_ostr, "align"_ostr, "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[6]"_ostr, "x"_ostr, 12363, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[6]"_ostr, "y"_ostr, "847");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[6]/text"_ostr, "textalignment:0x06");
assertXPath(pDoc, "/metafile/push[2]/textalign[7]", "align", "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[7]", "x", 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[7]", "y", "1058");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[7]/text", "textalignment:0x08");
assertXPath(pDoc, "/metafile/push[2]/textalign[7]"_ostr, "align"_ostr, "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[7]"_ostr, "x"_ostr, 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[7]"_ostr, "y"_ostr, "1058");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[7]/text"_ostr, "textalignment:0x08");
assertXPath(pDoc, "/metafile/push[2]/textalign[8]", "align", "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[8]", "x", 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[8]", "y", "1270");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[8]/text", "textalignment:0x0A");
assertXPath(pDoc, "/metafile/push[2]/textalign[8]"_ostr, "align"_ostr, "top");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[8]"_ostr, "x"_ostr, 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[8]"_ostr, "y"_ostr, "1270");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[8]/text"_ostr, "textalignment:0x0A");
assertXPath(pDoc, "/metafile/push[2]/textalign[9]", "align", "bottom");
assertXPath(pDoc, "/metafile/push[2]/textalign[9]"_ostr, "align"_ostr, "bottom");
// Fails without the fix: Expected: 12026, Actual: 12350
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[9]", "x", 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[9]", "y", "1482");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[9]/text", "textalignment:0x0C");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[9]"_ostr, "x"_ostr, 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[9]"_ostr, "y"_ostr, "1482");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[9]/text"_ostr, "textalignment:0x0C");
assertXPath(pDoc, "/metafile/push[2]/textalign[10]", "align", "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[10]", "x", 12363, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[10]", "y", "1693");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[10]/text", "textalignment:0x0E");
assertXPath(pDoc, "/metafile/push[2]/textalign[10]"_ostr, "align"_ostr, "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[10]"_ostr, "x"_ostr, 12363, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[10]"_ostr, "y"_ostr, "1693");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[10]/text"_ostr, "textalignment:0x0E");
assertXPath(pDoc, "/metafile/push[2]/textalign[11]", "align", "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[11]", "x", 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[11]", "y", "1905");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[11]/text", "textalignment:0x10");
assertXPath(pDoc, "/metafile/push[2]/textalign[11]"_ostr, "align"_ostr, "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[11]"_ostr, "x"_ostr, 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[11]"_ostr, "y"_ostr, "1905");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[11]/text"_ostr, "textalignment:0x10");
assertXPath(pDoc, "/metafile/push[2]/textalign[12]", "align", "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[12]", "x", 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[12]", "y", "2117");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[12]/text", "textalignment:0x12");
assertXPath(pDoc, "/metafile/push[2]/textalign[12]"_ostr, "align"_ostr, "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[12]"_ostr, "x"_ostr, 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[12]"_ostr, "y"_ostr, "2117");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[12]/text"_ostr, "textalignment:0x12");
assertXPath(pDoc, "/metafile/push[2]/textalign[13]", "align", "bottom");
assertXPath(pDoc, "/metafile/push[2]/textalign[13]"_ostr, "align"_ostr, "bottom");
// Fails without the fix: Expected: 12026, Actual: 12350
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[13]", "x", 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[13]", "y", "2328");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[13]/text", "textalignment:0x14");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[13]"_ostr, "x"_ostr, 12026, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[13]"_ostr, "y"_ostr, "2328");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[13]/text"_ostr, "textalignment:0x14");
assertXPath(pDoc, "/metafile/push[2]/textalign[14]", "align", "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[14]", "x", 12363, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[14]", "y", "2540");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[14]/text", "textalignment:0x16");
assertXPath(pDoc, "/metafile/push[2]/textalign[14]"_ostr, "align"_ostr, "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[14]"_ostr, "x"_ostr, 12363, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[14]"_ostr, "y"_ostr, "2540");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[14]/text"_ostr, "textalignment:0x16");
assertXPath(pDoc, "/metafile/push[2]/textalign[15]", "align", "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[15]", "x", 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[15]", "y", "2752");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[15]/text", "textalignment:0x18");
assertXPath(pDoc, "/metafile/push[2]/textalign[15]"_ostr, "align"_ostr, "bottom");
assertXPathDoubleValue(pDoc, "/metafile/push[2]/textarray[15]"_ostr, "x"_ostr, 12700, 30);
assertXPath(pDoc, "/metafile/push[2]/textarray[15]"_ostr, "y"_ostr, "2752");
assertXPathContent(pDoc, "/metafile/push[2]/textarray[15]/text"_ostr, "textalignment:0x18");
}
void WmfTest::testSine()
@@ -315,7 +315,7 @@ void WmfTest::testSine()
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile/sectrectclipregion", 0);
assertXPath(pDoc, "/metafile/sectrectclipregion"_ostr, 0);
}
void WmfTest::testEmfProblem()
@@ -331,11 +331,11 @@ void WmfTest::testEmfProblem()
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile/sectrectclipregion", 2);
assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "top", "2125");
assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "left", "1084");
assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "bottom", "2927");
assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "right", "2376");
assertXPath(pDoc, "/metafile/sectrectclipregion"_ostr, 2);
assertXPath(pDoc, "/metafile/sectrectclipregion[1]"_ostr, "top"_ostr, "2125");
assertXPath(pDoc, "/metafile/sectrectclipregion[1]"_ostr, "left"_ostr, "1084");
assertXPath(pDoc, "/metafile/sectrectclipregion[1]"_ostr, "bottom"_ostr, "2927");
assertXPath(pDoc, "/metafile/sectrectclipregion[1]"_ostr, "right"_ostr, "2376");
}
void WmfTest::testEmfLineStyles()
@@ -352,50 +352,50 @@ void WmfTest::testEmfLineStyles()
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile/line", 4);
assertXPath(pDoc, "/metafile/linecolor", 5);
assertXPath(pDoc, "/metafile/line"_ostr, 4);
assertXPath(pDoc, "/metafile/linecolor"_ostr, 5);
assertXPath(pDoc, "/metafile/linecolor[1]", "color", "#ffffff");
assertXPath(pDoc, "/metafile/linecolor[2]", "color", "#00ff00");
assertXPath(pDoc, "/metafile/linecolor[3]", "color", "#408080");
assertXPath(pDoc, "/metafile/linecolor[4]", "color", "#ff0000");
assertXPath(pDoc, "/metafile/linecolor[5]", "color", "#0000ff");
assertXPath(pDoc, "/metafile/linecolor[1]"_ostr, "color"_ostr, "#ffffff");
assertXPath(pDoc, "/metafile/linecolor[2]"_ostr, "color"_ostr, "#00ff00");
assertXPath(pDoc, "/metafile/linecolor[3]"_ostr, "color"_ostr, "#408080");
assertXPath(pDoc, "/metafile/linecolor[4]"_ostr, "color"_ostr, "#ff0000");
assertXPath(pDoc, "/metafile/linecolor[5]"_ostr, "color"_ostr, "#0000ff");
assertXPath(pDoc, "/metafile/line[1]", "style", "dash");
assertXPath(pDoc, "/metafile/line[1]", "dashlen", "528");
assertXPath(pDoc, "/metafile/line[1]", "dashcount", "1");
assertXPath(pDoc, "/metafile/line[1]", "dotlen", "176");
assertXPath(pDoc, "/metafile/line[1]", "dotcount", "0");
assertXPath(pDoc, "/metafile/line[1]", "distance", "176");
assertXPath(pDoc, "/metafile/line[1]", "join", "miter");
assertXPath(pDoc, "/metafile/line[1]", "cap", "butt");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "style"_ostr, "dash");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "dashlen"_ostr, "528");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "dashcount"_ostr, "1");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "dotlen"_ostr, "176");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "dotcount"_ostr, "0");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "distance"_ostr, "176");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "join"_ostr, "miter");
assertXPath(pDoc, "/metafile/line[1]"_ostr, "cap"_ostr, "butt");
assertXPath(pDoc, "/metafile/line[2]", "style", "dash");
assertXPath(pDoc, "/metafile/line[2]", "dashlen", "528");
assertXPath(pDoc, "/metafile/line[2]", "dashcount", "0");
assertXPath(pDoc, "/metafile/line[2]", "dotlen", "176");
assertXPath(pDoc, "/metafile/line[2]", "dotcount", "1");
assertXPath(pDoc, "/metafile/line[2]", "distance", "176");
assertXPath(pDoc, "/metafile/line[2]", "join", "miter");
assertXPath(pDoc, "/metafile/line[2]", "cap", "butt");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "style"_ostr, "dash");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "dashlen"_ostr, "528");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "dashcount"_ostr, "0");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "dotlen"_ostr, "176");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "dotcount"_ostr, "1");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "distance"_ostr, "176");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "join"_ostr, "miter");
assertXPath(pDoc, "/metafile/line[2]"_ostr, "cap"_ostr, "butt");
assertXPath(pDoc, "/metafile/line[3]", "style", "dash");
assertXPath(pDoc, "/metafile/line[3]", "dashlen", "528");
assertXPath(pDoc, "/metafile/line[3]", "dashcount", "1");
assertXPath(pDoc, "/metafile/line[3]", "dotlen", "176");
assertXPath(pDoc, "/metafile/line[3]", "dotcount", "1");
assertXPath(pDoc, "/metafile/line[3]", "distance", "176");
assertXPath(pDoc, "/metafile/line[3]", "join", "miter");
assertXPath(pDoc, "/metafile/line[3]", "cap", "butt");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "style"_ostr, "dash");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "dashlen"_ostr, "528");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "dashcount"_ostr, "1");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "dotlen"_ostr, "176");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "dotcount"_ostr, "1");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "distance"_ostr, "176");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "join"_ostr, "miter");
assertXPath(pDoc, "/metafile/line[3]"_ostr, "cap"_ostr, "butt");
assertXPath(pDoc, "/metafile/line[4]", "style", "dash");
assertXPath(pDoc, "/metafile/line[4]", "dashlen", "528");
assertXPath(pDoc, "/metafile/line[4]", "dashcount", "1");
assertXPath(pDoc, "/metafile/line[4]", "dotlen", "176");
assertXPath(pDoc, "/metafile/line[4]", "dotcount", "2");
assertXPath(pDoc, "/metafile/line[4]", "distance", "176");
assertXPath(pDoc, "/metafile/line[4]", "join", "miter");
assertXPath(pDoc, "/metafile/line[4]", "cap", "butt");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "style"_ostr, "dash");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "dashlen"_ostr, "528");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "dashcount"_ostr, "1");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "dotlen"_ostr, "176");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "dotcount"_ostr, "2");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "distance"_ostr, "176");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "join"_ostr, "miter");
assertXPath(pDoc, "/metafile/line[4]"_ostr, "cap"_ostr, "butt");
};
void WmfTest::testWorldTransformFontSize()
@@ -411,27 +411,27 @@ void WmfTest::testWorldTransformFontSize()
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile/font", 9);
assertXPath(pDoc, "/metafile/font"_ostr, 9);
assertXPath(pDoc, "/metafile/font[1]", "color", "#595959");
assertXPath(pDoc, "/metafile/font[1]", "width", "0");
assertXPath(pDoc, "/metafile/font[1]", "height", "389");
assertXPath(pDoc, "/metafile/font[1]", "orientation", "0");
assertXPath(pDoc, "/metafile/font[1]", "weight", "bold");
assertXPath(pDoc, "/metafile/font[1]"_ostr, "color"_ostr, "#595959");
assertXPath(pDoc, "/metafile/font[1]"_ostr, "width"_ostr, "0");
assertXPath(pDoc, "/metafile/font[1]"_ostr, "height"_ostr, "389");
assertXPath(pDoc, "/metafile/font[1]"_ostr, "orientation"_ostr, "0");
assertXPath(pDoc, "/metafile/font[1]"_ostr, "weight"_ostr, "bold");
assertXPath(pDoc, "/metafile/font[3]", "color", "#000000");
assertXPath(pDoc, "/metafile/font[3]", "width", "0");
assertXPath(pDoc, "/metafile/font[3]", "height", "389");
assertXPath(pDoc, "/metafile/font[3]", "orientation", "0");
assertXPath(pDoc, "/metafile/font[3]", "weight", "bold");
assertXPath(pDoc, "/metafile/font[3]"_ostr, "color"_ostr, "#000000");
assertXPath(pDoc, "/metafile/font[3]"_ostr, "width"_ostr, "0");
assertXPath(pDoc, "/metafile/font[3]"_ostr, "height"_ostr, "389");
assertXPath(pDoc, "/metafile/font[3]"_ostr, "orientation"_ostr, "0");
assertXPath(pDoc, "/metafile/font[3]"_ostr, "weight"_ostr, "bold");
// World transform should not affect font size. Rotating text for 90 degrees
// should not exchange font width and height.
assertXPath(pDoc, "/metafile/font[4]", "color", "#000000");
assertXPath(pDoc, "/metafile/font[4]", "width", "0");
assertXPath(pDoc, "/metafile/font[4]", "height", "530");
assertXPath(pDoc, "/metafile/font[4]", "orientation", "900");
assertXPath(pDoc, "/metafile/font[4]", "weight", "normal");
assertXPath(pDoc, "/metafile/font[4]"_ostr, "color"_ostr, "#000000");
assertXPath(pDoc, "/metafile/font[4]"_ostr, "width"_ostr, "0");
assertXPath(pDoc, "/metafile/font[4]"_ostr, "height"_ostr, "530");
assertXPath(pDoc, "/metafile/font[4]"_ostr, "orientation"_ostr, "900");
assertXPath(pDoc, "/metafile/font[4]"_ostr, "weight"_ostr, "normal");
}
void WmfTest::testBigPPI()
@@ -451,8 +451,8 @@ void WmfTest::testBigPPI()
// If the PPI was not reduced the width and height would be <100 which is too small
// Related: tdf#150888
assertXPath(pDoc, "/metafile", "width", "2540");
assertXPath(pDoc, "/metafile", "height", "2143");
assertXPath(pDoc, "/metafile"_ostr, "width"_ostr, "2540");
assertXPath(pDoc, "/metafile"_ostr, "height"_ostr, "2143");
}
void WmfTest::testTdf93750()
@@ -466,8 +466,8 @@ void WmfTest::testTdf93750()
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/metafile/push[1]/comment[2]", "datasize", "28");
assertXPath(pDoc, "/metafile/push[1]/comment[3]", "datasize", "72");
assertXPath(pDoc, "/metafile/push[1]/comment[2]"_ostr, "datasize"_ostr, "28");
assertXPath(pDoc, "/metafile/push[1]/comment[3]"_ostr, "datasize"_ostr, "72");
}
void WmfTest::testTdf99402()
@@ -504,7 +504,7 @@ void WmfTest::testTdf39894Wmf()
// The x position of the second text must take into account
// the previous text's last Dx (previously was ~300)
auto x = getXPath(pDoc, "/metafile/push[2]/textarray[2]", "x");
auto x = getXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "x"_ostr);
CPPUNIT_ASSERT_GREATER(sal_Int32(2700), x.toInt32());
}
@@ -521,7 +521,7 @@ void WmfTest::testTdf39894Emf()
// The x position of the second text must take into account
// the previous text's last Dx (previously was ~300)
auto x = getXPath(pDoc, "/metafile/push[2]/textarray[2]", "x");
auto x = getXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "x"_ostr);
CPPUNIT_ASSERT_GREATER(sal_Int32(2700), x.toInt32());
}
@@ -538,9 +538,9 @@ void WmfTest::testETO_PDYWmf()
// The y position of following text
// must be smaller than that of previous
auto y1 = getXPath(pDoc, "/metafile/push[2]/textarray[1]", "y");
auto y2 = getXPath(pDoc, "/metafile/push[2]/textarray[2]", "y");
auto y3 = getXPath(pDoc, "/metafile/push[2]/textarray[3]", "y");
auto y1 = getXPath(pDoc, "/metafile/push[2]/textarray[1]"_ostr, "y"_ostr);
auto y2 = getXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "y"_ostr);
auto y3 = getXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "y"_ostr);
CPPUNIT_ASSERT(y2.toInt32() < y1.toInt32());
CPPUNIT_ASSERT(y3.toInt32() < y2.toInt32());
}
@@ -558,9 +558,9 @@ void WmfTest::testETO_PDYEmf()
// The y position of following text
// must be smaller than that of previous
auto y1 = getXPath(pDoc, "/metafile/push[2]/textarray[1]", "y");
auto y2 = getXPath(pDoc, "/metafile/push[2]/textarray[2]", "y");
auto y3 = getXPath(pDoc, "/metafile/push[2]/textarray[3]", "y");
auto y1 = getXPath(pDoc, "/metafile/push[2]/textarray[1]"_ostr, "y"_ostr);
auto y2 = getXPath(pDoc, "/metafile/push[2]/textarray[2]"_ostr, "y"_ostr);
auto y3 = getXPath(pDoc, "/metafile/push[2]/textarray[3]"_ostr, "y"_ostr);
CPPUNIT_ASSERT(y2.toInt32() < y1.toInt32());
CPPUNIT_ASSERT(y3.toInt32() < y2.toInt32());
}
@@ -580,7 +580,7 @@ void WmfTest::testStockObject()
// - Expected: 1
// - Actual : 0
// - In <>, XPath '/metafile/push[2]/fillcolor[2]' number of nodes is incorrect
assertXPath(pDoc, "/metafile/push[2]/fillcolor[2]", "color", "#000000");
assertXPath(pDoc, "/metafile/push[2]/fillcolor[2]"_ostr, "color"_ostr, "#000000");
}
CPPUNIT_TEST_SUITE_REGISTRATION(WmfTest);

8
emfio/source/reader/mtftools.cxx
View File

@@ -1547,10 +1547,10 @@ namespace emfio
WriteSvtGraphicFill( aMemStm, aFill );
mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_BEGIN", 0,
mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_BEGIN"_ostr, 0,
static_cast<const sal_uInt8*>(aMemStm.GetData()),
aMemStm.TellEnd() ) );
mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_END" ) );
mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_END"_ostr ) );
}
}
@@ -2515,14 +2515,14 @@ namespace emfio
// on windows where the function parameters are probably resolved in reverse order
mem.Flush();
mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, static_cast<const sal_uInt8*>(mem.GetData()), mem.GetEndOfData() ) );
mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO"_ostr, 0, static_cast<const sal_uInt8*>(mem.GetData()), mem.GetEndOfData() ) );
mpGDIMetaFile->UseCanvas( true );
}
void MtfTools::PassEMFPlus( void const * pBuffer, sal_uInt32 nLength )
{
EMFP_DEBUG(printf ("\t\t\tadd EMF_PLUS comment length %04x\n",(unsigned int) nLength));
mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS", 0, static_cast<const sal_uInt8*>(pBuffer), nLength ) );
mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS"_ostr, 0, static_cast<const sal_uInt8*>(pBuffer), nLength ) );
}
}