convert SAD constants to o3tl::typed_flags

and drop unused SAD_TITLE_STORE_AS

Change-Id: I5114958b3954e3dc3ffd941334c6c4dbfbed7aea

6 files changed, 27 insertions, 23 deletions

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index fb61802c0f5f..2c7f63ff70e6 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2066,7 +2066,7 @@ void OApplicationController::renameEntry()
                                 pNameChecker.reset( new HierarchicalNameCheck( xHNames.get(), OUString() ) );
                                 aDialog.reset( VclPtr<OSaveAsDlg>::Create(
 
-                                    getView(), getORB(), sName, sLabel, *pNameChecker, SAD_TITLE_RENAME ) );
+                                    getView(), getORB(), sName, sLabel, *pNameChecker, SADFlags::TitleRename ) );
                             }
                         }
                     }
@@ -2087,7 +2087,7 @@ void OApplicationController::renameEntry()
                         aDialog.reset( VclPtr<OSaveAsDlg>::Create(
 
                             getView(), nCommandType, getORB(), getConnection(),
-                                *aList.begin(), *pNameChecker, SAD_TITLE_RENAME ) );
+                                *aList.begin(), *pNameChecker, SADFlags::TitleRename ) );
                     }
                     break;
                 default:
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 819cbf6372a1..3572a4fe5a7d 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -694,7 +694,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe
                                             getConnection(),
                                             sTargetName,
                                             aNameChecker,
-                                            SAD_ADDITIONAL_DESCRIPTION | SAD_TITLE_PASTE_AS );
+                                            SADFlags::AdditionalDescription | SADFlags::TitlePasteAs );
                     if ( RET_OK != aAskForName->Execute() )
                         // cancelled by the user
                         return false;
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 37d1cb59b590..1ab5b914c9b7 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -62,17 +62,17 @@ public:
     const IObjectNameCheck&    m_rObjectNameCheck;
     css::uno::Reference< css::sdbc::XDatabaseMetaData>            m_xMetaData;
     sal_Int32                  m_nType;
-    sal_Int32                  m_nFlags;
+    SADFlags                   m_nFlags;
 
     OSaveAsDlgImpl( OSaveAsDlg* pParent, sal_Int32 _rType,
                     const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
                     const OUString& rDefault,
                     const IObjectNameCheck& _rObjectNameCheck,
-                    sal_Int32 _nFlags);
+                    SADFlags _nFlags);
     OSaveAsDlgImpl( OSaveAsDlg* pParent,
                     const OUString& rDefault,
                     const IObjectNameCheck& _rObjectNameCheck,
-                    sal_Int32 _nFlags);
+                    SADFlags _nFlags);
 };
 
 } // dbaui
@@ -82,7 +82,7 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent,
                                const Reference< XConnection>& _xConnection,
                                const OUString& rDefault,
                                const IObjectNameCheck& _rObjectNameCheck,
-                               sal_Int32 _nFlags)
+                               SADFlags _nFlags)
     : m_aQryLabel(ModuleRes(STR_QRY_LABEL))
     , m_sTblLabel(ModuleRes(STR_TBL_LABEL))
     , m_aName(rDefault)
@@ -116,7 +116,7 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent,
 OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent,
                                const OUString& rDefault,
                                const IObjectNameCheck& _rObjectNameCheck,
-                               sal_Int32 _nFlags)
+                               SADFlags _nFlags)
     : m_aQryLabel(ModuleRes(STR_QRY_LABEL))
     , m_sTblLabel(ModuleRes(STR_TBL_LABEL))
     , m_aName(rDefault)
@@ -175,7 +175,7 @@ OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,
                         const Reference< XConnection>& _xConnection,
                         const OUString& rDefault,
                         const IObjectNameCheck& _rObjectNameCheck,
