diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-09-04 18:26:34 +0200 |
|---|---|---|
| committer | László Németh <laszlo.nemeth@collabora.com> | 2015-09-04 18:29:36 +0200 |
| commit | 27949c810daa4090106cbed360f80869a4813d15 (patch) | |
| tree | c25f50b08920d568d09c73c9996aeb4b3f8210c3 | |
| parent | f2ac9caf85d717d417ea7221316ae43b1418548f (diff) | |
tdf#93928 don't hide the zoom slider and its handle with a tooltip
Change-Id: I8e5a3a02e80b845ef65dfed35cc3c324197ed88c
| -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 4f710270054e..bbe795d41fa0 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -1035,7 +1035,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 d6b394933895..e5f05af2fd00 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; } |