diff options
| author | Tünde Tóth <tundeth@gmail.com> | 2020-07-07 10:50:24 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-07-13 10:48:53 +0200 |
| commit | f6fc6ab2a2792c22a3e74cce83ac7d19c820c9b4 (patch) | |
| tree | a43f4339fc923275d5ffabc8cf4506d800527810 | |
| parent | tdf#134255 Chart OOXML Import: set the auto text wrap (diff) | |
| download | core-f6fc6ab2a2792c22a3e74cce83ac7d19c820c9b4.tar.gz core-f6fc6ab2a2792c22a3e74cce83ac7d19c820c9b4.zip | |
tdf#122014 Chart OOXML import: set chart title alignment to center
Regression from commit: d4190685ac208677bc77f66976287dda0360c42d
(tdf#114836, only set changed SfxItemSet properties)
Change-Id: If33fa39019bbd36632d15eb3cc0606727e58b111
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98241
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
| -rw-r--r-- | chart2/source/view/main/ShapeFactory.cxx | 5 | ||||
| -rw-r--r-- | sw/qa/extras/layout/data/tdf122014.docx | bin | 0 -> 27324 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 17 |
3 files changed, 21 insertions, 1 deletions
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 23953def50d7..b2e19781c8ef 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -2407,7 +2408,7 @@ uno::Reference< drawing::XShape > aValueMap.insert( { "TextVerticalAdjust", uno::Any(drawing::TextVerticalAdjust_CENTER) } ); //drawing::TextVerticalAdjust aValueMap.insert( { "TextAutoGrowHeight", uno::Any(true) } ); // sal_Bool aValueMap.insert( { "TextAutoGrowWidth", uno::Any(true) } ); // sal_Bool - aValueMap.insert({ "TextMaximumFrameWidth", uno::Any(nTextMaxWidth) }); // sal_Int32 + aValueMap.insert( { "TextMaximumFrameWidth", uno::Any(nTextMaxWidth) } ); // sal_Int32 //set name/classified ObjectID (CID) if( !aName.isEmpty() ) @@ -2506,6 +2507,8 @@ uno::Reference< drawing::XShape > aM.rotate( -basegfx::deg2rad(nRotation) );//#i78696#->#i80521# aM.translate( nXPos, nYPos ); xShapeProp->setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) ); + + xShapeProp->setPropertyValue( "ParaAdjust", uno::Any( style::ParagraphAdjust_CENTER ) ); } catch( const uno::Exception& ) { diff --git a/sw/qa/extras/layout/data/tdf122014.docx b/sw/qa/extras/layout/data/tdf122014.docx Binary files differnew file mode 100644 index 000000000000..400939495984 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf122014.docx diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 4707328fa494..967d849c7f06 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2823,6 +2823,23 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf132956) "Category 1"); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf122014) +{ + SwDoc* pDoc = createDoc("tdf122014.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; + xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile); + CPPUNIT_ASSERT(pXmlDoc); + + // This failed, if the chart title is aligned to left. + sal_Int32 nX1 = getXPath(pXmlDoc, "//textarray[13]", "x").toInt32(); + sal_Int32 nX2 = getXPath(pXmlDoc, "//textarray[14]", "x").toInt32(); + CPPUNIT_ASSERT_GREATER(nX1 + 100, nX2); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134235) { SwDoc* pDoc = createDoc("tdf134235.docx"); |