[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

Noel Grandin noel at peralex.com
Tue Dec 9 04:50:51 PST 2014


 sc/source/filter/inc/xlescher.hxx |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

New commits:
commit d255f53044908773ef0701c2560dadb7df5f1c3e
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Dec 9 13:46:17 2014 +0100

    fdo#82312 - Excel chart has a wrong size
    
    bug introduced in commit 0c7f35277575fee8594737f5b2842dfac2c6d04f
    "remove SvStream::operator>> methods"
    
    Change-Id: I72a1c05b3a4a3f3a250055775eb2d35b3114406d
    Reviewed-on: https://gerrit.libreoffice.org/13151
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 3e990ba..f2095fe 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -322,6 +322,26 @@ inline SvStream& operator>>( SvStream& rStrm, XclObjAnchor& rAnchor )
     return rStrm;
 }
 
+// creates read method for XclImpStream
+template< typename StreamType >
+StreamType& operator>>( StreamType& rStrm, XclObjAnchor& rAnchor )
+{
+    sal_uInt16 tmpFirstRow, tmpTY, tmpLastRow, tmpBY;
+
+    rStrm
+        >> rAnchor.maFirst.mnCol >> rAnchor.mnLX
+        >> tmpFirstRow >> tmpTY
+        >> rAnchor.maLast.mnCol  >> rAnchor.mnRX
+        >> tmpLastRow  >> tmpBY;
+
+    rAnchor.maFirst.mnRow = static_cast<sal_uInt32> (tmpFirstRow);
+    rAnchor.mnTY = static_cast<sal_uInt32> (tmpTY);
+    rAnchor.maLast.mnRow = static_cast<sal_uInt32> (tmpLastRow);
+    rAnchor.mnBY = static_cast<sal_uInt32> (tmpBY);
+
+    return rStrm;
+}
+
 template< typename StreamType >
 StreamType& operator<<( StreamType& rStrm, const XclObjAnchor& rAnchor )
 {


More information about the Libreoffice-commits mailing list