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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    4 ----
 include/vcl/window.hxx                                     |    6 ++----
 vcl/source/window/window.cxx                               |    2 +-
 vcl/source/window/window2.cxx                              |    1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 12d0c06703842754de1eee4c1ea4f5796429730b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 23 15:07:09 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 26 14:07:48 2018 +0100

    remove unused enum value TrackingEventFlags::DontCallHdl
    
    Change-Id: I75b28d20e2e0954fbd2fee396b8e06e9bb7d7073
    Reviewed-on: https://gerrit.libreoffice.org/64028
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 978c17c2454f..5e7a1dd16a29 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1094,8 +1094,6 @@ include/vcl/wall.hxx:43
     enum WallpaperStyle BottomLeft
 include/vcl/wall.hxx:44
     enum WallpaperStyle Bottom
-include/vcl/window.hxx:121
-    enum TrackingEventFlags DontCallHdl
 include/xmloff/shapeexport.hxx:53
     enum XMLShapeExportFlags WIDTH
 include/xmloff/shapeexport.hxx:54
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8afd84688523..60389e836aa9 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -118,11 +118,10 @@ enum class TrackingEventFlags
     Focus          = 0x0004,
     Repeat         = 0x0100,
     End            = 0x1000,
-    DontCallHdl    = 0x8000,
 };
 namespace o3tl
 {
-    template<> struct typed_flags<TrackingEventFlags> : is_typed_flags<TrackingEventFlags, 0x9107> {};
+    template<> struct typed_flags<TrackingEventFlags> : is_typed_flags<TrackingEventFlags, 0x1107> {};
 }
 
 
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 922b4b4ab161..877c66bdee05 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -296,7 +296,6 @@ void Window::EndTracking( TrackingEventFlags nFlags )
         }
 
         // call EndTracking if required
-        if ( !(nFlags & TrackingEventFlags::DontCallHdl) )
         {
             Point           aMousePos( mpWindowImpl->mpFrameData->mnLastMouseX, mpWindowImpl->mpFrameData->mnLastMouseY );
             if( ImplIsAntiparallel() )
commit ea72ad4474789af1532fd49677158f62ba8e2543
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 23 15:05:08 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 26 14:07:37 2018 +0100

    remove unused ShowFlags::NoParentUpdate
    
    Change-Id: Id63e1d73643a18d823dfcb35479f0f8eb3e20b15
    Reviewed-on: https://gerrit.libreoffice.org/63972
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 327ddeb57286..978c17c2454f 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1096,8 +1096,6 @@ include/vcl/wall.hxx:44
     enum WallpaperStyle Bottom
 include/vcl/window.hxx:121
     enum TrackingEventFlags DontCallHdl
-include/vcl/window.hxx:172
-    enum ShowFlags NoParentUpdate
 include/xmloff/shapeexport.hxx:53
     enum XMLShapeExportFlags WIDTH
 include/xmloff/shapeexport.hxx:54
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index dc5def79c8a3..8afd84688523 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -169,14 +169,13 @@ namespace o3tl
 enum class ShowFlags
 {
     NONE                       = 0x0000,
-    NoParentUpdate             = 0x0001,
     NoFocusChange              = 0x0002,
     NoActivate                 = 0x0004,
     ForegroundTask             = 0x0008,
 };
 namespace o3tl
 {
-    template<> struct typed_flags<ShowFlags> : is_typed_flags<ShowFlags, 0x000f> {};
+    template<> struct typed_flags<ShowFlags> : is_typed_flags<ShowFlags, 0x000e> {};
 }
 
 // Flags for SetZOrder()
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e1d97513172d..2b835fd81796 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2232,7 +2232,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
                     aBounds.AdjustBottom(workaround_border );
                     aInvRegion = aBounds;
                 }
-                if ( !mpWindowImpl->mbNoParentUpdate && !(nFlags & ShowFlags::NoParentUpdate) )
+                if ( !mpWindowImpl->mbNoParentUpdate )
                 {
                     if ( !aInvRegion.IsEmpty() )
                         ImplInvalidateParentFrameRegion( aInvRegion );