summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-09-04 18:26:34 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-09-05 21:43:25 +0000
commit2eaa2e6df239eef2a2cd9eff916449c60e5c2142 (patch)
tree0ccdc70a2d4835f62c251cb012459639cdd3aac5 /svx
parentcdc5fe87ec8f4670600f86ad9cacac21d627c40f (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>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/stbctrls/stbctrls.src5
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx3
2 files changed, 2 insertions, 6 deletions
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;
}