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

[Libreoffice Gerrit user]

 sc/source/core/data/table3.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit c450c73ab7c83a55209cc7de9381cc32eb6313ff
Author: Noel Power <noel.power at suse.com>
Date:   Wed Oct 10 16:49:35 2012 +0100

    fix for fdo#53814 Revert "there should be no need any more for this check"
    
    This reverts commit bea018a7040c36e91487b27c7b59c6c8a970bf5f.
    
    Change-Id: Id554a8f05b82f146a505ac0a39afe14a3161291c
    (cherry picked from commit cd9d51a36cc3106d4124855874af657615a93061)
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 15087c5..7be749e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -386,10 +386,14 @@ short ScTable::CompareCell( sal_uInt16 nSort,
     if (pCell1)
     {
         eType1 = pCell1->GetCellType();
+        if (eType1 == CELLTYPE_NOTE)
+            pCell1 = NULL;
     }
     if (pCell2)
     {
         eType2 = pCell2->GetCellType();
+        if (eType2 == CELLTYPE_NOTE)
+            pCell2 = NULL;
     }
 
     if (pCell1)