lokdialog: Allow switching language of some of the ResMgr's.

This way, it is possible to have all the strings translated in dialogs even
when different users use different languages.  [It was already possible
to have different languages previously, but not everything in the dialog has
switched - like the buttons at the bottom of the dialogs etc.]

Change-Id: I29a5ae6d31a370eec60397884200b684ec1bf5b9
Reviewed-on: https://gerrit.libreoffice.org/46417
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/46979
Tested-by: Jenkins <ci@libreoffice.org>

4 files changed, 1 insertions, 75 deletions

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index f785d097ae54..28bc87b89057 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -234,7 +234,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/tools/RelativePositionHelper \
     chart2/source/tools/RelativeSizeHelper \
     chart2/source/tools/ResId \
-    chart2/source/tools/ResourceManager \
     chart2/source/tools/Scaling \
     chart2/source/tools/SceneProperties \
     chart2/source/tools/StatisticsHelper \
diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx
deleted file mode 100644
index afb1e76f9165..000000000000
--- a/chart2/source/inc/ResourceManager.hxx
+++ /dev/null
@@ -1,38 +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_CHART2_SOURCE_INC_RESOURCEMANAGER_HXX
-#define INCLUDED_CHART2_SOURCE_INC_RESOURCEMANAGER_HXX
-
-#include "charttoolsdllapi.hxx"
-#include <locale>
-
-namespace chart
-{
-
-namespace ResourceManager
-{
-    const std::locale&  getResourceLocale();
-}
-
-} //  namespace chart
-
-// INCLUDED_CHART2_SOURCE_INC_RESOURCEMANAGER_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index b7341f9cf348..850eb9b84dd7 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -18,14 +18,13 @@
  */
 
 #include <ResId.hxx>
-#include <ResourceManager.hxx>
 #include <unotools/resmgr.hxx>
 
 namespace chart
 {
     OUString SchResId(const char *pId)
     {
-        return Translate::get(pId, ResourceManager::getResourceLocale());
+        return Translate::get(pId, Translate::Create("chart"));
     }
 } //  namespace chart
 
diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx
deleted file mode 100644
index 78fff6d86d09..000000000000
--- a/chart2/source/tools/ResourceManager.cxx
+++ /dev/null
@@ -1,34 +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 .
- */
-
-#include <ResourceManager.hxx>
-#include <unotools/resmgr.hxx>
-
-namespace chart
-{
-
-const std::locale& ResourceManager::getResourceLocale()
-{
-    static std::locale loc = Translate::Create("chart");
-    return loc;
-}
-
-} //  namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */