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

Jim Raykowski (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 24 21:53:04 UTC 2019


 sw/source/uibase/uiview/view2.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8cd1c1efb46cd98a597e3b6fbb6e3340048498ed
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Tue May 21 18:56:51 2019 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Mon Jun 24 23:51:58 2019 +0200

    tdf#89709 Make statusbar page number/bookmarks control tool tip show
    
    Change-Id: I6e78d144971d59f9c8c9706f9ce8f45b9492a5c4
    Reviewed-on: https://gerrit.libreoffice.org/72715
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index e9d4475e31dc..371a29afda1d 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1316,8 +1316,14 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 sal_uInt16 nPage, nLogPage;
                 OUString sDisplay;
                 rShell.GetPageNumber( -1, rShell.IsCursorVisible(), nPage, nLogPage, sDisplay );
-                rSet.Put( SfxStringItem( FN_STAT_PAGE,
-                            GetPageStr( nPage, nLogPage, sDisplay) ));
+                OUString sTemp( GetPageStr( nPage, nLogPage, sDisplay ) );
+                const SfxStringItem aTmp( FN_STAT_PAGE, sTemp );
+                GetViewFrame()->GetBindings().SetState( aTmp );
+                // Used to distinguish which tooltip to show
+                const SfxBoolItem bExtendedTooltip( FN_STAT_PAGE, !sDisplay.isEmpty() &&
+                                                    OUString::number( nPage ) != sDisplay &&
+                                                    nPage != nLogPage );
+                GetViewFrame()->GetBindings().SetState( bExtendedTooltip );
                 //if existing page number is not equal to old page number, send out this event.
                 if (m_nOldPageNum != nLogPage )
                 {


More information about the Libreoffice-commits mailing list