[Libreoffice-commits] .: sc/source

[Muthu Subramanian]

 sc/source/filter/oox/pagesettings.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0b356971b2820f1d1bd27938be724cc1671405cc
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Wed May 9 13:33:00 2012 +0530

    n758575: Use default printer settings only when explicity mentioned.
    
    Also, fixes a bug with chartsheet pagesettings.

diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 8fcbd72..122120d 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
     maModel.mnPageOrder     = rAttribs.getToken( XML_pageOrder, XML_downThenOver );
     maModel.mnCellComments  = rAttribs.getToken( XML_cellComments, XML_none );
     maModel.mnPrintErrors   = rAttribs.getToken( XML_errors, XML_displayed );
-    maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, true );
+    maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, false );
     maModel.mbUseFirstPage  = rAttribs.getBool( XML_useFirstPageNumber, false );
     maModel.mbBlackWhite    = rAttribs.getBool( XML_blackAndWhite, false );
     maModel.mbDraftQuality  = rAttribs.getBool( XML_draft, false );
@@ -230,7 +230,7 @@ void PageSettings::importChartPageSetup( const Relations& rRelations, const Attr
     maModel.mnHorPrintRes   = rAttribs.getInteger( XML_horizontalDpi, 600 );
     maModel.mnVerPrintRes   = rAttribs.getInteger( XML_verticalDpi, 600 );
     maModel.mnOrientation   = rAttribs.getToken( XML_orientation, XML_default );
-    maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, true );
+    maModel.mbValidSettings = rAttribs.getBool( XML_usePrinterDefaults, false );
     maModel.mbUseFirstPage  = rAttribs.getBool( XML_useFirstPageNumber, false );
     maModel.mbBlackWhite    = rAttribs.getBool( XML_blackAndWhite, false );
     maModel.mbDraftQuality  = rAttribs.getBool( XML_draft, false );
@@ -1050,8 +1050,8 @@ void PageSettingsConverter::writePageSettingsProperties(
     // paper orientation
     bool bLandscape = rModel.mnOrientation == XML_landscape;
     // default orientation for current sheet type (chart sheets default to landscape)
-    if( !rModel.mbValidSettings || (rModel.mnOrientation == XML_default) )
-        bLandscape = bChartSheet;
+    if( bChartSheet && ( !rModel.mbValidSettings || (rModel.mnOrientation == XML_default) ) )
+        bLandscape = true;
 
     // paper size
     if( !rModel.mbValidSettings )