diff options
author | Muthu Subramanian <sumuthu@suse.com> | 2012-05-09 13:33:00 +0530 |
---|---|---|
committer | Muthu Subramanian <sumuthu@suse.com> | 2012-05-09 13:33:00 +0530 |
commit | 0b356971b2820f1d1bd27938be724cc1671405cc (patch) | |
tree | 93504c01485debc5664e73e3b57120abf40b5dff | |
parent | fb5f61de5d770f4e34da6ac5d034f3a3fc9b4c24 (diff) |
n758575: Use default printer settings only when explicity mentioned.
Also, fixes a bug with chartsheet pagesettings.
-rw-r--r-- | sc/source/filter/oox/pagesettings.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 8fcbd72cba88..122120d4fd83 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx | |||
@@ -208,7 +208,7 @@ void PageSettings::importPageSetup( const Relations& rRelations, const Attribute | |||
208 | maModel.mnPageOrder = rAttribs.getToken( XML_pageOrder, XML_downThenOver ); | 208 | maModel.mnPageOrder = rAttribs.getToken( XML_pageOrder, XML_downThenOver ); |
209 | maModel.mnCellComments = rAttribs.getToken( XML_cellComments, XML_none ); | 209 | maModel.mnCellComments = rAttribs.getToken( XML_cellComments, XML_none ); |
210 | maModel.mnPrintErrors = rAttribs.getToken( XML_errors, XML_displayed ); | 210 | maModel.mnPrintErrors = rAttribs.getToken( XML_errors, XML_displayed ); |
211 | maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, true ); | 211 | maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, false ); |
212 | maModel.mbUseFirstPage = rAttribs.getBool( XML_useFirstPageNumber, false ); | 212 | maModel.mbUseFirstPage = rAttribs.getBool( XML_useFirstPageNumber, false ); |
213 | maModel.mbBlackWhite = rAttribs.getBool( XML_blackAndWhite, false ); | 213 | maModel.mbBlackWhite = rAttribs.getBool( XML_blackAndWhite, false ); |
214 | maModel.mbDraftQuality = rAttribs.getBool( XML_draft, false ); | 214 | maModel.mbDraftQuality = rAttribs.getBool( XML_draft, false ); |
@@ -230,7 +230,7 @@ void PageSettings::importChartPageSetup( const Relations& rRelations, const Attr | |||
230 | maModel.mnHorPrintRes = rAttribs.getInteger( XML_horizontalDpi, 600 ); | 230 | maModel.mnHorPrintRes = rAttribs.getInteger( XML_horizontalDpi, 600 ); |
231 | maModel.mnVerPrintRes = rAttribs.getInteger( XML_verticalDpi, 600 ); | 231 | maModel.mnVerPrintRes = rAttribs.getInteger( XML_verticalDpi, 600 ); |
232 | maModel.mnOrientation = rAttribs.getToken( XML_orientation, XML_default ); | 232 | maModel.mnOrientation = rAttribs.getToken( XML_orientation, XML_default ); |
233 | maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, true ); | 233 | maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, false ); |
234 | maModel.mbUseFirstPage = rAttribs.getBool( XML_useFirstPageNumber, false ); | 234 | maModel.mbUseFirstPage = rAttribs.getBool( XML_useFirstPageNumber, false ); |
235 | maModel.mbBlackWhite = rAttribs.getBool( XML_blackAndWhite, false ); | 235 | maModel.mbBlackWhite = rAttribs.getBool( XML_blackAndWhite, false ); |
236 | maModel.mbDraftQuality = rAttribs.getBool( XML_draft, false ); | 236 | maModel.mbDraftQuality = rAttribs.getBool( XML_draft, false ); |
@@ -1050,8 +1050,8 @@ void PageSettingsConverter::writePageSettingsProperties( | |||
1050 | // paper orientation | 1050 | // paper orientation |
1051 | bool bLandscape = rModel.mnOrientation == XML_landscape; | 1051 | bool bLandscape = rModel.mnOrientation == XML_landscape; |
1052 | // default orientation for current sheet type (chart sheets default to landscape) | 1052 | // default orientation for current sheet type (chart sheets default to landscape) |
1053 | if( !rModel.mbValidSettings || (rModel.mnOrientation == XML_default) ) | 1053 | if( bChartSheet && ( !rModel.mbValidSettings || (rModel.mnOrientation == XML_default) ) ) |
1054 | bLandscape = bChartSheet; | 1054 | bLandscape = true; |
1055 | 1055 | ||
1056 | // paper size | 1056 | // paper size |
1057 | if( !rModel.mbValidSettings ) | 1057 | if( !rModel.mbValidSettings ) |