[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xetable.cxx |    7 +++++++
 sc/source/filter/inc/xetable.hxx   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 07a4f761ddead5e1f2af96ab5793fcc94d1abcaa
Author: Noel Power <noel.power at suse.com>
Date:   Thu Oct 4 17:02:18 2012 +0100

    really export default row heights for xlsx fdo#55621
    
    Change-Id: Icdf581cd7ae245f2749fecf00957bc9524f717d8
    (cherry picked from commit 5a651522acb42fcffa6defc212cb8d0e9b9b7d3f)
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index e3967f2..793155a 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2434,6 +2434,13 @@ void XclExpCellTable::Save( XclExpStream& rStrm )
 
 void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm )
 {
+    // DEFAULT row height
+    XclExpDefaultRowData& rDefData = mxDefrowheight->GetDefaultData();
+    sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
+    rWorksheet->startElement( XML_sheetFormatPr,
+        XML_defaultRowHeight, OString::valueOf( (double) rDefData.mnHeight / 20.0 ).getStr(), FSEND );
+    rWorksheet->endElement( XML_sheetFormatPr );
+
     maColInfoBfr.SaveXml( rStrm );
     maRowBfr.SaveXml( rStrm );
 }
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 33b7b2c..291c37f 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -851,7 +851,7 @@ public:
 
     /** Sets the passed default data as current record contents. */
     void                SetDefaultData( const XclExpDefaultRowData& rDefData );
-
+    XclExpDefaultRowData& GetDefaultData() { return maDefData; }
 private:
     /** Writes the contents of the record. */
     virtual void        WriteBody( XclExpStream& rStrm );