summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorHenning Brinkmann <hbrinkm@openoffice.org>2010-08-18 14:42:28 +0200
committerHenning Brinkmann <hbrinkm@openoffice.org>2010-08-18 14:42:28 +0200
commiteb51984cee2d08c943680983ecdc5fede61a4c94 (patch)
treec675ca84cd87ecd364fffd939401cf5f1c6e7722 /writerfilter
parent3fbaee30ee7832d79b02f21f6f1a14a70e735bd9 (diff)
writerfilter09: handle CT_DocDefaults as defaults, too
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 4f8478c80904..86d02a026542 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -549,7 +549,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
break;
case NS_ooxml::LN_CT_Style_tblPr: //contains table properties
case NS_ooxml::LN_CT_Style_tblStylePr: //contains to table properties
- case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
+
case NS_ooxml::LN_CT_TblPrBase_tblInd: //table properties - at least width value and type
case NS_ooxml::LN_EG_RPrBase_rFonts: //table fonts
/* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
@@ -579,6 +579,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
break;
}
case NS_ooxml::LN_CT_PPrDefault_pPr:
+ case NS_ooxml::LN_CT_DocDefaults_pPrDefault:
/* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultParaProps );
m_pImpl->m_rDMapper.sprm( rSprm );
@@ -586,6 +587,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
applyDefaults( true );
break;
case NS_ooxml::LN_CT_RPrDefault_rPr:
+ case NS_ooxml::LN_CT_DocDefaults_rPrDefault:
/* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultCharProps );
m_pImpl->m_rDMapper.sprm( rSprm );
@@ -626,6 +628,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
pTEntry->m_nColBandSize = nIntValue;
}
}
+ break;
case NS_ooxml::LN_CT_TblPrBase_tblCellMar:
//no cell margins in styles
break;