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 /forms/source/runtime | |
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 'forms/source/runtime')
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 4 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 4aa12bc91233..fa8e092ab5cb 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -775,7 +775,7 @@ namespace frm default: { - const char* pErrorResourceId = RID_STR_FEATURE_UNKNOWN; + TranslateId pErrorResourceId = RID_STR_FEATURE_UNKNOWN; if ( lcl_requiresArguments( _nFeature ) ) pErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS; else if ( !lcl_isExecutableFeature( _nFeature ) ) @@ -1733,7 +1733,7 @@ namespace frm template < typename FunctObj > - void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const + void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, TranslateId pErrorResourceId ) const { try { diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index bd092edd2a48..182b0a7e0958 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -35,6 +35,7 @@ #include <cppuhelper/compbase.hxx> #include <connectivity/dbtools.hxx> #include <tools/long.hxx> +#include <unotools/resmgr.hxx> namespace frm { @@ -293,7 +294,7 @@ namespace frm the id of the resources string to use as error message */ template < typename FunctObj > - void impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const; + void impl_doActionInSQLContext_throw( FunctObj f, TranslateId pErrorResourceId ) const; // functionoid to call appendOrderByColumn class impl_appendOrderByColumn_throw |