diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-02 11:00:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-02 12:19:01 +0100 |
commit | 884cbe174ee5e343e9ed56093421aad3e467bf57 (patch) | |
tree | bb62e25fe5d1768cc1f493634573eb22473d2944 /include | |
parent | 11cc1afb2fd46c3dfdd519ad51c5fb2e7e3b7837 (diff) |
RID_* can be extern global variables
no need to access them via methods
Change-Id: If0d1a65d6f56ce2fc585749d974ba13c9f2749b2
Reviewed-on: https://gerrit.libreoffice.org/47245
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/basic/sbdef.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ehdl.hxx | 4 | ||||
-rw-r--r-- | include/svtools/soerr.hxx | 4 | ||||
-rw-r--r-- | include/svx/svxerr.hxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx index e79c58b6c071..7d677f1c9be6 100644 --- a/include/basic/sbdef.hxx +++ b/include/basic/sbdef.hxx @@ -68,7 +68,7 @@ enum class PropertyMode Set }; -BASIC_DLLPUBLIC const ErrMsgCode* getRID_BASIC_START(); +BASIC_DLLPUBLIC extern std::pair<const char*, ErrCode> const RID_BASIC_START[]; BASIC_DLLPUBLIC std::locale BasResLocale(); BASIC_DLLPUBLIC OUString BasResId(const char* pId); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index a78e9d22d648..2042d70184eb 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -26,8 +26,8 @@ #include <vcl/errinf.hxx> typedef std::pair<const char*, ErrCode> ErrMsgCode; -SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRHDL(); -SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRCTX(); +SVT_DLLPUBLIC extern const ErrMsgCode RID_ERRHDL[]; +SVT_DLLPUBLIC extern const ErrMsgCode RID_ERRCTX[]; namespace vcl { class Window; } diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index 96a4677bf5d0..9f39f6ca1563 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.hxx @@ -35,8 +35,8 @@ // error contexts #define ERRCTX_SO_DOVERB 1 -SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERROR_HANDLER(); -SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERRCTX(); +SVT_DLLPUBLIC extern const ErrMsgCode RID_SO_ERROR_HANDLER[]; +SVT_DLLPUBLIC extern const ErrMsgCode RID_SO_ERRCTX[]; #endif diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx index e746649ea317..f428a920af61 100644 --- a/include/svx/svxerr.hxx +++ b/include/svx/svxerr.hxx @@ -54,8 +54,8 @@ public: static void ensure(); }; -SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCODE(); -SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCTX(); +SVX_DLLPUBLIC extern const ErrMsgCode RID_SVXERRCODE[]; +SVX_DLLPUBLIC extern const ErrMsgCode RID_SVXERRCTX[]; #endif |