basic/source/inc/iosys.hxx | 8 ++++---- basic/source/runtime/iosys.cxx | 10 ++++------ basic/source/runtime/runtime.cxx | 5 ++--- 3 files changed, 10 insertions(+), 13 deletions(-)
New commits: commit bb57fa601a30151f897399725bd3b36a1a5fbd0f Author: Mike Kaganski <[email protected]> AuthorDate: Sat Mar 29 14:46:42 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Mar 29 17:03:00 2025 +0100 Avoid useless OUString -> OString -> OUString conversion Change-Id: I938d13d91bc83b9fd0c018e676923c27a7cad637 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183484 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index ca5c6b275bcc..b562b13c2154 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -60,7 +60,7 @@ class SbiStream public: SbiStream(); ~SbiStream(); - ErrCode const & Open( std::string_view, StreamMode, SbiStreamFlags, short ); + ErrCode const & Open( const OUString&, StreamMode, SbiStreamFlags, short ); ErrCode const & Close(); ErrCode Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false); ErrCode const & Read( char& ); @@ -82,7 +82,7 @@ public: class SbiIoSystem { SbiStream* pChan[ CHANNELS ]; - OString aPrompt; + OUString aPrompt; OString aIn; OUString aOut; short nChan; @@ -94,11 +94,11 @@ public: ~SbiIoSystem() COVERITY_NOEXCEPT_FALSE; ErrCode GetError(); void Shutdown(); - void SetPrompt(const OString& r) { aPrompt = r; } + void SetPrompt(const OUString& r) { aPrompt = r; } void SetChannel( short n ) { nChan = n; } short GetChannel() const { return nChan;} void ResetChannel() { nChan = 0; } - void Open( short, std::string_view, StreamMode, SbiStreamFlags, short ); + void Open( short, const OUString&, 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 250149f807c9..a30f8e763aff 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -415,7 +415,7 @@ void UCBStream::SetSize( sal_uInt64 ) ErrCode const & SbiStream::Open -( std::string_view rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL ) +( const OUString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL ) { nMode = nFlags; nLen = nL; @@ -425,8 +425,7 @@ ErrCode const & SbiStream::Open { nStrmMode |= StreamMode::NOCREATE; } - OUString aStr(OStringToOUString(rName, osl_getThreadTextEncoding())); - OUString aNameStr = getFullPath( aStr ); + OUString aNameStr = getFullPath(rName); if( hasUno() ) { @@ -625,7 +624,7 @@ ErrCode SbiIoSystem::GetError() return n; } -void SbiIoSystem::Open(short nCh, std::string_view rName, StreamMode nMode, SbiStreamFlags nFlags, short nLen) +void SbiIoSystem::Open(short nCh, const OUString& rName, StreamMode nMode, SbiStreamFlags nFlags, short nLen) { nError = ERRCODE_NONE; if( nCh >= CHANNELS || !nCh ) @@ -784,8 +783,7 @@ void SbiIoSystem::CloseAll() void SbiIoSystem::ReadCon(OString& rIn) { - OUString aPromptStr(OStringToOUString(aPrompt, osl_getThreadTextEncoding())); - SbiInputDialog aDlg(nullptr, aPromptStr); + SbiInputDialog aDlg(nullptr, aPrompt); if (aDlg.run() == RET_OK) { rIn = OUStringToOString(aDlg.GetInput(), osl_getThreadTextEncoding()); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 3a715a9278db..0b66d81fde8e 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -2773,8 +2773,7 @@ void SbiRuntime::StepRENAME() // Rename Tos+1 to Tos void SbiRuntime::StepPROMPT() { SbxVariableRef p = PopVar(); - OString aStr(OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding())); - pIosys->SetPrompt( aStr ); + pIosys->SetPrompt(p->GetOUString()); } // Set Restart point @@ -4441,7 +4440,7 @@ void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 ) SbxVariableRef pLen = PopVar(); short nBlkLen = pLen->GetInteger(); short nChan = pChan->GetInteger(); - OString aName(OUStringToOString(pName->GetOUString(), osl_getThreadTextEncoding())); + OUString aName = pName->GetOUString(); pIosys->Open( nChan, aName, static_cast<StreamMode>( nOp1 ), static_cast<SbiStreamFlags>( nOp2 ), nBlkLen ); Error( pIosys->GetError() );
