diff options
| author | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-13 18:09:49 +0200 |
|---|---|---|
| committer | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-13 19:51:46 +0200 |
| commit | 87898fe173677902a63ce62574e4e86fe338e738 (patch) | |
| tree | 397e0e6435d93620a6ea0e0813635924da73f4b4 /sc/source/filter/excel/xepage.cxx | |
| parent | de8ff12503d6a6763d6f4a1a9490080410b48f52 (diff) | |
Merged ooxml-sc-page-date.diff from ooo-build
Diffstat (limited to 'sc/source/filter/excel/xepage.cxx')
| -rw-r--r-- | sc/source/filter/excel/xepage.cxx | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 6b8c72b2a92e..4d3f3dae9d9e 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -97,25 +97,37 @@ XclExpSetup::XclExpSetup( const XclPageData& rPageData ) : void XclExpSetup::SaveXml( XclExpXmlStream& rStrm ) { - rStrm.GetCurrentStream()->singleElement( XML_pageSetup, - XML_paperSize, OString::valueOf( (sal_Int32) mrData.mnPaperSize ).getStr(), - XML_scale, OString::valueOf( (sal_Int32) mrData.mnScaling ).getStr(), - XML_firstPageNumber, OString::valueOf( (sal_Int32) mrData.mnStartPage ).getStr(), - XML_fitToWidth, OString::valueOf( (sal_Int32) mrData.mnFitToWidth ).getStr(), - XML_fitToHeight, OString::valueOf( (sal_Int32) mrData.mnFitToHeight ).getStr(), - XML_pageOrder, mrData.mbPrintInRows ? "overThenDown" : "downThenOver", - XML_orientation, mrData.mbPortrait ? "portrait" : "landscape", // OOXTODO: "default"? - XML_usePrinterDefaults, XclXmlUtils::ToPsz( !mrData.mbValid ), - XML_blackAndWhite, XclXmlUtils::ToPsz( mrData.mbBlackWhite ), - XML_draft, XclXmlUtils::ToPsz( mrData.mbDraftQuality ), - XML_cellComments, mrData.mbPrintNotes ? "atEnd" : "none", // OOXTODO: "asDisplayed"? - XML_useFirstPageNumber, XclXmlUtils::ToPsz( mrData.mbManualStart ), - // OOXTODO: XML_errors, // == displayed|blank|dash|NA - XML_horizontalDpi, OString::valueOf( (sal_Int32) mrData.mnHorPrintRes ).getStr(), - XML_verticalDpi, OString::valueOf( (sal_Int32) mrData.mnVerPrintRes ).getStr(), - XML_copies, OString::valueOf( (sal_Int32) mrData.mnCopies ).getStr(), - // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ), - FSEND ); + sax_fastparser::FastAttributeList* pAttrList=rStrm.GetCurrentStream()->createAttrList(); + if( rStrm.getVersion() != oox::core::ISOIEC_29500_2008 || + mrData.mnStrictPaperSize != EXC_PAPERSIZE_USER ) + { + pAttrList->add( XML_paperSize, OString::valueOf( (sal_Int32) mrData.mnPaperSize ).getStr() ); + } + else + { + pAttrList->add( XML_paperWidth, OString::valueOf( (sal_Int32) mrData.mnPaperWidth ).concat(OString("mm")).getStr() ); + pAttrList->add( XML_paperHeight, OString::valueOf( (sal_Int32) mrData.mnPaperHeight ).concat(OString("mm")).getStr() ); + // pAttrList->add( XML_paperUnits, "mm" ); + } + pAttrList->add( XML_scale, OString::valueOf( (sal_Int32) mrData.mnScaling ).getStr() ); + pAttrList->add( XML_firstPageNumber, OString::valueOf( (sal_Int32) mrData.mnStartPage ).getStr() ); + pAttrList->add( XML_fitToWidth, OString::valueOf( (sal_Int32) mrData.mnFitToWidth ).getStr() ); + pAttrList->add( XML_fitToHeight, OString::valueOf( (sal_Int32) mrData.mnFitToHeight ).getStr() ); + pAttrList->add( XML_pageOrder, mrData.mbPrintInRows ? "overThenDown" : "downThenOver" ); + pAttrList->add( XML_orientation, mrData.mbPortrait ? "portrait" : "landscape" ); // OOXTODO: "default"? + pAttrList->add( XML_usePrinterDefaults, XclXmlUtils::ToPsz( !mrData.mbValid ) ); + pAttrList->add( XML_blackAndWhite, XclXmlUtils::ToPsz( mrData.mbBlackWhite ) ); + pAttrList->add( XML_draft, XclXmlUtils::ToPsz( mrData.mbDraftQuality ) ); + pAttrList->add( XML_cellComments, mrData.mbPrintNotes ? "atEnd" : "none" ); // OOXTODO: "asDisplayed"? + pAttrList->add( XML_useFirstPageNumber, XclXmlUtils::ToPsz( mrData.mbManualStart ) ); + // OOXTODO: XML_errors, // == displayed|blank|dash|NA + pAttrList->add( XML_horizontalDpi, OString::valueOf( (sal_Int32) mrData.mnHorPrintRes ).getStr() ); + pAttrList->add( XML_verticalDpi, OString::valueOf( (sal_Int32) mrData.mnVerPrintRes ).getStr() ); + pAttrList->add( XML_copies, OString::valueOf( (sal_Int32) mrData.mnCopies ).getStr() ); + // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ), + + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > aAttrs(pAttrList); + rStrm.GetCurrentStream()->singleElement( XML_pageSetup, aAttrs ); } void XclExpSetup::WriteBody( XclExpStream& rStrm ) |