diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-11 17:36:12 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-12 09:44:10 +0100 |
| commit | 00d74a5e0291a40e532b2a0f51fdd5a3e1f487ed (patch) | |
| tree | c34ba7a271768d14bd6f5535069ac203228fa476 /sw/qa | |
| parent | 9871789e0f9256ac27ea7bc4590ba910d6e4c373 (diff) | |
Use more o3tl::convert in sc
Change-Id: I624b6c570eff8b6cdc83ffcb2d0dbadf848715b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120330
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 6 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 18447752a46f..0d5b2eed0ec8 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -3001,12 +3001,12 @@ DECLARE_ODFEXPORT_EXPORTONLY_TEST(tdf99631, "tdf99631.docx") { // check import of VisualArea settings of the embedded XLSX OLE objects xmlDocUniquePtr pXmlDoc = parseExport("Object 1/settings.xml"); - assertXPathContent(pXmlDoc, "//config:config-item[@config:name='VisibleAreaWidth']", "4515"); + assertXPathContent(pXmlDoc, "//config:config-item[@config:name='VisibleAreaWidth']", "4516"); assertXPathContent(pXmlDoc, "//config:config-item[@config:name='VisibleAreaHeight']", "903"); xmlDocUniquePtr pXmlDoc2 = parseExport("Object 2/settings.xml"); - assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaWidth']", "4515"); - assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaHeight']", "1354"); + assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaWidth']", "4516"); + assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaHeight']", "1355"); } DECLARE_ODFEXPORT_TEST(tdf128504, "tdf128504.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 8b00733fafb3..1416f59fcbc6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -964,11 +964,11 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf99631) assertXPath(pXmlDoc, "//w:object", 2); assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object", 2); // first XSLX OLE object (1:1 scale) - assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:object[1]", "dxaOrig", "2560"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:object[1]", "dxaOrig", "2561"); assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:object[1]", "dyaOrig", "513"); // second XLSX OLE object (same content + 1 row, but zoomed) - assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:object[1]", "dxaOrig", "2560"); - assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:object[1]", "dyaOrig", "768"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:object[1]", "dxaOrig", "2561"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:object[1]", "dyaOrig", "769"); } CPPUNIT_TEST_FIXTURE(Test, testTdf138899) |