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 /extensions/source/bibliography | |
| 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 'extensions/source/bibliography')
| -rw-r--r-- | extensions/source/bibliography/general.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/bibliography/general.hxx | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index deaaafa4d9dc..1d2f66517a10 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -423,7 +423,7 @@ void BibGeneralPage::CommitActiveControl() } void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText &rLabel, - OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*> &rChildren) + OUString& rErrorString, std::string_view sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*> &rChildren) { const OUString aColumnUIName(rLabel.GetText()); // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT @@ -448,7 +448,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText bool BibGeneralPage::AddXControl( const OUString& rName, - FixedText& rLabel, const OString& sHelpId, sal_Int16& rIndex, + FixedText& rLabel, std::string_view sHelpId, sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren) { uno::Reference< awt::XControlModel > xCtrModel; diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 8a5ac2127c16..107f40fe2bc6 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_GENERAL_HXX #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_GENERAL_HXX +#include <sal/config.h> + +#include <string_view> + #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/form/XBoundComponent.hpp> @@ -124,12 +128,12 @@ class BibGeneralPage : public TabPage BibDataManager* pDatMan; bool - AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId, + AddXControl( const OUString& rName, FixedText& rLabel, std::string_view sHelpId, sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren ); void AddControlWithError( const OUString& rColumnName, FixedText& rLabel, OUString& rErrorString, - const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren ); + std::string_view sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren ); protected: void InitFixedTexts(); // create mnemonics and set text an all fixed texts |