From 5ad39e2b06d08f160fc0750d179ebc7ebc211a93 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Thu, 5 Nov 2015 17:57:07 +0100 Subject: tdf#92296: Fix off-by-one formatting of text runs on OOXML export This essentially reverts commit 8865ed2efecd03722d10e522265f31c99b13b2bb and implements a different fix for tdf#90812: If the formatting of entire cell is uniform, remove formatting of the leading text run and create corresponding cell style. In all other cases, write out formattings for each individual run. Change-Id: I7724b7a474f773f2cdc39e9150d843642fb05bbe Reviewed-on: https://gerrit.libreoffice.org/19811 Reviewed-by: Eike Rathke Tested-by: Eike Rathke (cherry picked from commit dd971d008780186c88cc33df3610ed8cc9f0a2f4) --- sc/source/filter/excel/xestring.cxx | 3 +-- sc/source/filter/excel/xetable.cxx | 17 +++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 0e1a1279752b..2e716b09ce8d 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -427,10 +427,9 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const const XclExpFont* pFont = NULL; for ( ; aIt != aEnd; ++aIt ) { - // pFont getting first then pass it to run otherwise pFont is NULL. - pFont = rFonts.GetFont( aIt->mnFontIdx ); nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(), nStart, aIt->mnChar-nStart, pFont ); + pFont = rFonts.GetFont( aIt->mnFontIdx ); } lcl_WriteRun( rStrm, GetUnicodeBuffer(), nStart, GetUnicodeBuffer().size() - nStart, pFont ); diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 8422ef63da9d..21f0aa990ff7 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -723,13 +723,18 @@ void XclExpLabelCell::Init( const XclExpRoot& rRoot, mxText = xText; mnSstIndex = 0; - // create the cell format - sal_uInt16 nXclFont = mxText->RemoveLeadingFont(); - if( GetXFId() == EXC_XFID_NOTFOUND ) + const XclFormatRunVec& rFormats = mxText->GetFormats(); + // Create the cell format and remove formatting of the leading run + // if the entire string is equally formatted + if( rFormats.size() == 1 ) { - OSL_ENSURE( nXclFont != EXC_FONT_NOTFOUND, "XclExpLabelCell::Init - leading font not found" ); - bool bForceLineBreak = mxText->IsWrapped(); - SetXFId( rRoot.GetXFBuffer().InsertWithFont( pPattern, ApiScriptType::WEAK, nXclFont, bForceLineBreak ) ); + sal_uInt16 nXclFont = mxText->RemoveLeadingFont(); + if( GetXFId() == EXC_XFID_NOTFOUND ) + { + OSL_ENSURE( nXclFont != EXC_FONT_NOTFOUND, "XclExpLabelCell::Init - leading font not found" ); + bool bForceLineBreak = mxText->IsWrapped(); + SetXFId( rRoot.GetXFBuffer().InsertWithFont( pPattern, ApiScriptType::WEAK, nXclFont, bForceLineBreak ) ); + } } // get auto-wrap attribute from cell format -- cgit