mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extended loplugin:ostr: extensions

Browse Source 
Change-Id: I0c70fc1d42031a5a6ebd900cd20b1e7e40d9352d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159703
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2023-11-19 21:20:00 +01:00
parent b5da85150d
commit f94987039b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/source/scanner/sanedlg.cxx
View File

@@ -1283,8 +1283,8 @@ bool SaneDlg::LoadState()
if( ! aConfig.HasGroup( "SANE" ) ) if( ! aConfig.HasGroup( "SANE" ) )
return false; return false;
aConfig.SetGroup( "SANE" ); aConfig.SetGroup( "SANE"_ostr );
OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); OString aString = aConfig.ReadKey( "SO_LastSaneDevice"_ostr );
for( i = 0; i < Sane::CountDevices() && aString != OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding()); i++ ) ; for( i = 0; i < Sane::CountDevices() && aString != OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding()); i++ ) ;
if( i == Sane::CountDevices() ) if( i == Sane::CountDevices() )
return false; return false;
@@ -1356,8 +1356,8 @@ void SaneDlg::SaveState()
Config aConfig( aFileName ); Config aConfig( aFileName );
aConfig.DeleteGroup( "SANE" ); aConfig.DeleteGroup( "SANE" );
aConfig.SetGroup( "SANE" ); aConfig.SetGroup( "SANE"_ostr );
aConfig.WriteKey( "SO_LastSANEDevice", aConfig.WriteKey( "SO_LastSANEDevice"_ostr,
OUStringToOString(mxDeviceBox->get_active_text(), RTL_TEXTENCODING_UTF8) ); OUStringToOString(mxDeviceBox->get_active_text(), RTL_TEXTENCODING_UTF8) );
static char const* pSaveOptions[] = { static char const* pSaveOptions[] = {

2
extensions/source/update/check/download.cxx
View File

@@ -293,7 +293,7 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro
// Only report errors when not stopped // Only report errors when not stopped
else else
{ {
OString aMessage("Unknown error"); OString aMessage("Unknown error"_ostr);
const char * error_message = curl_easy_strerror(cc); const char * error_message = curl_easy_strerror(cc);
if( nullptr != error_message ) if( nullptr != error_message )

2
extensions/source/update/check/updatecheck.cxx
View File

@@ -1407,7 +1407,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL)
rc = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); rc = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
if ( rc != osl::FileBase::E_None ) return false; if ( rc != osl::FileBase::E_None ) return false;
OString aLineBuf("[InternetShortcut]\r\n"); OString aLineBuf("[InternetShortcut]\r\n"_ostr);
sal_uInt64 nWritten = 0; sal_uInt64 nWritten = 0;
OUString aURL( rURL ); OUString aURL( rURL );