From 382bab9412b87f82da82276332496eb28b28d4f3 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 20 Oct 2014 14:43:42 +0200 Subject: DOCX import: fix wrt. inherited styles We used to ignore this element with a "false" logical attribute, but that causes a problem when an inherited style wants to explicitly disable this element from a parent style. Change-Id: I2fc4c5b2002987d44679d863ea3f19114b9ab7a4 --- writerfilter/source/dmapper/DomainMapper.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 45fb28f41468..12763b9bd91f 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1135,10 +1135,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ? true : false) ); break; case NS_ooxml::LN_CT_PPrBase_pageBreakBefore: - if ( nIntValue == 1 ) - { - rContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE ) ); - } + rContext->Insert(PROP_BREAK_TYPE, uno::makeAny(nIntValue ? style::BreakType_PAGE_BEFORE : style::BreakType_NONE)); break; case NS_ooxml::LN_CT_NumPr_ilvl: if (nIntValue < 0 || 10 <= nIntValue) // Writer can't do everything -- cgit