summaryrefslogtreecommitdiff
path: root/include/svtools/svtresid.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-01 13:50:45 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-08-02 10:36:07 +0200
commit13fac4894f752e922727c6f22c6303712e06ba12 (patch)
tree5689829e917927bb13461d91988ec99e461f1831 /include/svtools/svtresid.hxx
parent13cadf3fe38daa0b4cfddcfa68ec8631bc85f44a (diff)
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>
Diffstat (limited to 'include/svtools/svtresid.hxx')
-rw-r--r--include/svtools/svtresid.hxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx
index 8f6cfc8b43f0..cae5861a4df9 100644
--- a/include/svtools/svtresid.hxx
+++ b/include/svtools/svtresid.hxx
@@ -21,14 +21,10 @@
#define INCLUDED_SVTOOLS_SVTRESID_HXX
#include <svtools/svtdllapi.h>
-#include <com/sun/star/lang/Locale.hpp>
-
-struct SVT_DLLPUBLIC SvtResLocale
-{
- static std::locale* GetResLocale();
- static void DeleteResLocale();
-};
+#include <rtl/ustring.hxx>
+#include <locale>
+SVT_DLLPUBLIC const std::locale& SvtResLocale();
SVT_DLLPUBLIC OUString SvtResId(const char* pId);
#endif // INCLUDED_SVTOOLS_SVTRESID_HXX