diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-23 15:42:47 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:08:05 -0500 |
| commit | 42fdf23f4d9be733f68196890ec7444ef1c3cf85 (patch) | |
| tree | 076e4bcab2411a3e33f485333288728a698ce53c /sd | |
| parent | d2f7063d7e8c7631d804ea18ce5cc5d0aa310cb9 (diff) | |
convert SFX_VISIBILITY constants to scoped enum
* split the position and the flags information
* remove unused DESKTOP constant
Change-Id: Ibfccb44c7567e89d4527bfd36b3915a73682e6e2
(cherry picked from commit 5af0071d42e5962ed849261134ef0630c7ec3b45)
(cherry picked from commit 82577130d5a1e40396053e86fd0d7beb14170fbd)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/presvish.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 4954cde4fe50..94202ee24932 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -112,9 +112,9 @@ void OutlineViewShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu("outline"); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS, SfxVisibilityFlags::Standard | SfxVisibilityFlags::FullScreen | SfxVisibilityFlags::Server, RID_OUTLINE_TOOLBOX); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION, SfxVisibilityFlags::Standard | SfxVisibilityFlags::Client | SfxVisibilityFlags::Viewer | SfxVisibilityFlags::ReadonlyDoc, RID_DRAW_VIEWER_TOOLBOX); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index db837f9c6460..7d78cddacbcc 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -63,13 +63,13 @@ SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell) void PresentationViewShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS, SfxVisibilityFlags::Standard | SfxVisibilityFlags::FullScreen | SfxVisibilityFlags::Server, RID_DRAW_TOOLBOX); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION, SfxVisibilityFlags::Standard | SfxVisibilityFlags::Client | SfxVisibilityFlags::Viewer | SfxVisibilityFlags::ReadonlyDoc, RID_DRAW_VIEWER_TOOLBOX); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OPTIONS, SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_DRAW_OPTIONS_TOOLBOX); - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_COMMONTASK, SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_DRAW_COMMONTASK_TOOLBOX); } |