diff options
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/lockfile2.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index b00cff042b7e..863d246951e9 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -267,7 +267,7 @@ void batchPrint( std::u16string_view rPrinterName, const Reference< XPrintable > OString aTargetURL8 = OUStringToOString(aTempName, osl_getThreadTextEncoding() ); std::cout << "print " << aSource8 << " -> " << aTargetURL8; - std::cout << " using " << (aPrinterName.isEmpty() ? "<default_printer>" : OUStringToOString( aPrinterName, osl_getThreadTextEncoding() )); + std::cout << " using " << (aPrinterName.isEmpty() ? "<default_printer>"_ostr : OUStringToOString( aPrinterName, osl_getThreadTextEncoding() )); std::cout << std::endl; // create the custom printer, if given diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index 44447927f63b..98c2903f9403 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -31,10 +31,10 @@ bool Lockfile_execWarning( Lockfile const * that ) // read information from lock OUString aLockname = that->m_aLockname; Config aConfig(aLockname); - aConfig.SetGroup( LOCKFILE_GROUP ); - OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); - OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); - OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); + aConfig.SetGroup( LOCKFILE_GROUP ""_ostr ); + OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ""_ostr ); + OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ""_ostr ); + OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ""_ostr ); // display warning and return response std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(nullptr, diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 9b77da1a9037..9d342bf35a84 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -76,7 +76,7 @@ OString readStringFromPipe(osl::StreamPipe const & pipe) { sal_Int32 n = pipe.recv(buf, std::size(buf)); if (n <= 0) { SAL_INFO("desktop.app", "read empty string"); - return ""; + return ""_ostr; } bool end = false; if (buf[n - 1] == '\0') { |