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

[Eike Rathke]

 sc/source/core/data/table6.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 09cc958dee93ad0ad2ab0d8cc9cc4c09e46c3653
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 27 16:33:31 2016 +0200

    use GetCellArea() when searching for notes, tdf#65334 follow-up
    
    ... so empty cells with notes are included as last "data" position if they are
    below or right of the last "real" data, which GetLastDataPos() doesn't.
    
    Change-Id: I9bb7464033736e7e7fa24e635ef1a3d39626002b

diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index a41aa64..e5582b4 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -300,7 +300,10 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
 {
     SCCOL nLastCol;
     SCROW nLastRow;
-    GetLastDataPos(nLastCol, nLastRow);
+    if (rSearchItem.GetCellType() == SvxSearchCellType::NOTE)
+        GetCellArea( nLastCol, nLastRow);
+    else
+        GetLastDataPos(nLastCol, nLastRow);
     return Search(rSearchItem, rCol, rRow, nLastCol, nLastRow, rMark, rUndoStr, pUndoDoc);
 }