diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-12-13 19:17:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-12-22 22:39:39 +0100 |
| commit | 101a79cc4d13a1f566c1b97c1329813eb7c61bcf (patch) | |
| tree | 31bba77cc8656d6882992ea753917adc787241a9 /include | |
| parent | a5fe3117e1877fa0bfb55f1cf22cf9394b3f0795 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/basic/sbdef.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/eerdll.hxx | 1 | ||||
| -rw-r--r-- | include/svtools/svtresid.hxx | 2 | ||||
| -rw-r--r-- | include/svx/dialmgr.hxx | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx index 80513323f308..e79c58b6c071 100644 --- a/include/basic/sbdef.hxx +++ b/include/basic/sbdef.hxx @@ -69,7 +69,7 @@ enum class PropertyMode }; BASIC_DLLPUBLIC const ErrMsgCode* getRID_BASIC_START(); -BASIC_DLLPUBLIC const std::locale& BasResLocale(); +BASIC_DLLPUBLIC std::locale BasResLocale(); BASIC_DLLPUBLIC OUString BasResId(const char* pId); #endif diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx index 1f1a8411c7c6..ba31c72380d9 100644 --- a/include/editeng/eerdll.hxx +++ b/include/editeng/eerdll.hxx @@ -41,7 +41,6 @@ public: EditDLL(); ~EditDLL(); - static std::locale& GetResLocale(); GlobalEditData* GetGlobalData() const { return pGlobalData.get(); } std::shared_ptr<editeng::SharedVclResources> GetSharedVclResources(); static EditDLL& Get(); diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx index cae5861a4df9..f0f9b45fcc29 100644 --- a/include/svtools/svtresid.hxx +++ b/include/svtools/svtresid.hxx @@ -24,7 +24,7 @@ #include <rtl/ustring.hxx> #include <locale> -SVT_DLLPUBLIC const std::locale& SvtResLocale(); +SVT_DLLPUBLIC std::locale SvtResLocale(); SVT_DLLPUBLIC OUString SvtResId(const char* pId); #endif // INCLUDED_SVTOOLS_SVTRESID_HXX diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx index ee9147d1f503..20a5c25b81eb 100644 --- a/include/svx/dialmgr.hxx +++ b/include/svx/dialmgr.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -SVX_DLLPUBLIC const std::locale& SvxResLocale(); +SVX_DLLPUBLIC std::locale SvxResLocale(); SVX_DLLPUBLIC OUString SvxResId(const char* pId); #endif |