diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-01-06 10:33:19 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-01-06 10:34:01 +0100 |
| commit | 0100280a5c5b121fab2aa932092a7a887bbb507c (patch) | |
| tree | d10432d80de5a2361ea6fa04ef2a058b51fb44c1 | |
| parent | 41cd78b805a36d5676b2075a4860e9aee7bc5491 (diff) | |
fdo#43862: reintroduce fo:margin-* on top of fo:margin for backward compat
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index ba0f45b34506..eedb4a4a9396 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -151,14 +151,8 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& ) pPMMarginLeft->maValue >>= nLeft; pPMMarginRight->maValue >>= nRight; - if ((nTop == nBottom) && (nBottom == nLeft) && (nLeft == nRight)) - { - lcl_RemoveState( pPMMarginTop ); - lcl_RemoveState( pPMMarginBottom ); - lcl_RemoveState( pPMMarginLeft ); - lcl_RemoveState( pPMMarginRight ); - } - else + // Don't remove the Margin Left,Right,Top,Bottom for backward compatibility + if ((nTop != nBottom) || (nBottom != nLeft) || (nLeft != nRight)) lcl_RemoveState( pPMMarginAll ); } else |