summaryrefslogtreecommitdiff
path: root/idl/inc/database.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-11 17:44:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-11 21:25:10 +0100
commit35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch)
treebb78f4f13f131f0cb206a9707cc3cfc495a3876a /idl/inc/database.hxx
parent0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (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 'idl/inc/database.hxx')
-rw-r--r--idl/inc/database.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 3e7706b25b1e..44ef25eafbcf 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -27,6 +27,7 @@
#include <rtl/ustring.hxx>
#include <set>
+#include <string_view>
#include <exception>
class SvCommand;
@@ -112,7 +113,7 @@ public:
sal_uInt32 GetUniqueId() { return ++nUniqueId; }
bool FindId( const OString& rIdName, sal_uLong * pVal );
void InsertId( const OString& rIdName, sal_uLong nVal );
- bool ReadIdFile( const OString& rFileName );
+ bool ReadIdFile( std::string_view rFileName );
SvMetaType * FindType( const OString& rName );
static SvMetaType * FindType( const SvMetaType *, SvRefMemberList<SvMetaType *>& );
@@ -124,7 +125,7 @@ public:
SvMetaClass * ReadKnownClass( SvTokenStream & rInStm );
SvMetaClass * FindKnownClass( const OString& aName );
void AddDepFile(OUString const& rFileName);
- void WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
+ void WriteDepFile(SvFileStream & rStream, std::u16string_view rTarget);
};
class SvIdlWorkingBase : public SvIdlDataBase