diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-19 13:18:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 09:39:11 +0200 |
| commit | 14cfff500e93f0d6cbf8412065feea85c01ea81d (patch) | |
| tree | 76e3fb8fbf2b0d8a12c8406d8cf994ea6a37aaff /oox | |
| parent | d924ce30e0ca260682bd2aed192b8b1b2ca3e7c0 (diff) | |
Pass context and resource string down to boost::locale separately
because this is often on a hot path, and we can avoid the splitting and
joining of strings like this.
Change-Id: Ia36047209368ca53431178c2e8723a18cfe8260a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/ooxresid.hxx | 4 | ||||
| -rw-r--r-- | oox/inc/strings.hrc | 4 | ||||
| -rw-r--r-- | oox/source/helper/ooxresid.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/oox/inc/ooxresid.hxx b/oox/inc/ooxresid.hxx index d8015dc120ac..473e13407ac3 100644 --- a/oox/inc/ooxresid.hxx +++ b/oox/inc/ooxresid.hxx @@ -11,9 +11,9 @@ #define INCLUDED_OOX_INC_RESID_HXX #include <rtl/ustring.hxx> -#include <string_view> +#include <unotools/resmgr.hxx> -OUString OoxResId(std::string_view aId); +OUString OoxResId(TranslateId aId); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/oox/inc/strings.hrc b/oox/inc/strings.hrc index 89a6d9a115a6..c9b4f3cf7230 100644 --- a/oox/inc/strings.hrc +++ b/oox/inc/strings.hrc @@ -10,9 +10,9 @@ #ifndef OOX_STRINGS_HRC #define OOX_STRINGS_HRC -#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) +#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) #define STR_DIAGRAM_TITLE NC_("STR_DIAGRAM_TITLE", "Chart Title") #define STR_DIAGRAM_AXISTITLE NC_("STR_DIAGRAM_AXISTITLE", "Axis Title") #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/oox/source/helper/ooxresid.cxx b/oox/source/helper/ooxresid.cxx index 6a509ccbca7b..58e0e8cb33e0 100644 --- a/oox/source/helper/ooxresid.cxx +++ b/oox/source/helper/ooxresid.cxx @@ -11,6 +11,6 @@ #include <ooxresid.hxx> #include <unotools/resmgr.hxx> -OUString OoxResId(std::string_view aId) { return Translate::get(aId, Translate::Create("oox")); } +OUString OoxResId(TranslateId aId) { return Translate::get(aId, Translate::Create("oox")); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |