normalize resource locale ctor construction mechanisms

make them all the same and share std::locales more

various OModuleClient, etc, classes go away

Change-Id: I7e3ff01a69332eeacd22e3078f66a60318de62d5
Reviewed-on: https://gerrit.libreoffice.org/40634
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

18 files changed, 3 insertions, 24 deletions

diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 225f6ef3bd99..50c924fca599 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -30,7 +30,6 @@ namespace dbaui
 
     class OPropColumnEditCtrl : public OSQLNameEdit
     {
-        dbaccess::OModuleClient m_aModuleClient;
         short                m_nPos;
         OUString             m_strHelpText;
     public:
@@ -44,7 +43,6 @@ namespace dbaui
 
     class OPropEditCtrl :   public Edit
     {
-        dbaccess::OModuleClient m_aModuleClient;
         short                m_nPos;
         OUString             m_strHelpText;
 
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index cbea8346b2b0..cb0d6abb2f97 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -29,8 +29,6 @@ namespace dbaui
 
     class OCommentUndoAction : public SfxUndoAction
     {
-        dbaccess::OModuleClient    m_aModuleClient;
-
     protected:
         OUString         m_strComment; // undo, redo comment
 
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index b03e5f6bfa52..1fedfdcedc0c 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -43,7 +43,6 @@ namespace dbaui
 
     class OJoinController : public OJoinController_BASE
     {
-        dbaccess::OModuleClient                    m_aModuleClient;
     protected:
         TTableConnectionData m_vTableConnectionData;
         TTableWindowData     m_vTableData;
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 46749fc1e3ec..3227ea0dbc11 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -35,7 +35,6 @@ namespace dbaui
     class ORelationDialog : public ModalDialog
                             ,public IRelationControlInterface
     {
-        dbaccess::OModuleClient m_aModuleClient;
         std::unique_ptr<OTableListBoxControl> m_xTableControl;
         OJoinTableView::OTableWindowMap*        m_pTableMap;
 
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index e229483c9c27..2b76d4acce70 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -38,7 +38,6 @@ namespace dbaui
     class OTableController : public OTableController_BASE
     {
     private:
-        dbaccess::OModuleClient m_aModuleClient;
         std::vector< std::shared_ptr<OTableRow> > m_vRowList;
         OTypeInfoMap                                    m_aTypeInfo;
         std::vector<OTypeInfoMap::iterator>           m_aTypeInfoIndex;
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index ee4850107f43..e11040d92703 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -43,8 +43,6 @@ class OTableGrantControl : public ::svt::EditBrowseBox
 
     typedef std::map<OUString, TPrivileges> TTablePrivilegeMap;
 
-    dbaccess::OModuleClient        m_aModuleClient;
-
     css::uno::Reference< css::container::XNameAccess >    m_xUsers;
     css::uno::Reference< css::container::XNameAccess >    m_xTables;
     css::uno::Reference< css::uno::XComponentContext>     m_xContext;
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 3d8540ba9214..8dfaa504781b 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -183,7 +183,6 @@ namespace dbaui
 
     class ORowSetImportExport : public ODatabaseImportExport
     {
-        dbaccess::OModuleClient   m_aModuleClient;
         std::vector<sal_Int32>    m_aColumnMapping;
         std::vector<sal_Int32>    m_aColumnTypes;
         css::uno::Reference< css::sdbc::XResultSetUpdate >    m_xTargetResultSetUpdate;
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 5c1ced4d136a..cc43e2d2b3d5 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -43,9 +43,8 @@ namespace dbaui
 
     /** implements the user admin dialog
     */
-    class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
+    class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog
     {
-        dbaccess::OModuleClient m_aModuleClient;
         std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
         SfxItemSet*   m_pItemSet;
         css::uno::Reference< css::sdbc::XConnection>          m_xConnection;
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 5ac918089a28..2f5650690b28 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -38,7 +38,6 @@ namespace dbaui
                                     ,public IItemSetHelper
                                     ,public IDatabaseSettingsDialog
     {
-        dbaccess::OModuleClient m_aModuleClient;
         std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
     protected:
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index f0f5160ae75b..a2269f1c3971 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -76,7 +76,6 @@ namespace dbaui
         // for implementing the XFormController
         class FormControllerImpl;
         friend class FormControllerImpl;
-        dbaccess::OModuleClient                               m_aModuleClient;
 
         css::uno::Reference< css::sdbc::XRowSet >             m_xRowSet;      // our rowset
         css::uno::Reference< css::sdbcx::XColumnsSupplier >   m_xColumnsSupplier; // queried from the rowset member
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 695a6a3e2734..23600ade0adf 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -51,7 +51,6 @@ namespace dbaui
     class IContextMenuProvider;
     class DBTreeListBox     :public SvTreeListBox
     {
-        dbaccess::OModuleClient     m_aModuleClient;
         OScrollHelper               m_aScrollHelper;
         Timer                       m_aTimer; // is needed for table updates
         Point                       m_aMousePos;
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 6d43a639dcee..5c10a924dbe4 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -52,10 +52,9 @@ class OGeneralPage;
 class ODbDataSourceAdministrationHelper;
 /** tab dialog for administrating the office wide registered data sources
 */
-class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
+class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog
 {
 private:
-    dbaccess::OModuleClient m_aModuleClient;
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
     SfxItemSet*             m_pOutSet;
     ::dbaccess::ODsnTypeCollection*
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 952ce5e29492..5a4dece458e2 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -56,10 +56,9 @@ class ODbDataSourceAdministrationHelper;
 class OMySQLIntroPageSetup;
 class OFinalDBPageSetup;
 
-class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient
+class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog
 {
 private:
-    dbaccess::OModuleClient m_aModuleClient;
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
     SfxItemSet*             m_pOutSet;
     OUString                m_sURL;
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 88cf84be00c0..422ccba494ce 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -46,7 +46,6 @@ namespace dbaui
             ,public ::utl::OEventListenerAdapter
     {
     protected:
-        dbaccess::OModuleClient m_aModuleClient;
         ::osl::Mutex    m_aMutex;
 
         VclPtr<MultiLineEditSyntaxHighlight>    m_pSQL;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 2ceea1f294e6..b4c16b7cad23 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -120,7 +120,6 @@ namespace dbaui
         ,public SbaXFormAdapter_BASE3
     {
     private:
-        dbaccess::OModuleClient             m_aModuleClient;
         css::uno::Reference< css::sdbc::XRowSet >                             m_xMainForm;
         ::osl::Mutex                        m_aMutex;
 
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 034e28bb0856..e8d893a91186 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -33,7 +33,6 @@ namespace dbaui
     // IndexFieldsControl
     class IndexFieldsControl : public ::svt::EditBrowseBox
     {
-        dbaccess::OModuleClient     m_aModuleClient;
     protected:
         IndexFields                 m_aSavedValue;
 
diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx
index d4d75f32b720..00ad6a2cff93 100644
--- a/dbaccess/source/ui/inc/unoadmin.hxx
+++ b/dbaccess/source/ui/inc/unoadmin.hxx
@@ -37,7 +37,6 @@ typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase;
 class ODatabaseAdministrationDialog
         :public ODatabaseAdministrationDialogBase
 {
-    dbaccess::OModuleClient m_aModuleClient;
 protected:
     SfxItemSet*             m_pDatasourceItems;     // item set for the dialog
     SfxItemPool*            m_pItemPool;            // item pool for the item set for the dialog
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 0731c1405b43..c1d72366f44c 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -32,7 +32,6 @@ class OSQLMessageDialog
         :public OSQLMessageDialogBase
         ,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog >
 {
-    dbaccess::OModuleClient m_aModuleClient;
 protected:
     // <properties>
     css::uno::Any        m_aException;