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

[Libreoffice Gerrit user]

 sd/source/ui/view/Outliner.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 28000074f7c25f252a900276a671caf52d0f6812
Author: Radek Doulik <r...@novell.com>
Date:   Tue Jun 26 12:25:03 2012 +0200

    remember spell check/find&replace start position only 1st time
    
     - use mnStartPageIndex as indicator, -1 means it wasn't set yet
       otherwise it is set. reset it to -1 at the end of spell check
       and find&replace
    
    Change-Id: Ic45106b019d3c1a0232fe3d766aab07bbcd24d2c
    Signed-off-by: Michael Meeks <michael.me...@suse.com>

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e7100e7..43aa502 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -381,6 +381,7 @@ void Outliner::EndSpelling (void)
     mpWeakViewShell.reset();
     mpView = NULL;
     mpWindow = NULL;
+    mnStartPageIndex = (sal_uInt16) -1;
 }
 
 
@@ -531,8 +532,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* 
pSearchItem)
             // restore start position if nothing was found
             if(!mbStringFound)
                 RestoreStartPosition ();
-            else
-                mnStartPageIndex = (sal_uInt16)-1;
+            mnStartPageIndex = (sal_uInt16)-1;
         }
     }
     else
@@ -657,6 +657,7 @@ bool Outliner::SearchAndReplaceAll (void)
     }
 
     RestoreStartPosition ();
+    mnStartPageIndex = (sal_uInt16)-1;
 
     return true;
 }
@@ -870,6 +871,9 @@ void Outliner::RememberStartPosition (void)
         return;
     }
 
+    if ( mnStartPageIndex != (sal_uInt16) -1 )
+        return;
+
     if (pViewShell->ISA(DrawViewShell))
     {
         ::boost::shared_ptr<DrawViewShell> pDrawViewShell (
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits