diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 15:02:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 15:02:01 +0000 |
| commit | afce29967fef5b136122f7b7c7372e0e1cf6110c (patch) | |
| tree | f973c20b4183ae681dd9fa3b1ee9e9c2b6823b39 /xmloff | |
| parent | a9232bb320b7bfb1bec7b823fae802cd75e5fd54 (diff) | |
INTEGRATION: CWS sab008 (1.13.144); FILE MERGED
2004/01/23 11:10:39 sab 1.13.144.1: #i8868#; add scale to x and scale to y
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 9162749f1811..34f71e308e60 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PageMasterExportPropMapper.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dvo $ $Date: 2002-08-29 17:46:18 $ + * last change: $Author: obo $ $Date: 2004-03-19 16:02:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -366,6 +366,8 @@ void XMLPageMasterExportPropMapper::ContextFilter( XMLPropertyState* pPMScaleTo = NULL; XMLPropertyState* pPMScaleToPages = NULL; + XMLPropertyState* pPMScaleToX = NULL; + XMLPropertyState* pPMScaleToY = NULL; XMLPropertyState* pPrint = NULL; @@ -415,6 +417,8 @@ void XMLPageMasterExportPropMapper::ContextFilter( case CTF_PM_FOOTERDYNAMIC: pPMFooterDynamic = pProp; break; case CTF_PM_SCALETO: pPMScaleTo = pProp; break; case CTF_PM_SCALETOPAGES: pPMScaleToPages = pProp; break; + case CTF_PM_SCALETOX: pPMScaleToX = pProp; break; + case CTF_PM_SCALETOY: pPMScaleToY = pProp; break; } if (nPrintId == CTF_PM_PRINTMASK) { @@ -445,6 +449,10 @@ void XMLPageMasterExportPropMapper::ContextFilter( lcl_RemoveStateIfZero16( pPMScaleTo ); if( pPMScaleToPages ) lcl_RemoveStateIfZero16( pPMScaleToPages ); + if( pPMScaleToX ) + lcl_RemoveStateIfZero16( pPMScaleToX ); + if( pPMScaleToY ) + lcl_RemoveStateIfZero16( pPMScaleToY ); if (pPrint) { |