summaryrefslogtreecommitdiff
path: root/include/vcl/EnumContext.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-20 14:59:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-21 07:10:54 +0000
commit5ec1b04b9bfe949316c67b1282f7f8fa066c3b60 (patch)
tree77e1940145bf44e6dc60aeefb2df853d88f2f0c0 /include/vcl/EnumContext.hxx
parent72002992a3c5213882fa4d60c7cd8fab10f0b009 (diff)
convert EnumContext::Application to scoped enum
Change-Id: Ia289a7b63bf8797085315218785e2a2a4c45d232 Reviewed-on: https://gerrit.libreoffice.org/32230 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl/EnumContext.hxx')
-rw-r--r--include/vcl/EnumContext.hxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index cb48266d168c..e0f19b002368 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -31,35 +31,35 @@ namespace vcl {
class VCL_DLLPUBLIC EnumContext
{
public:
- enum Application
+ enum class Application
{
- Application_Writer,
- Application_WriterGlobal,
- Application_WriterWeb,
- Application_WriterXML,
- Application_WriterForm,
- Application_WriterReport,
- Application_Calc,
- Application_Chart,
- Application_Draw,
- Application_Impress,
+ Writer,
+ WriterGlobal,
+ WriterWeb,
+ WriterXML,
+ WriterForm,
+ WriterReport,
+ Calc,
+ Chart,
+ Draw,
+ Impress,
// For your convenience to avoid duplicate code in the common
// case that Draw and Impress use identical context configurations.
- Application_DrawImpress,
+ DrawImpress,
// Also for your convenience for the different variants of Writer documents.
- Application_WriterVariants,
+ WriterVariants,
// Used only by deck or panel descriptors. Matches any
// application.
- Application_Any,
+ Any,
// Use this only in special circumstances. One might be the
// wish to disable a deck or panel during debugging.
- Application_None,
+ NONE,
- LastApplicationEnum = Application_None
+ LAST = Application::NONE
};
enum Context
{
@@ -123,7 +123,7 @@ public:
made are:
Draw or Impress -> DrawImpress
Writer or WriterWeb -> WriterAndWeb
- Use the Application_DrawImpress or Application_WriterAndWeb values in the CombinedEnumContext macro.
+ Use the Application::DrawImpress or Application::WriterAndWeb values in the CombinedEnumContext macro.
*/
sal_Int32 GetCombinedContext_DI() const;