Kaydet (Commit) 1a411397 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused PresentationFlags enum values

Change-Id: I502ff07467bbfa7117131e2a3e56c45b005512d8
Reviewed-on: https://gerrit.libreoffice.org/63949
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 64d65620
...@@ -1116,10 +1116,6 @@ include/vcl/window.hxx:377 ...@@ -1116,10 +1116,6 @@ include/vcl/window.hxx:377
enum DrawFlags NoSelection enum DrawFlags NoSelection
include/vcl/window.hxx:378 include/vcl/window.hxx:378
enum DrawFlags NoBackground enum DrawFlags NoBackground
include/vcl/wrkwin.hxx:37
enum PresentationFlags NoFullScreen
include/vcl/wrkwin.hxx:38
enum PresentationFlags NoAutoShow
include/xmloff/shapeexport.hxx:53 include/xmloff/shapeexport.hxx:53
enum XMLShapeExportFlags WIDTH enum XMLShapeExportFlags WIDTH
include/xmloff/shapeexport.hxx:54 include/xmloff/shapeexport.hxx:54
......
...@@ -34,13 +34,11 @@ enum class PresentationFlags ...@@ -34,13 +34,11 @@ enum class PresentationFlags
{ {
NONE = 0x0000, NONE = 0x0000,
HideAllApps = 0x0001, HideAllApps = 0x0001,
NoFullScreen = 0x0002,
NoAutoShow = 0x0004,
}; };
namespace o3tl namespace o3tl
{ {
template<> struct typed_flags<PresentationFlags> : is_typed_flags<PresentationFlags, 0x0007> {}; template<> struct typed_flags<PresentationFlags> : is_typed_flags<PresentationFlags, 0x0001> {};
} }
......
...@@ -173,19 +173,16 @@ void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nF ...@@ -173,19 +173,16 @@ void WorkWindow::StartPresentationMode( bool bPresentation, PresentationFlags nF
mbPresentationFull = mbFullScreenMode; mbPresentationFull = mbFullScreenMode;
mnPresentationFlags = nFlags; mnPresentationFlags = nFlags;
if ( !(mnPresentationFlags & PresentationFlags::NoFullScreen) ) ShowFullScreenMode( true, nDisplayScreen );
ShowFullScreenMode( true, nDisplayScreen );
if ( !mbSysChild ) if ( !mbSysChild )
{ {
if ( mnPresentationFlags & PresentationFlags::HideAllApps ) if ( mnPresentationFlags & PresentationFlags::HideAllApps )
mpWindowImpl->mpFrame->SetAlwaysOnTop( true ); mpWindowImpl->mpFrame->SetAlwaysOnTop( true );
if ( !(mnPresentationFlags & PresentationFlags::NoAutoShow) ) ToTop();
ToTop();
mpWindowImpl->mpFrame->StartPresentation( true ); mpWindowImpl->mpFrame->StartPresentation( true );
} }
if ( !(mnPresentationFlags & PresentationFlags::NoAutoShow) ) Show();
Show();
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment