[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara]

 include/vcl/help.hxx    |   12 +++++-------
 vcl/source/app/help.cxx |    2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit d6bf086012343b4a1e27cd4242dced9ee0d73a06
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 17 10:47:16 2016 +0000

    ForceReposition is unused
    
    Change-Id: Ic9c37aef877e81f0c569ae8fe89bbdc41dd09419

diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 2c0ec96..055208b 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -41,18 +41,16 @@ enum class QuickHelpFlags
     Bottom            = 0x0020,
     NoAutoPos         = Left | Center | Right | Top | VCenter | Bottom,
     CtrlText          = 0x0040,
-/// force the existent tip window to be re-positioned, even if the previous incarnation has the same text. Applies to ShowBallon and ShowQuickHelp.
-    ForceReposition   = 0x0080,
 /// no delay when opening the quick help. Applies to ShowBallon and ShowQuickHelp
-    NoDelay           = 0x0100,
+    NoDelay           = 0x0080,
 /// force balloon-style in ShowTip
-    TipStyleBalloon   = 0x0200,
-    NoEvadePointer    = 0x4000,
-    BiDiRtl           = 0x8000,
+    TipStyleBalloon   = 0x0100,
+    NoEvadePointer    = 0x0200,
+    BiDiRtl           = 0x0400,
 };
 namespace o3tl
 {
-    template<> struct typed_flags<QuickHelpFlags> : is_typed_flags<QuickHelpFlags, 0xc3ff> {};
+    template<> struct typed_flags<QuickHelpFlags> : is_typed_flags<QuickHelpFlags, 0x7ff> {};
 }
 
 #define OOO_HELP_INDEX          ".help:index"
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index cf3726b..2c879c0 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -495,7 +495,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHe
         else
         {
             bool const bTextChanged = rHelpText != pHelpWin->GetHelpText();
-            if ( bTextChanged || ( nStyle & QuickHelpFlags::ForceReposition ) )
+            if (bTextChanged)
             {
                 vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
                 Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) );