compilerplugins/clang/unusedenumconstants.readonly.results | 2 --
include/vcl/help.hxx | 4 +---
vcl/source/app/help.cxx | 4 +---
3 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 30c953423a847e170ea26008535b79eb6f23e62e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Nov 26 09:19:20 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Nov 27 07:26:35 2018 +0100
remove unused QuickHelpFlags enum value
Change-Id: Ia40e882af0df396895a19dd34caa60461cdf6c12
Reviewed-on: https://gerrit.libreoffice.org/64059
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 5406774ba33c..1eb66c1a180d 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -900,8 +900,6 @@ include/vcl/graphictools.hxx:229
enum SvtGraphicFill::FillType fillSolid
include/vcl/help.hxx:42
enum QuickHelpFlags NoAutoPos
-include/vcl/help.hxx:45
- enum QuickHelpFlags NoDelay
include/vcl/keycod.hxx:32
enum KeyFuncType REDO
include/vcl/keycod.hxx:32
diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 2c467974fdc5..768d4d03cbe1 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -41,8 +41,6 @@ enum class QuickHelpFlags
Bottom = 0x0020,
NoAutoPos = Left | Center | Right | Top | VCenter | Bottom,
CtrlText = 0x0040,
-/// no delay when opening the quick help. Applies to ShowBalloon and
ShowQuickHelp
- NoDelay = 0x0080,
/// force balloon-style in ShowPopover and ShowQuickHelp
TipStyleBalloon = 0x0100,
NoEvadePointer = 0x0200,
@@ -50,7 +48,7 @@ enum class QuickHelpFlags
};
namespace o3tl
{
- template<> struct typed_flags<QuickHelpFlags> :
is_typed_flags<QuickHelpFlags, 0x7ff> {};
+ template<> struct typed_flags<QuickHelpFlags> :
is_typed_flags<QuickHelpFlags, 0x77f> {};
}
#define OOO_HELP_INDEX ".help:index"
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index ab6767b39adb..c1634351f0ad 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -544,9 +544,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16
nHelpWinStyle, QuickHe
return;
sal_uInt64 nCurTime = tools::Time::GetSystemTicks();
- if ( ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) <
HelpSettings::GetTipDelay() )
- || ( nStyle & QuickHelpFlags::NoDelay )
- )
+ if ( ( nCurTime - pSVData->maHelpData.mnLastHelpHideTime ) <
HelpSettings::GetTipDelay() )
nDelayMode = HELPDELAY_NONE;
pHelpWin = VclPtr<HelpTextWindow>::Create( pParent, rHelpText,
nHelpWinStyle, nStyle );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
