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>

2 files changed, 1 insertions, 46 deletions

diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 199056ea7b99..82e8246bc9b0 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -24,7 +24,6 @@
 #include <utility>
 
 #include <formula/formuladllapi.h>
-#include <formula/omoduleclient.hxx>
 #include <formula/IFunctionDescription.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
@@ -88,7 +87,7 @@ protected:
 };
 
 class FORMULA_DLLPUBLIC FormulaDlg:
-    private OModuleClient, public SfxModelessDialog, public IFormulaEditorHelper
+    public SfxModelessDialog, public IFormulaEditorHelper
 {
     friend class FormulaDlg_Impl;
 public:
diff --git a/include/formula/omoduleclient.hxx b/include/formula/omoduleclient.hxx
deleted file mode 100644
index 3af3399bed8d..000000000000
--- a/include/formula/omoduleclient.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FORMULA_OMODULECLIENT_HXX
-#define INCLUDED_FORMULA_OMODULECLIENT_HXX
-
-#include <sal/config.h>
-
-#include <formula/formuladllapi.h>
-
-namespace formula {
-
-/** Base class for objects which use any global module-specific resources.
-*/
-class FORMULA_DLLPUBLIC OModuleClient
-{
-    OModuleClient(const OModuleClient&) = delete;
-    OModuleClient& operator=( const OModuleClient& ) = delete;
-public:
-    OModuleClient();
-    ~OModuleClient();
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */