diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-09-04 18:26:34 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-09-05 21:43:25 +0000 |
| commit | 2eaa2e6df239eef2a2cd9eff916449c60e5c2142 (patch) | |
| tree | 0ccdc70a2d4835f62c251cb012459639cdd3aac5 | |
| parent | cdc5fe87ec8f4670600f86ad9cacac21d627c40f (diff) | |
tdf#93928 don't hide the zoom slider and its handle with a tooltip
Change-Id: I8e5a3a02e80b845ef65dfed35cc3c324197ed88c
Reviewed-on: https://gerrit.libreoffice.org/18345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | include/svx/dialogs.hrc | 1 | ||||
| -rw-r--r-- | svx/source/stbctrls/stbctrls.src | 5 | ||||
| -rw-r--r-- | svx/source/stbctrls/zoomsliderctrl.cxx | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index a57c68cce93e..50d0d77b168e 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -1044,7 +1044,6 @@ #define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289) #define RID_SVXSTR_RECOVERYONLY_FINISH (RID_SVX_START + 1290) #define RID_SVXSTR_ZOOMTOOL_HINT (RID_SVX_START + 1291) -#define RID_SVXSTR_ZOOM (RID_SVX_START + 1292) #define RID_SVXSTR_ZOOM_IN (RID_SVX_START + 1293) #define RID_SVXSTR_ZOOM_OUT (RID_SVX_START + 1294) #define RID_SVXSTR_CUSTOM (RID_SVX_START + 1295) diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index a31e6d41fdae..0337f7788075 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -126,11 +126,6 @@ String RID_SVXSTR_ZOOMTOOL_HINT Text [ en-US ] = "Zoom level. Right-click to change zoom level or click to open Zoom dialog."; }; -String RID_SVXSTR_ZOOM -{ - Text [ en-US ] = "Adjust zoom level"; -}; - String RID_SVXSTR_ZOOM_IN { Text [ en-US ] = "Zoom In"; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 526bed7030ae..933c453464ca 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -390,7 +390,8 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset ) GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_IN)); else - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM)); + // don't hide the slider and its handle with a tooltip during zooming + GetStatusBar().SetQuickHelpText(GetId(), ""); return true; } |