[Libreoffice-commits] .: sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 9 20:00:40 PST 2013


 sc/source/filter/xml/xmlexprt.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d158a09e56e3944458d63a6c572f60dbe4632dad
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jan 10 03:59:57 2013 +0100

    handle shapes anchored to the wrong sheet without crash, fdo#58858
    
    Change-Id: I00d127dbb6151e3100be931079cbf8907ac69ddd

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 7ac0351..3e4599e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -693,7 +693,10 @@ void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCo
             {
                 ScMyShape aMyShape;
                 aMyShape.aAddress = pAnchor->maStart;
+                SAL_WARN_IF(aMyShape.aAddress.Tab() != nTable, "sc", "not anchored to current sheet!");
+                aMyShape.aAddress.SetTab(nTable);
                 aMyShape.aEndAddress = pAnchor->maEnd;
+                aMyShape.aEndAddress.SetTab( nTable );
                 aMyShape.nEndX = pAnchor->maEndOffset.X();
                 aMyShape.nEndY = pAnchor->maEndOffset.Y();
                 aMyShape.xShape = xShape;


More information about the Libreoffice-commits mailing list