diff options
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/classes/image.cxx | 3 | ||||
-rw-r--r-- | basic/source/inc/iosys.hxx | 6 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 4 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 3 | ||||
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 3 |
5 files changed, 12 insertions, 7 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 0fd760a1c21b..0641c1337569 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -28,6 +28,7 @@ #include <image.hxx> #include <codegen.hxx> #include <memory> +#include <string_view> SbiImage::SbiImage() : bError(false) @@ -459,7 +460,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) for( size_t i = 0; i < mvStringOffsets.size(); i++ ) { sal_uInt16 nOff = static_cast<sal_uInt16>(mvStringOffsets[ i ]); - OString aStr(OUStringToOString(OUString(pStrings.get() + nOff), eCharSet)); + OString aStr(OUStringToOString(std::u16string_view(pStrings.get() + nOff), eCharSet)); memcpy( pByteStrings.get() + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) ); } r.WriteUInt32( nStringSize ); diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 9f60c4f29c50..7fb75a2e113c 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -20,6 +20,8 @@ #pragma once #include <memory> +#include <string_view> + #include <tools/stream.hxx> #include <o3tl/typed_flags_set.hxx> @@ -58,7 +60,7 @@ class SbiStream public: SbiStream(); ~SbiStream(); - ErrCode const & Open( const OString&, StreamMode, SbiStreamFlags, short ); + ErrCode const & Open( std::string_view, StreamMode, SbiStreamFlags, short ); ErrCode const & Close(); ErrCode Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); ErrCode const & Read( char& ); @@ -96,7 +98,7 @@ public: void SetChannel( short n ) { nChan = n; } short GetChannel() const { return nChan;} void ResetChannel() { nChan = 0; } - void Open( short, const OString&, StreamMode, SbiStreamFlags, short ); + void Open( short, std::string_view, StreamMode, SbiStreamFlags, short ); void Close(); void Read(OString&); char Read(); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index d525d1a13801..6fc681f48492 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -421,7 +421,7 @@ void UCBStream::SetSize( sal_uInt64 ) ErrCode const & SbiStream::Open -( const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL ) +( std::string_view rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL ) { nMode = nFlags; nLen = nL; @@ -631,7 +631,7 @@ ErrCode SbiIoSystem::GetError() return n; } -void SbiIoSystem::Open(short nCh, const OString& rName, StreamMode nMode, SbiStreamFlags nFlags, short nLen) +void SbiIoSystem::Open(short nCh, std::string_view rName, StreamMode nMode, SbiStreamFlags nFlags, short nLen) { nError = ERRCODE_NONE; if( nCh >= CHANNELS || !nCh ) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 1fbcdd9680e2..84d51c760f1e 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -63,6 +63,7 @@ #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> #include <memory> #include <random> +#include <string_view> #include <o3tl/char16_t2wchar_t.hxx> using namespace comphelper; @@ -2575,7 +2576,7 @@ static OUString implSetupWildcard(const OUString& rFileParam, SbiRTLData& rRTLDa return aPathStr; } -static bool implCheckWildcard(const OUString& rName, SbiRTLData const& rRTLData) +static bool implCheckWildcard(std::u16string_view rName, SbiRTLData const& rRTLData) { bool bMatch = true; diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 90edef4cb7e7..19ddc1aa2a64 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include <math.h> +#include <string_view> #include <o3tl/float_int_conversion.hxx> #include <tools/debug.hxx> @@ -1499,7 +1500,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } else { - write_uInt16_lenPrefixed_uInt8s_FromOUString(r, OUString(), RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(r, std::u16string_view(), RTL_TEXTENCODING_ASCII_US); } break; case SbxERROR: |