[Libreoffice-commits] core.git: sc/source

Eike Rathke erack at redhat.com
Wed Jul 27 17:01:13 UTC 2016


 sc/source/core/data/table6.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 156590e7c0bf3c81f50b3d9862961e50010ea08a
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 27 19:00:11 2016 +0200

    use GetCellArea() also in SearchAll() and ReplaceAll(), tdf#65334 follow-up
    
    Change-Id: I50bfeee96e57010455bbb9e8be4312a39d392411

diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 121d1d2..15135f9 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -473,7 +473,10 @@ bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, const ScMarkData& rMar
 
     SCCOL nLastCol;
     SCROW nLastRow;
-    GetLastDataPos(nLastCol, nLastRow);
+    if (rSearchItem.GetCellType() == SvxSearchCellType::NOTE)
+        GetCellArea( nLastCol, nLastRow);
+    else
+        GetLastDataPos(nLastCol, nLastRow);
 
     do
     {
@@ -532,7 +535,10 @@ bool ScTable::ReplaceAll(
 
     SCCOL nLastCol;
     SCROW nLastRow;
-    GetLastDataPos(nLastCol, nLastRow);
+    if (rSearchItem.GetCellType() == SvxSearchCellType::NOTE)
+        GetCellArea( nLastCol, nLastRow);
+    else
+        GetLastDataPos(nLastCol, nLastRow);
 
     bool bEverFound = false;
     while (true)


More information about the Libreoffice-commits mailing list