diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-02-25 13:16:12 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-11 15:57:02 +0100 |
| commit | 04f8c446c14a4a2b358fc48d9cdb7dd0af19ce7a (patch) | |
| tree | 130835d1ff32f0f945e4b1ea0182346e509a13cd | |
| parent | Bump version to 4.1-6 (diff) | |
| download | core-04f8c446c14a4a2b358fc48d9cdb7dd0af19ce7a.tar.gz core-04f8c446c14a4a2b358fc48d9cdb7dd0af19ce7a.zip | |
Related: #i124106# correct handling of page break attributes
i.e. those which are providing the default value explicitly
(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx
(cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5)
Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index dfbc4a788a10..f51a026a4e64 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1520,7 +1520,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType bool bExchangeLeftRight = false; Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue->getInt(); - OUString sStringValue = pValue->getString(); + const OUString sStringValue = pValue->getString(); PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); switch(nSprmId) @@ -1547,7 +1547,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType rContext->Insert(PROP_PARA_KEEP_TOGETHER, true, uno::makeAny( nIntValue ? true : false) ); break; case NS_sprm::LN_PFPageBreakBefore: - rContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE ) ); + if ( nIntValue == 1 ) + { + rContext->Insert(PROP_BREAK_TYPE, true, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE ) ); + } break; // sprmPFPageBreakBefore case NS_sprm::LN_PBrcl: break; // sprmPBrcl |