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

[Mike Kaganski]

 sc/source/core/data/table4.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c6ef19d3dd27bc0069bd9414f46193ce44b8bd2
Author: Mike Kaganski <mikekaganski at hotmail.com>
Date:   Fri Jun 5 00:10:24 2015 +1000

    tdf#90996: don't overwrite comments in ScTable::FillFormulaVertical
    
    IDF_CONTENTS includes IDF_NOTE, which should not be used here
    
    Change-Id: I904fbdbfcb97865a5682d9073e0ce2d5a2c694fb
    Reviewed-on: https://gerrit.libreoffice.org/16085
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit a977937927729eaff61bd670fdd45d3508b19371)
    Reviewed-on: https://gerrit.libreoffice.org/16091

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 5ceb758..bac911e 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1170,7 +1170,7 @@ void ScTable::FillFormulaVertical(
     if (aSpans.empty())
         return;
 
-    aCol[nCol].DeleteRanges(aSpans, IDF_CONTENTS, false);
+    aCol[nCol].DeleteRanges(aSpans, IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_FORMULA | IDF_OUTLINE, false);
     aCol[nCol].CloneFormulaCell(rSrcCell, sc::CellTextAttr(), aSpans, NULL);
 
     boost::shared_ptr<sc::ColumnBlockPositionSet> pSet(new sc::ColumnBlockPositionSet(*pDocument));