[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

Jan Holesovsky kendy at collabora.com
Sat May 30 23:49:41 PDT 2015


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

New commits:
commit 9d1b2de23ee39b22948424876d7e5c43913326b4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Sun May 31 08:31:08 2015 +0200

    sd lok: Send the part number when search always.
    
    The protocol is stateless, the client might have switched to another part, and
    we wouldn't know.
    
    Change-Id: I1b785d94c9fac86a124d72dd9ea9b35b839a39b8

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index feebd92d..b6ad9f4 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -721,14 +721,8 @@ bool Outliner::SearchAndReplaceOnce()
     if (pViewShell && pViewShell->GetDoc()->isTiledRendering() &&
             mbStringFound && pViewShell->ISA(DrawViewShell))
     {
-        ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(pViewShell));
-
-        sal_uInt16 nSelectedPage = pDrawViewShell->GetCurPageId() - 1;
-        if (nSelectedPage != mnStartPageIndex)
-        {
-            OString aPayload = OString::number(nSelectedPage);
-            pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, aPayload.getStr());
-        }
+        OString aPayload = OString::number(maCurrentPosition.mnPageIndex);
+        pViewShell->GetDoc()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, aPayload.getStr());
     }
 
     return mbEndOfSearch;


More information about the Libreoffice-commits mailing list