[Libreoffice-commits] .: Branch 'libreoffice-3-6-2' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/cell.cxx    |    3 +++
 sc/source/core/data/column3.cxx |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7615e7ea047291f9c65ee32f4aaf615e2efbff21
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Sep 19 18:24:59 2012 +0200

    use correct cell for broadcasting, fdo#55059
    
    Change-Id: I353df8e9d3ccabee32b82d04cdae402e3a83ed23
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 6495ca6..48d77dc 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -427,7 +427,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDe
                 else
                 {
                     aHint.GetAddress().SetRow( nOldRow );
-                    aHint.SetCell( pOldCell );
+                    if(bKeepBC)
+                        aHint.SetCell( pNoteCell );
+                    else
+                        aHint.SetCell( pOldCell );
                     pDocument->Broadcast( aHint );
                     if (pNoteCell != pOldCell)
                     {
commit 774d204051a898cd399bca12d4d52d784c61dc5f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 18 09:00:29 2012 +0200

    broadcaster cells are empty, fdo#54553
    
    Change-Id: Ie7c251b7eaee248c97f4f931175bc26539acb22a
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 2a3d807..b6f40ca 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -267,6 +267,9 @@ void ScBaseCell::Delete()
 
 bool ScBaseCell::IsBlank() const
 {
+    if(eCellType == CELLTYPE_NOTE)
+        return true;
+
     return false;
 }