diff options
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/database.hxx | 5 | ||||
| -rw-r--r-- | idl/source/prj/command.cxx | 2 | ||||
| -rw-r--r-- | idl/source/prj/database.cxx | 10 |
3 files changed, 10 insertions, 7 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 diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 29b01d11219a..b665d792d8bb 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -154,7 +154,7 @@ static bool ResponseFile( std::vector<OUString> * pList, int argc, char ** argv static_cast<unsigned char>(aStr[n]) ) ) n++; if( n != nPos ) - pList->push_back( OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ); + pList->push_back( OStringToOUString(aStr.subView(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ); } } } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 37bf552c76e2..de8aad3d9b74 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -22,6 +22,8 @@ #include <algorithm> #include <stdio.h> #include <stdlib.h> +#include <string_view> + #include <database.hxx> #include <globals.hxx> #include <rtl/strbuf.hxx> @@ -129,7 +131,7 @@ void SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal ) pIdTable->Insert( rIdName, &nHash )->SetValue( nVal ); } -bool SvIdlDataBase::ReadIdFile( const OString& rOFileName ) +bool SvIdlDataBase::ReadIdFile( std::string_view rOFileName ) { OUString rFileName = OStringToOUString(rOFileName, RTL_TEXTENCODING_ASCII_US); OUString aFullName; @@ -506,7 +508,7 @@ struct WriteDep { SvFileStream & m_rStream; explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { } - void operator() (OUString const& rItem) + void operator() (std::u16string_view rItem) { m_rStream.WriteCharPtr( " \\\n " ); m_rStream.WriteOString( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8) ); @@ -519,7 +521,7 @@ struct WriteDummy { SvFileStream & m_rStream; explicit WriteDummy(SvFileStream & rStream) : m_rStream(rStream) { } - void operator() (OUString const& rItem) + void operator() (std::u16string_view rItem) { m_rStream.WriteOString( OUStringToOString(rItem, RTL_TEXTENCODING_UTF8) ); m_rStream.WriteCharPtr( " :\n\n" ); @@ -529,7 +531,7 @@ struct WriteDummy } void SvIdlDataBase::WriteDepFile( - SvFileStream & rStream, OUString const& rTarget) + SvFileStream & rStream, std::u16string_view rTarget) { rStream.WriteOString( OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8) ); rStream.WriteCharPtr( " :" ); |