-                        sal_Int32 _nFlags)
+                        SADFlags _nFlags)
     : ModalDialog(pParent, "SaveDialog", "dbaccess/ui/savedialog.ui")
     , m_xContext( _rxContext )
 {
@@ -257,7 +257,7 @@ OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent,
                         const OUString& rDefault,
                         const OUString& _sLabel,
                         const IObjectNameCheck& _rObjectNameCheck,
-                        sal_Int32 _nFlags)
+                        SADFlags _nFlags)
     : ModalDialog(pParent, "SaveDialog", "dbaccess/ui/savedialog.ui")
     , m_xContext( _rxContext )
 {
@@ -324,14 +324,14 @@ void OSaveAsDlg::implInitOnlyTitle(const OUString& _rLabel)
 
 void OSaveAsDlg::implInit()
 {
-    if ( 0 == ( m_pImpl->m_nFlags & SAD_ADDITIONAL_DESCRIPTION ) ) {
+    if ( !( m_pImpl->m_nFlags & SADFlags::AdditionalDescription ) ) {
         // hide the description window
         m_pImpl->m_pDescription->Hide();
     }
 
-    if ( SAD_TITLE_PASTE_AS == ( m_pImpl->m_nFlags & SAD_TITLE_PASTE_AS ) )
+    if ( SADFlags::TitlePasteAs == ( m_pImpl->m_nFlags & SADFlags::TitlePasteAs ) )
         SetText( ModuleRes( STR_TITLE_PASTE_AS ) );
-    else if ( SAD_TITLE_RENAME == ( m_pImpl->m_nFlags & SAD_TITLE_RENAME ) )
+    else if ( SADFlags::TitleRename == ( m_pImpl->m_nFlags & SADFlags::TitleRename ) )
         SetText( ModuleRes( STR_TITLE_RENAME ) );
 
     m_pImpl->m_pPB_OK->SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl));
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index 257117f8a577..78149bd0318a 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <vcl/msgbox.hxx>
 #include <memory>
+#include <o3tl/typed_flags_set.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace sdbc {
@@ -33,13 +34,16 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+enum class SADFlags {
+    NONE                  = 0x0000,
+    AdditionalDescription = 0x0001,
+    TitlePasteAs          = 0x0100,
+    TitleRename           = 0x0200,
+};
+namespace o3tl {
+    template<> struct typed_flags<SADFlags> : is_typed_flags<SADFlags, 0x0301> {};
+}
 
-#define SAD_DEFAULT                 0x0000
-#define SAD_ADDITIONAL_DESCRIPTION  0x0001
-
-#define SAD_TITLE_STORE_AS          0x0000
-#define SAD_TITLE_PASTE_AS          0x0100
-#define SAD_TITLE_RENAME            0x0200
 
 class Button;
 class Edit;
@@ -58,14 +62,14 @@ namespace dbaui
                     const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
                     const OUString& rDefault,
                     const IObjectNameCheck& _rObjectNameCheck,
-                    sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS);
+                    SADFlags _nFlags = SADFlags::NONE);
 
         OSaveAsDlg( vcl::Window* _pParent,
                     const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
                     const OUString& _rDefault,
                     const OUString& _sLabel,
                     const IObjectNameCheck& _rObjectNameCheck,
-                    sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS);
+                    SADFlags _nFlags = SADFlags::NONE);
         virtual ~OSaveAsDlg() override;
         virtual void dispose() override;
 
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index f416675c298e..44859bfaebed 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1433,7 +1433,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo
                                     sTargetName,
                                     sLabel,
                                     aNameChecker,
-                                    SAD_ADDITIONAL_DESCRIPTION | SAD_TITLE_PASTE_AS );
+                                    SADFlags::AdditionalDescription | SADFlags::TitlePasteAs );
             if ( RET_OK != aAskForName->Execute() )
                 // cancelled by the user
                 return false;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index b148f9c26544..8ec7a122ebf3 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1367,7 +1367,7 @@ bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElements, b
                 getConnection(),
                 aDefaultName,
                 aNameChecker,
-                SAD_DEFAULT );
+                SADFlags::NONE );
 
         bRet = ( aDlg->Execute() == RET_OK );
         if ( bRet )