diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-23 15:05:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-26 14:07:37 +0100 |
| commit | ea72ad4474789af1532fd49677158f62ba8e2543 (patch) | |
| tree | b1f563755a209f3122b3336433ac1e13cae8cb17 | |
| parent | ae3309c908311248f1580a894f197732964bfac2 (diff) | |
remove unused ShowFlags::NoParentUpdate
Change-Id: Id63e1d73643a18d823dfcb35479f0f8eb3e20b15
Reviewed-on: https://gerrit.libreoffice.org/63972
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | compilerplugins/clang/unusedenumconstants.readonly.results | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
3 files changed, 2 insertions, 5 deletions
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 ); |