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>

3 files changed, 2 insertions, 35 deletions

diff --git a/svl/source/misc/getstringresource.cxx b/svl/source/misc/getstringresource.cxx
index ff95e7d2c22c..c452b6612651 100644
--- a/svl/source/misc/getstringresource.cxx
+++ b/svl/source/misc/getstringresource.cxx
@@ -23,10 +23,9 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
+#include <svl/svlresid.hxx>
 #include <unotools/resmgr.hxx>
 
-#include "getstringresource.hxx"
-
 OUString SvlResId(const char* id)
 {
     static std::locale loc = Translate::Create("svl");
diff --git a/svl/source/misc/getstringresource.hxx b/svl/source/misc/getstringresource.hxx
deleted file mode 100644
index b04553bc13e5..000000000000
--- a/svl/source/misc/getstringresource.hxx
+++ /dev/null
@@ -1,31 +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_SVL_SOURCE_MISC_GETSTRINGRESOURCE_HXX
-#define INCLUDED_SVL_SOURCE_MISC_GETSTRINGRESOURCE_HXX
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-OUString SvlResId(const char* id);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index e34d41051588..58532eb08a5c 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -27,10 +27,9 @@
 #include <rtl/instance.hxx>
 #include <osl/diagnose.h>
 #include <svl/inettype.hxx>
+#include <svl/svlresid.hxx>
 #include <svl/svl.hrc>
 
-#include "getstringresource.hxx"
-
 namespace
 {