diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-06 21:50:53 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-07 13:31:38 +0200 |
| commit | 4e42d99169a1e609b73d102b2947fd09d8e6ea13 (patch) | |
| tree | da5fba6d91fccf71c5c859bd5cf76d76e5ac706a /sd | |
| parent | 7d8809be2407cd5c3f826180095330c7fa44e9a0 (diff) | |
Fix and unify the two methods that get scaled text size
GetTextFitToSizeScale and SdrTextObj::GetFontScaleY both didn't
initialize outliners properly, and thus returned wrong results.
Change-Id: I6fe63c51ed838a0d0fafdfa03597cac97ce29831
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116765
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit a1ae30166e92a0a40dff06740f0bb8e9ee63f70a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116704
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index ef74eb9a4850..c17820ea318b 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -1861,10 +1861,9 @@ void SdOOXMLExportTest2::testFontScale() xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); - // Rounding errors possible, approximate value + // Rounding errors possible, approximate value (+/- 1%) OUString sScale = getXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:sp/p:txBody/a:bodyPr/a:normAutofit", "fontScale"); - if (sScale != "73000" && sScale != "72000" && sScale != "74000") - CPPUNIT_ASSERT_EQUAL(OUString("73000"), sScale); + CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(76000), sScale.toInt32(), 1000); xDocShRef->DoClose(); } |