diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 19:21:06 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-07 16:06:28 +0000 |
| commit | 31e6b78a196fbf73d61349ad3530cf49ee145186 (patch) | |
| tree | c9064ab4dd7025354b50ae9ce208cad022f9a5d6 /sd | |
| parent | 4375eefb644d03ab4bafbc091436166a8494dc91 (diff) | |
tdf#106304: Fix newline and empty paragraph font size issues in .pptx export
Output <a:br> instead of for hard newlines. This fixes the
problem that the line before the hard newline in the .pptx export is
not centred.
The fix for the sd_export_ooxml1 test is a bit hacky, but then so is
the code in question.
Don't unnecessarily use bogus default char size for a:endParaRPr.
Instead use the size last used for an a:rPr below the same WriteText()
call. I am not exactly sure about how this hangs together, but this
has the desired effect on the exported .pptx.
(cherry picked from commit 1154cda87d518156d1e52dfb81d5e23b32ab23d5)
(cherry picked from commit 6f93eeb0ba8c4af5c96d1db36f184ffbc71c67ba)
Change-Id: Ie23e0c33e6efb303b183d3b2efce6866d0dda4e8
Reviewed-on: https://gerrit.libreoffice.org/34887
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 8f2ef494ff7c..2fc233bf836a 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -254,11 +254,11 @@ void SdOOXMLExportTest1::testN828390_4() SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>( pObj ); CPPUNIT_ASSERT( pTxtObj ); const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); - aEdit.GetCharAttribs(1, rLst); + aEdit.GetCharAttribs(0, rLst); for( std::vector<EECharAttrib>::reverse_iterator it = rLst.rbegin(); it!=rLst.rend(); ++it) { const SvxFontHeightItem * pFontHeight = dynamic_cast<const SvxFontHeightItem *>((*it).pAttr); - if( pFontHeight ) + if( pFontHeight && (*it).nStart == 18 ) CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font height is wrong", static_cast<sal_uInt32>(1129), pFontHeight->GetHeight() ); const SvxFontItem *pFont = dynamic_cast<const SvxFontItem *>((*it).pAttr); if( pFont ) @@ -267,7 +267,7 @@ void SdOOXMLExportTest1::testN828390_4() bPassed = true; } const SvxWeightItem *pWeight = dynamic_cast<const SvxWeightItem *>((*it).pAttr); - if( pWeight ) + if( pWeight && (*it).nStart == 18 ) CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font Weight is wrong", WEIGHT_BOLD, pWeight->GetWeight() ); } } |