diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:17:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 15:17:15 +0000 |
| commit | ab98995a04286f5bee90b63789b4303b2cbc69f2 (patch) | |
| tree | 4dfec47abe8bfbbcecebba85e36fb8d1ad105400 /xmloff/source/style/PageMasterExportPropMapper.cxx | |
| parent | 4dcc88680aaf369c5c781893e82ffc5ba3ecc293 (diff) | |
INTEGRATION: CWS cjksp1_DEV300 (1.21.64); FILE MERGED
2007/11/13 05:01:13 pflin 1.21.64.2: fix for fme's comments
2007/11/11 03:10:32 pflin 1.21.64.1: not write layout-grid-standard-mode inside the <style:page-layout>
Diffstat (limited to 'xmloff/source/style/PageMasterExportPropMapper.cxx')
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index b893990d5df5..d0694b8fb0ae 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PageMasterExportPropMapper.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:26:14 $ + * last change: $Author: kz $ $Date: 2008-03-07 16:17:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -348,6 +348,9 @@ void XMLPageMasterExportPropMapper::ContextFilter( XMLPropertyState* pPMScaleToPages = NULL; XMLPropertyState* pPMScaleToX = NULL; XMLPropertyState* pPMScaleToY = NULL; + XMLPropertyState* pPMStandardMode = NULL; + XMLPropertyState* pPMGridBaseWidth = NULL; + XMLPropertyState* pPMGridSnapToChars = NULL; XMLPropertyState* pPrint = NULL; @@ -400,6 +403,9 @@ void XMLPageMasterExportPropMapper::ContextFilter( case CTF_PM_SCALETOPAGES: pPMScaleToPages = pProp; break; case CTF_PM_SCALETOX: pPMScaleToX = pProp; break; case CTF_PM_SCALETOY: pPMScaleToY = pProp; break; + case CTF_PM_STANDARD_MODE: pPMStandardMode = pProp; break; + case CTP_PM_GRID_BASE_WIDTH: pPMGridBaseWidth = pProp; break; + case CTP_PM_GRID_SNAP_TO_CHARS: pPMGridSnapToChars = pProp; break; } if (nPrintId == CTF_PM_PRINTMASK) { @@ -408,6 +414,18 @@ void XMLPageMasterExportPropMapper::ContextFilter( } } + if( pPMStandardMode && !getBOOL(pPMStandardMode->maValue) ) + { + lcl_RemoveState(pPMStandardMode); + if( pPMGridBaseWidth ) + lcl_RemoveState(pPMGridBaseWidth); + if( pPMGridSnapToChars ) + lcl_RemoveState(pPMGridSnapToChars); + } + + if( pPMGridBaseWidth && pPMStandardMode ) + lcl_RemoveState(pPMStandardMode); + aPageBuffer.ContextFilter( rPropState ); aHeaderBuffer.ContextFilter( rPropState ); aFooterBuffer.ContextFilter( rPropState ); |