chart2/source/view/main/PropertyMapper.cxx | 2 ++
sw/qa/extras/layout/data/tdf134659.docx |binary
sw/qa/extras/layout/layout.cxx | 21 ++++++++++++++++++++-
3 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 841e9de2ca39ff05b0adef3cdeea6c2669523cf2
Author: Balazs Varga <balazs.varga...@gmail.com>
AuthorDate: Thu Jul 9 11:08:38 2020 +0200
Commit: Gabor Kelemen <kelemen.gab...@nisz.hu>
CommitDate: Fri Jul 31 14:09:09 2020 +0200
tdf#134659 chart2: use centered label alignment at text break
instead of left for axis labels broken into several lines.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98413
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
(cherry picked from commit 9eb614f8d2d9cc983c51bcdde211ee0c59c3a96c)
Change-Id: Iaf516055748189fa50165f0e954dfe0db15bbfb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99841
Tested-by: Gabor Kelemen <kelemen.gab...@nisz.hu>
Reviewed-by: Gabor Kelemen <kelemen.gab...@nisz.hu>
diff --git a/chart2/source/view/main/PropertyMapper.cxx
b/chart2/source/view/main/PropertyMapper.cxx
index f96c7b101509..9866ab300d43 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <comphelper/sequence.hxx>
#include <tools/diagnose_ex.h>
@@ -453,6 +454,7 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
aValueMap.emplace( "TextVerticalAdjust",
uno::Any(drawing::TextVerticalAdjust_CENTER) ); //drawing::TextVerticalAdjust -
needs to be overwritten
aValueMap.emplace( "TextAutoGrowHeight", uno::Any(true) ); // sal_Bool
aValueMap.emplace( "TextAutoGrowWidth", uno::Any(true) ); // sal_Bool
+ aValueMap.emplace( "ParaAdjust", uno::Any(style::ParagraphAdjust_CENTER)
); // style::ParagraphAdjust_CENTER - needs to be overwritten
if( bName )
aValueMap.emplace( "Name", uno::Any( OUString() ) ); //CID OUString -
needs to be overwritten for each point
diff --git a/sw/qa/extras/layout/data/tdf134659.docx
b/sw/qa/extras/layout/data/tdf134659.docx
new file mode 100644
index 000000000000..7fb0bed23d7f
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134659.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index c5de691dc49e..f109a809355e 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2677,6 +2677,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf132956)
}
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122014)
+
{
SwDoc* pDoc = createDoc("tdf122014.docx");
SwDocShell* pShell = pDoc->GetDocShell();
@@ -2684,7 +2685,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122014)
// Dump the rendering of the first page as an XML file.
std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
MetafileXmlDump dumper;
- xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+ xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
CPPUNIT_ASSERT(pXmlDoc);
// This failed, if the chart title is aligned to left.
@@ -2693,6 +2694,24 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122014)
CPPUNIT_ASSERT_GREATER(nX1 + 100, nX2);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134659)
+
+{
+ SwDoc* pDoc = createDoc("tdf134659.docx");
+ SwDocShell* pShell = pDoc->GetDocShell();
+
+ // Dump the rendering of the first page as an XML file.
+ std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+ MetafileXmlDump dumper;
+ xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ // This failed, if the axis label is aligned to left.
+ sal_Int32 nX1 = getXPath(pXmlDoc, "//textarray[1]", "x").toInt32();
+ sal_Int32 nX2 = getXPath(pXmlDoc, "//textarray[2]", "x").toInt32();
+ CPPUNIT_ASSERT_GREATER(nX1 + 250, nX2);
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134235)
{
SwDoc* pDoc = createDoc("tdf134235.docx");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
