diff options
| author | Kurt Zenker <kz@openoffice.org> | 2011-04-07 13:02:56 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-15 16:06:06 +0000 |
| commit | ced21f28931e749a16a676420c31c1e880fb8854 (patch) | |
| tree | df4358b1dcb4cb3faa2dd363e6142ba674e4c5aa /xmloff | |
| parent | 94c50851dde2c0750d589f92448e87d5f61689d7 (diff) | |
masterfix OOO340: #i117696# do not write fo:margin
Conflicts:
xmloff/source/style/PageMasterExportPropMapper.cxx
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 3b4db9324b0d..6f8eae5cdf4e 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -142,21 +142,7 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& ) { if (pPMMarginAll) { - if (pPMMarginTop && pPMMarginBottom && pPMMarginLeft && pPMMarginRight) - { - sal_Int32 nTop = 0, nBottom = 0, nLeft = 0, nRight = 0; - - pPMMarginTop->maValue >>= nTop; - pPMMarginBottom->maValue >>= nBottom; - pPMMarginLeft->maValue >>= nLeft; - pPMMarginRight->maValue >>= nRight; - - // Don't remove the Margin Left,Right,Top,Bottom for backward compatibility - if ((nTop != nBottom) || (nBottom != nLeft) || (nLeft != nRight)) - lcl_RemoveState( pPMMarginAll ); - } - else - lcl_RemoveState( pPMMarginAll ); + lcl_RemoveState(pPMMarginAll); // #i117696# do not write fo:margin } if( pPMBorderAll ) |