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 /sc | |
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 'sc')
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/chartsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drawsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drformsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/graphsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/mediash.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/oleobjsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/formatsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh.cxx | 3 |
12 files changed, 23 insertions, 12 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 9bcfab79c8af..fbb7ae9478d0 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -125,7 +125,8 @@ SFX_IMPL_INTERFACE(ScModule, SfxShell) void ScModule::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Client | SfxVisibilityFlags::Viewer, RID_OBJECTBAR_APP); GetStaticInterface()->RegisterStatusBar(SCCFG_STATUSBAR); diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index b07f8b93f9c2..5f7e494e44d8 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -49,7 +49,8 @@ SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell) void ScChartShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_DRAW_OBJECTBAR); GetStaticInterface()->RegisterPopupMenu("chart"); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 3b38a264610c..b172abeeea84 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -65,7 +65,8 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell) void ScDrawShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_DRAW_OBJECTBAR); GetStaticInterface()->RegisterPopupMenu("draw"); diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 28b5e4fa880f..cbfc149ba7a1 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -44,7 +44,8 @@ SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell) void ScDrawFormShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_OBJECTBAR_FORMAT); GetStaticInterface()->RegisterPopupMenu("form"); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 0fe048763f43..7952cfe6b235 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -87,7 +87,8 @@ SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell) void ScDrawTextObjectBar::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_TEXT_TOOLBOX); GetStaticInterface()->RegisterPopupMenu("drawtext"); diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 8c11655da76a..0c0ee2e2f3ee 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -46,7 +46,8 @@ SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell) void ScGraphicShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_GRAPHIC_OBJECTBAR); GetStaticInterface()->RegisterPopupMenu("graphic"); diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 4ddeec4c2abd..546afd9aaff8 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -39,7 +39,7 @@ SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell) void ScMediaShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_OBJECTBAR); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SfxVisibilityFlags::Invisible, RID_MEDIA_OBJECTBAR); GetStaticInterface()->RegisterPopupMenu("media"); } diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index e3096ebb3815..a108cdce45e9 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -44,7 +44,8 @@ SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell) void ScOleObjectShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_DRAW_OBJECTBAR); GetStaticInterface()->RegisterPopupMenu("oleobject"); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 7642274eead4..309cbf10799a 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -68,7 +68,8 @@ SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell) void ScCellShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_OBJECTBAR_FORMAT); GetStaticInterface()->RegisterPopupMenu("cell"); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index aa002d698359..f0d09762c105 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -125,7 +125,8 @@ SFX_IMPL_INTERFACE(ScFormatShell, SfxShell) void ScFormatShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server, RID_OBJECTBAR_FORMAT); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 7668f2fff282..86febd581aa2 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -88,7 +88,8 @@ SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell) void ScPreviewShell::InitInterface_Impl() { - GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC, + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, + SfxVisibilityFlags::Standard|SfxVisibilityFlags::Server|SfxVisibilityFlags::ReadonlyDoc, RID_OBJECTBAR_PREVIEW); GetStaticInterface()->RegisterPopupMenu("preview"); diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index ccf681b47248..bb18b4beffab 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -53,7 +53,8 @@ SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell) void ScTabViewShell::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_OBJECTBAR_TOOLS); GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS); |