diff options
| author | Kurt Zenker <kz@openoffice.org> | 2011-04-07 13:02:56 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2011-04-07 13:02:56 +0200 |
| commit | b4221af29dacb70b8a03777624a5988d6657131f (patch) | |
| tree | 50a6db763c3542ce8e0f3b1baaabdd071e362aa0 | |
| parent | 86e7ed8c72184b7a04b836848743979aa3f5fd3d (diff) | |
masterfix OOO340: #i117696# do not write fo:margin
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index d803b79b50a1..6514a644aaa7 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -141,27 +141,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; - - if ((nTop == nBottom) && (nBottom == nLeft) && (nLeft == nRight)) - { - lcl_RemoveState( pPMMarginTop ); - lcl_RemoveState( pPMMarginBottom ); - lcl_RemoveState( pPMMarginLeft ); - lcl_RemoveState( pPMMarginRight ); - } - else - lcl_RemoveState( pPMMarginAll ); - } - else - lcl_RemoveState( pPMMarginAll ); + lcl_RemoveState(pPMMarginAll); // #i117696# do not write fo:margin } if( pPMBorderAll ) |