[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/inc sc/source

[Markus Mohrhard]

 sc/inc/column.hxx               |    1 +
 sc/source/core/data/column3.cxx |    6 ++++++
 sc/source/core/data/table1.cxx  |    4 ++++
 3 files changed, 11 insertions(+)

New commits:
commit feb749092d1008fba6acb9206d1f8655749519af
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Dec 8 07:43:14 2014 +0100

    we need the SdrPage for deleting the notes, fdo#86166
    
    The SdrPage that contains the shapes for the note captions is deleted
    before the notes. Prevent that case by deleting the notes before
    deleting the SdrPage.
    
    Change-Id: I13727cea7df0b033fb386a6a8e20dcadec743335

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 86d39ab..b9009cb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -183,6 +183,7 @@ public:
 
     void        Delete( SCROW nRow );
     void        FreeAll();
+    void        FreeNotes();
     void Swap( ScColumn& rOther, SCROW nRow1, SCROW nRow2, bool bPattern );
 
     bool        HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 146e026..c8e6839 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -141,6 +141,12 @@ void ScColumn::FreeAll()
     CellStorageModified();
 }
 
+void ScColumn::FreeNotes()
+{
+    maCellNotes.clear();
+    maCellNotes.resize(MAXROWCOUNT);
+}
+
 namespace {
 
 /**
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 834dfe1..b06fa28 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -320,6 +320,10 @@ ScTable::~ScTable()
 {
     if (!pDocument->IsInDtorClear())
     {
+        for (SCCOL nCol = 0; nCol < MAXCOL; ++nCol)
+        {
+            aCol[nCol].FreeNotes();
+        }
         //  nicht im dtor die Pages in der falschen Reihenfolge loeschen
         //  (nTab stimmt dann als Page-Number nicht!)
         //  In ScDocument::Clear wird hinterher per Clear am Draw Layer alles geloescht.