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

[Jim Raykowski]

 sw/source/core/frmedt/feshview.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit cc3690c9694e79d913c370ef1983c83f38dae23a
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Sun Apr 15 11:40:40 2018 -0800

    tdf#115600 Display messages in Findbar for Text Frame, Graphics, OLE
    
    ...object, Drawing, and Control navigation
    
    Change-Id: Ic9809e60ae18179f0ea36a4e3c61d09aea3c2929
    Reviewed-on: https://gerrit.libreoffice.org/52935
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 4b46fd4df1d6..713ba9a38f16 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -101,6 +101,8 @@
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 
+#include <svx/srchdlg.hxx>
+
 #define SCROLLVAL 75
 
 using namespace com::sun::star;
@@ -1631,7 +1633,10 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, bool
         }
         // unfortunately nothing found
         if( bNext ? (aBestPos.getX() == LONG_MAX) : (aBestPos.getX() == 0) )
+        {
             pBest = pTop;
+            SvxSearchDialogWrapper::SetSearchLabel( bNext ? SearchLabel::EndWrapped : SearchLabel::StartWrapped );
+        }
     }
 
     return pBest;
@@ -1639,10 +1644,15 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, bool
 
 bool SwFEShell::GotoObj( bool bNext, GotoObjFlags eType )
 {
+    SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
     const SdrObject* pBest = GetBestObject( bNext, eType );
 
     if ( !pBest )
+    {
+        SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::NavElementNotFound );
         return false;
+    }
 
     const SwVirtFlyDrawObj *pVirtO = dynamic_cast<const SwVirtFlyDrawObj*>(pBest);
     if (pVirtO)