diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
| commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
| tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /chart2/source | |
| parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff) | |
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/inc/ChartController.hxx | 3 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartController_Properties.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index aa399f2164b3..cecef8f81f0d 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -40,6 +40,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <memory> +#include <string_view> namespace com::sun::star::accessibility { class XAccessible; } namespace com::sun::star::accessibility { class XAccessibleContext; } @@ -426,7 +427,7 @@ private: //executeDispatch methods void executeDispatch_ObjectProperties(); - void executeDispatch_FormatObject( const OUString& rDispatchCommand ); + void executeDispatch_FormatObject( std::u16string_view rDispatchCommand ); void executeDlg_ObjectProperties( const OUString& rObjectCID ); bool executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bSuccessOnUnchanged ); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 687625b89c51..666c9979830e 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -650,7 +650,7 @@ OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const un } // anonymous namespace -void ChartController::executeDispatch_FormatObject(const OUString& rDispatchCommand) +void ChartController::executeDispatch_FormatObject(std::u16string_view rDispatchCommand) { uno::Reference< XChartDocument > xChartDocument( getModel(), uno::UNO_QUERY ); OString aCommand( OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) ); |