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:37:04 +0100 |
| commit | bdf67a728996489fabc281ce24d8b81cd6287588 (patch) | |
| tree | 2deba2ca1a2a60d1d07eb4a9fd2174ecf202b406 | |
| parent | 47c85a818ecd956d26fa7790ca9c0e7835c5c0b0 (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 |