[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/source

[Laurent Godard]

 sc/source/core/data/column3.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 12a2fd49f988f3d7e3a2ea5edf32a8f8cde10949
Author: Laurent Godard <lgodard.libre at laposte.net>
Date:   Wed Sep 18 14:33:34 2013 +0200

    notes : notes of empty cells are now copied
    
    Change-Id: I7562e67232f57702d4ba6aad4b6a97351b3ea4af

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e8076fb..4112ed5 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -753,10 +753,16 @@ public:
 
     void operator() (const sc::CellStoreType::value_type& node, size_t nOffset, size_t nDataSize)
     {
-        if (node.type == sc::element_type_empty)
-            return;
 
         SCROW nSrcRow1 = node.position + nOffset;
+        bool bCopyCellNotes = mrCxt.isCloneNotes();
+
+        if (node.type == sc::element_type_empty)
+        {
+            if (bCopyCellNotes)
+                duplicateNotes(nSrcRow1, nOffset, nDataSize );
+            return;
+        }
 
         sal_uInt16 nFlags = mrCxt.getInsertFlag();
         bool bNumeric = (nFlags & IDF_VALUE) != 0;
@@ -767,8 +773,6 @@ public:
 
         bool bAsLink = mrCxt.isAsLink();
 
-        bool bCopyCellNotes = mrCxt.isCloneNotes();
-
         switch (node.type)
         {
             case sc::element_type_numeric: