[Libreoffice-commits] .: xmloff/source

[Cédric Bosdonnat]

 xmloff/source/style/PageMasterExportPropMapper.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 0100280a5c5b121fab2aa932092a7a887bbb507c
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Jan 6 10:33:19 2012 +0100

    fdo#43862: reintroduce fo:margin-* on top of fo:margin for backward compat

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index ba0f45b..eedb4a4 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