diff options
Diffstat (limited to 'sc/source/filter/oox/stylesbuffer.cxx')
| -rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 1ac390a0d5af..cb1ce6eef76c 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2260,10 +2260,13 @@ void Xf::writeToMarkData( ::ScMarkData& rMarkData, sal_Int32 nNumFmtId ) ScDocument& rDoc = getScDocument(); if ( isCellXf() ) { + StylesBuffer& rStyles = getStyles(); + rStyles.createCellStyle( maModel.mnStyleXfId ); + + mpStyleSheet = rStyles.getCellStyleSheet( maModel.mnStyleXfId ); if ( mpStyleSheet ) { - // Apply style sheet. Don't clear the direct formats. - rPat.SetStyleSheet(mpStyleSheet, false); + rDoc.ApplySelectionStyle( static_cast<ScStyleSheet&>(*mpStyleSheet), rMarkData ); } else { @@ -2275,7 +2278,7 @@ void Xf::writeToMarkData( ::ScMarkData& rMarkData, sal_Int32 nNumFmtId ) ScGlobal::GetRscString(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA)); if (pStyleSheet) - rPat.SetStyleSheet(pStyleSheet, false); + rDoc.ApplySelectionStyle( static_cast<ScStyleSheet&>(*pStyleSheet), rMarkData ); } } } @@ -2329,7 +2332,6 @@ Xf::createPattern( bool bSkipPoolDefs ) { if( mpPattern.get() ) return *mpPattern; - // create new pattern attribute set mpPattern.reset( new ::ScPatternAttr( getScDocument().GetPool() ) ); SfxItemSet& rItemSet = mpPattern->GetItemSet(); /* Enables the used flags, if the formatting attributes differ from the @@ -2858,6 +2860,11 @@ OUString CellStyleBuffer::createCellStyle( sal_Int32 nXfId ) const return createCellStyle( maStylesByXf.get( nXfId ) ); } +::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( sal_Int32 nXfId ) const +{ + return getCellStyleSheet( maStylesByXf.get( nXfId ) ); +} + // private -------------------------------------------------------------------- void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) @@ -2878,6 +2885,14 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) } } +::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) const +{ + ::ScStyleSheet* pStyleSheet = NULL; + if ( rxCellStyle.get() ) + pStyleSheet = rxCellStyle->getStyleSheet(); + return pStyleSheet; +} + OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) const { if( rxCellStyle.get() ) @@ -3128,6 +3143,11 @@ OUString StylesBuffer::createCellStyle( sal_Int32 nXfId ) const return maCellStyles.createCellStyle( nXfId ); } +::ScStyleSheet* StylesBuffer::getCellStyleSheet( sal_Int32 nXfId ) const +{ + return maCellStyles.getCellStyleSheet( nXfId ); +} + OUString StylesBuffer::createDxfStyle( sal_Int32 nDxfId ) const { OUString& rStyleName = maDxfStyles[ nDxfId ]; |