10 files changed, 8 insertions, 268 deletions
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index f092a7370ff3..6449ed254787 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -25,7 +25,7 @@
 #include <certificateviewer.hxx>
 #include <macrosecurity.hxx>
 #include <biginteger.hxx>
-#include <global.hrc>
+#include <strings.hrc>
 #include <pdfsignaturehelper.hxx>
 #include <sax/tools/converter.hxx>
 
diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src
deleted file mode 100644
index 38f090ce6f6c..000000000000
--- a/xmlsecurity/source/component/warnbox.src
+++ /dev/null
@@ -1,27 +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 <global.hrc>
-
-String RID_XMLSECWB_NO_MOZILLA_PROFILE
-{
-    Text [ en-US ] = "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index e4afcacf4714..1b7d94b5bdd7 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -29,8 +29,9 @@
 #include <unotools/datetime.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "dialogs.hrc"
+#include "strings.hrc"
 #include "resourcemanager.hxx"
+#include "svtools/controldims.hxx"
 #include "bitmaps.hlst"
 
 #include <vcl/settings.hxx>
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
deleted file mode 100644
index a3820fc59117..000000000000
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ /dev/null
@@ -1,92 +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 "dialogs.hrc"
-
-String STR_CERTIFICATE_NOT_VALIDATED
-{
-    Text [ en-US ] = "The certificate could not be validated.";
-};
-
-String STR_HEADERBAR
-{
-    Text [ en-US ] = "Field\tValue";
-};
-
-String STR_VERSION
-{
-    Text [ en-US ] = "Version";
-};
-
-String STR_SERIALNUM
-{
-    Text [ en-US ] = "Serial Number";
-};
-
-String STR_ISSUER
-{
-    Text [ en-US ] = "Issuer";
-};
-
-String STR_VALIDFROM
-{
-    Text [ en-US ] = "Valid From";
-};
-
-String STR_VALIDTO
-{
-    Text [ en-US ] = "Valid to";
-};
-
-String STR_SUBJECT
-{
-    Text [ en-US ] = "Subject";
-};
-
-String STR_SUBJECT_PUBKEY_ALGO
-{
-    Text [ en-US ] = "Subject Algorithm";
-};
-
-String STR_SUBJECT_PUBKEY_VAL
-{
-    Text [ en-US ] = "Public Key";
-};
-
-String STR_SIGNATURE_ALGO
-{
-    Text [ en-US ] = "Signature Algorithm";
-};
-
-String STR_USE
-{
-    Text [ en-US ] = "Certificate Use";
-};
-
-String STR_THUMBPRINT_SHA1
-{
-    Text [ en-US ] = "Thumbprint SHA1";
-};
-
-String STR_THUMBPRINT_MD5
-{
-    Text [ en-US ] = "Thumbprint MD5";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
deleted file mode 100644
index a0abefacb401..000000000000
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ /dev/null
@@ -1,45 +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_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC
-#define INCLUDED_XMLSECURITY_SOURCE_DIALOGS_DIALOGS_HRC
-
-#include <svtools/controldims.hrc>
-#include <global.hrc>
-
-#define STR_HEADERBAR                   256
-#define STR_VERSION                     257
-#define STR_SERIALNUM                   258
-#define STR_ISSUER                      259
-#define STR_VALIDFROM                   260
-#define STR_VALIDTO                     261
-#define STR_SUBJECT                     262
-#define STR_SUBJECT_PUBKEY_ALGO         263
-#define STR_SUBJECT_PUBKEY_VAL          264
-#define STR_SIGNATURE_ALGO              266
-#define STR_THUMBPRINT_SHA1             267
-#define STR_THUMBPRINT_MD5              268
-#define STR_USE                         271
-
-// --------- tab page Certificate viewer - General ---------
-#define STR_CERTIFICATE_NOT_VALIDATED   269
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 85edf4391561..2b79174c615f 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -49,8 +49,7 @@
 #include <tools/time.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include "dialogs.hrc"
-#include "digitalsignaturesdialog.hrc"
+#include "strings.hrc"
 #include "resourcemanager.hxx"
 
 #include <vcl/layout.hxx>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
deleted file mode 100644
index c56c26da96d1..000000000000
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ /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 .
- */
-
-#ifndef INCLUDED_DIGITALSIGNATURESDIALOG_HRC
-#define INCLUDED_DIGITALSIGNATURESDIALOG_HRC
-
-//global.hrc in inc starts at 1000
-#define RID_DIGITALSIGNATUREDLG_START                 2000
-
-#define STR_XMLSECDLG_OLD_ODF_FORMAT     RID_DIGITALSIGNATUREDLG_START
-#define STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN (RID_DIGITALSIGNATUREDLG_START + 1)
-#define STR_XMLSECDLG_QUERY_REALLYREMOVE (RID_DIGITALSIGNATUREDLG_START + 2)
-#define STR_XMLSECDLG_SIGNING_FAILED (RID_DIGITALSIGNATUREDLG_START + 3)
-#define STR_XMLSECDLG_NO_CERT_MANAGER (RID_DIGITALSIGNATUREDLG_START + 4)
-#define STR_XMLSECDLG_NO_CERT_FOUND (RID_DIGITALSIGNATUREDLG_START + 5)
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
deleted file mode 100644
index a01f7d1a33b6..000000000000
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ /dev/null
@@ -1,59 +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 "dialogs.hrc"
-#include "digitalsignaturesdialog.hrc"
-
-String STR_XMLSECDLG_OLD_ODF_FORMAT
-{
-    Text [ en-US ] =
-        "This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
-        "Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
-        "Thus no signatures can be added or removed to this document.\n\n"
-        "Save document in ODF 1.2 format and add all desired signatures again.";
-};
-
-String STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN
-{
-    Text [ en-US ] = "Adding or removing a macro signature will remove all document signatures.\n"
-        "Do you really want to continue?";
-};
-
-String STR_XMLSECDLG_QUERY_REALLYREMOVE
-{
-    Text [ en-US ] = "Document signature cannot be restored, once removed.\n"
-        "Do you really want to remove selected signature?";
-};
-
-String STR_XMLSECDLG_SIGNING_FAILED
-{
-    Text [ en-US ] = "An error occurred while adding the signature.";
-};
-
-String STR_XMLSECDLG_NO_CERT_MANAGER
-{
-    Text [ en-US ] = "Could not find any certificate manager.";
-};
-
-String STR_XMLSECDLG_NO_CERT_FOUND
-{
-    Text [ en-US ] = "Could not find the certificate.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 63a112361280..7616d5fd9992 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -41,7 +41,7 @@
 
 #include <vcl/msgbox.hxx>
 
-#include "dialogs.hrc"
+#include "strings.hrc"
 #include "resourcemanager.hxx"
 
 using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 5b04868e52a1..9296c02a89d4 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -32,13 +32,10 @@ using namespace std;
 
 namespace XmlSec
 {
-    static ResMgr*          pResMgr = nullptr;
-
-    ResMgr* GetResMgr()
+    const std::locale& GetResLocale()
     {
-        if (!pResMgr)
-            pResMgr = ResMgr::CreateResMgr("xmlsec");
-        return pResMgr;
+        static const std::locale loc = Translate::Create("xsc", Application::GetSettings().GetUILanguageTag());
+        return loc;
     }
 
     const LocaleDataWrapper&    GetLocaleData()