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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    4 ----
 include/vcl/wrkwin.hxx                                     |    4 +---
 vcl/source/window/wrkwin.cxx                               |    9 +++------
 3 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 1a4113979f3e26661bbe63fee2fc6caff2375367
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Nov 23 12:56:56 2018 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Nov 25 20:24:51 2018 +0100

    remove unused PresentationFlags enum values
    
    Change-Id: I502ff07467bbfa7117131e2a3e56c45b005512d8
    Reviewed-on: https://gerrit.libreoffice.org/63949
    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 1a957e060883..cd11353fcf84 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1116,10 +1116,6 @@ include/vcl/window.hxx:377
     enum DrawFlags NoSelection
 include/vcl/window.hxx:378
     enum DrawFlags NoBackground
-include/vcl/wrkwin.hxx:37
-    enum PresentationFlags NoFullScreen
-include/vcl/wrkwin.hxx:38
-    enum PresentationFlags NoAutoShow
 include/xmloff/shapeexport.hxx:53
     enum XMLShapeExportFlags WIDTH
 include/xmloff/shapeexport.hxx:54
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 89f240eea9b2..d1ef8fd70e66 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -34,13 +34,11 @@ enum class PresentationFlags
 {
     NONE           = 0x0000,
     HideAllApps    = 0x0001,
-    NoFullScreen   = 0x0002,
-    NoAutoShow     = 0x0004,
 };
 
 namespace o3tl
 {
-    template<> struct typed_flags<PresentationFlags> : 
is_typed_flags<PresentationFlags, 0x0007> {};
+    template<> struct typed_flags<PresentationFlags> : 
is_typed_flags<PresentationFlags, 0x0001> {};
 }
 
 
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 1133a9f383ad..0fd563ecb587 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -173,19 +173,16 @@ void WorkWindow::StartPresentationMode( bool 
bPresentation, PresentationFlags nF
         mbPresentationFull      = mbFullScreenMode;
         mnPresentationFlags     = nFlags;
 
-        if ( !(mnPresentationFlags & PresentationFlags::NoFullScreen) )
-            ShowFullScreenMode( true, nDisplayScreen );
+        ShowFullScreenMode( true, nDisplayScreen );
         if ( !mbSysChild )
         {
             if ( mnPresentationFlags & PresentationFlags::HideAllApps )
                 mpWindowImpl->mpFrame->SetAlwaysOnTop( true );
-            if ( !(mnPresentationFlags & PresentationFlags::NoAutoShow) )
-                ToTop();
+            ToTop();
             mpWindowImpl->mpFrame->StartPresentation( true );
         }
 
-        if ( !(mnPresentationFlags & PresentationFlags::NoAutoShow) )
-            Show();
+        Show();
     }
     else
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits