convert CBTP constants to o3tl::typed_flags

Change-Id: I453a9bacef737a56e381c4172710ec6acf225f0b

2 files changed, 32 insertions, 28 deletions

diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 93702c9b58c1..66209cf6f443 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -58,7 +58,7 @@ namespace dbaui
 
     OCommonBehaviourTabPage::OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId,
         const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs,
-        sal_uInt32 nControlFlags)
+        OCommonBehaviourTabPageFlags nControlFlags)
 
         :OGenericAdministrationPage(pParent, rId, rUIXMLDescription, _rCoreAttrs)
         ,m_pOptionsLabel(nullptr)
@@ -73,7 +73,7 @@ namespace dbaui
         ,m_nControlFlags(nControlFlags)
     {
 
-        if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
         {
             m_pOptionsLabel = get<FixedText>("optionslabel");
             m_pOptionsLabel->Show();
@@ -82,7 +82,7 @@ namespace dbaui
             m_pOptions->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlEditModifyHdl));
         }
 
-        if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
         {
             FixedText* pDataConvertLabel = get<FixedText>("charsetheader");
             pDataConvertLabel->Show();
@@ -120,22 +120,22 @@ namespace dbaui
 
     void OCommonBehaviourTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
         {
             _rControlList.push_back(new ODisableWrapper<FixedText>(m_pOptionsLabel));
         }
 
-        if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
         {
             _rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharsetLabel));
         }
     }
     void OCommonBehaviourTabPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
     {
-        if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
             _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pOptions));
 
-        if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
             _rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharset));
     }
 
@@ -152,13 +152,13 @@ namespace dbaui
         // forward the values to the controls
         if (bValid)
         {
-            if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
+            if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
             {
                 m_pOptions->SetText(pOptionsItem->GetValue());
                 m_pOptions->ClearModifyFlag();
             }
 
-            if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
+            if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
             {
                 m_pCharset->SelectEntryByIanaName( pCharsetItem->GetValue() );
             }
@@ -170,12 +170,12 @@ namespace dbaui
     {
         bool bChangedSomething = false;
 
-        if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
         {
             fillString(*_rSet,m_pOptions,DSID_ADDITIONALOPTIONS,bChangedSomething);
         }
 
-        if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
+        if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseCharset)
         {
             if ( m_pCharset->StoreSelectedCharSet( *_rSet, DSID_CHARSET ) )
                 bChangedSomething = true;
@@ -186,7 +186,7 @@ namespace dbaui
 
     // ODbaseDetailsPage
     ODbaseDetailsPage::ODbaseDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "DbasePage", "dbaccess/ui/dbasepage.ui", _rCoreAttrs, CBTP_USE_CHARSET)
+        :OCommonBehaviourTabPage(pParent, "DbasePage", "dbaccess/ui/dbasepage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset)
     {
         get(m_pShowDeleted, "showDelRowsCheckbutton");
         get(m_pFT_Message, "specMessageLabel");
@@ -265,7 +265,7 @@ namespace dbaui
 
     // OAdoDetailsPage
     OAdoDetailsPage::OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
+        :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
     {
 
     }
@@ -277,7 +277,7 @@ namespace dbaui
 
     // OOdbcDetailsPage
     OOdbcDetailsPage::OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
+        :OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset | OCommonBehaviourTabPageFlags::UseOptions)
     {
         get(m_pUseCatalog, "useCatalogCheckbutton");
         m_pUseCatalog->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) );
@@ -321,7 +321,7 @@ namespace dbaui
     // OOdbcDetailsPage
     OUserDriverDetailsPage::OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
         : OCommonBehaviourTabPage(pParent, "UserDetailsPage", "dbaccess/ui/userdetailspage.ui", _rCoreAttrs,
-            CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
+            OCommonBehaviourTabPageFlags::UseCharset | OCommonBehaviourTabPageFlags::UseOptions)
     {
         get(m_pFTHostname, "hostnameft");
         get(m_pEDHostname, "hostname");
@@ -400,7 +400,7 @@ namespace dbaui
     }
     // OMySQLODBCDetailsPage
     OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
+        :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
     {
     }
 
@@ -411,7 +411,7 @@ namespace dbaui
 
     // OMySQLJDBCDetailsPage
     OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket )
-        :OCommonBehaviourTabPage(pParent, "GeneralSpecialJDBCDetails", "dbaccess/ui/generalspecialjdbcdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET)
+        :OCommonBehaviourTabPage(pParent, "GeneralSpecialJDBCDetails", "dbaccess/ui/generalspecialjdbcdetailspage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset)
         ,m_nPortId(_nPortId)
         ,m_bUseClass(true)
     {
@@ -556,7 +556,7 @@ namespace dbaui
 
     // MySQLNativePage
     MySQLNativePage::MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "MysqlNativePage", "dbaccess/ui/mysqlnativepage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
+        :OCommonBehaviourTabPage(pParent, "MysqlNativePage", "dbaccess/ui/mysqlnativepage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
         ,m_aMySQLSettings       ( VclPtr<MySQLNativeSettings>::Create(*get<VclVBox>("MySQLSettingsContainer"), LINK(this,OGenericAdministrationPage,OnControlModified)) )
     {
         get(m_pSeparator1, "connectionheader");
@@ -657,7 +657,7 @@ namespace dbaui
 
     // OLDAPDetailsPage
     OLDAPDetailsPage::OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "LDAP", "dbaccess/ui/ldappage.ui", _rCoreAttrs, 0)
+        :OCommonBehaviourTabPage(pParent, "LDAP", "dbaccess/ui/ldappage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::NONE)
     {
         get(m_pETBaseDN, "baseDNEntry");
         get(m_pCBUseSSL, "useSSLCheckbutton");
@@ -747,7 +747,7 @@ namespace dbaui
 
     // OTextDetailsPage
     OTextDetailsPage::OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "EmptyPage", "dbaccess/ui/emptypage.ui", _rCoreAttrs, 0)
+        :OCommonBehaviourTabPage(pParent, "EmptyPage", "dbaccess/ui/emptypage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::NONE)
     {
 
         m_pTextConnectionHelper = VclPtr<OTextConnectionHelper>::Create( get<VclVBox>("EmptyPage"), TC_EXTENSION | TC_HEADER | TC_SEPARATORS | TC_CHARSET );
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 8c5f0ff3f1a8..bbc53088c6bf 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -32,14 +32,19 @@
 #include "admincontrols.hxx"
 
 #include <svtools/dialogcontrolling.hxx>
+#include <o3tl/typed_flags_set.hxx>
+
+enum class OCommonBehaviourTabPageFlags {
+    NONE        = 0x0000,
+    UseCharset  = 0x0002,
+    UseOptions  = 0x0004,
+};
+namespace o3tl {
+    template<> struct typed_flags<OCommonBehaviourTabPageFlags> : is_typed_flags<OCommonBehaviourTabPageFlags, 0x0006> {};
+}
 
 namespace dbaui
 {
-    // OCommonBehaviourTabPage
-    #define     CBTP_NONE                           0x00000000
-    #define     CBTP_USE_CHARSET                    0x00000002
-    #define     CBTP_USE_OPTIONS                    0x00000004
-
     /** eases the implementation of tab pages handling user/password and/or character
         set and/or generic options input
         <BR>
@@ -62,13 +67,12 @@ namespace dbaui
         VclPtr<FixedText>          m_pAutoRetrievingLabel;
         VclPtr<Edit>               m_pAutoRetrieving;
 
-        sal_uInt32          m_nControlFlags;
+        OCommonBehaviourTabPageFlags m_nControlFlags;
 
     public:
         virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) override;
 
-        // nControlFlags is a combination of the CBTP_xxx-constants
-        OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags);
+        OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags);
     protected:
 
         virtual ~OCommonBehaviourTabPage() override;