summaryrefslogtreecommitdiff
path: root/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'fpicker/source/unx/kde_unx/UnxFilePicker.cxx')
-rw-r--r--fpicker/source/unx/kde_unx/UnxFilePicker.cxx40
1 files changed, 20 insertions, 20 deletions
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
index c38ffcedb7..c2756ee716 100644
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
@@ -79,9 +79,9 @@ namespace
uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
uno::Sequence<rtl::OUString> aRet(3);
- aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
- aRet[2] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.KDEFilePicker");
+ aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+ aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+ aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker"));
return aRet;
}
}
@@ -115,7 +115,7 @@ UnxFilePicker::~UnxFilePicker()
{
if ( m_nFilePickerPid > 0 )
{
- sendCommand( ::rtl::OUString::createFromAscii( "exit" ) );
+ sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exit" )) );
waitpid( m_nFilePickerPid, NULL, 0 );
}
@@ -184,7 +184,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute()
// this is _not_ an osl::Condition, see i#93366
m_pCommandThread->execCondition().reset();
- sendCommand( ::rtl::OUString::createFromAscii( "exec" ) );
+ sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exec" ) ));
m_pCommandThread->execCondition().wait();
@@ -198,8 +198,8 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
::osl::MutexGuard aGuard( m_aMutex );
::rtl::OUString aString = bMode?
- ::rtl::OUString::createFromAscii( "setMultiSelection true" ):
- ::rtl::OUString::createFromAscii( "setMultiSelection false" );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection true" )):
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection false" ));
sendCommand( aString );
}
@@ -238,7 +238,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
- sendCommand( ::rtl::OUString::createFromAscii( "getDirectory" ),
+ sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getDirectory" )),
m_pCommandThread->getDirectoryCondition() );
return m_pCommandThread->getDirectory();
@@ -250,7 +250,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles()
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
- sendCommand( ::rtl::OUString::createFromAscii( "getFiles" ),
+ sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getFiles" )),
m_pCommandThread->getFilesCondition() );
return m_pCommandThread->getFiles();
@@ -292,7 +292,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter()
checkFilePicker();
::osl::MutexGuard aGuard( m_aMutex );
- sendCommand( ::rtl::OUString::createFromAscii( "getCurrentFilter" ),
+ sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getCurrentFilter" )),
m_pCommandThread->getCurrentFilterCondition() );
return m_pCommandThread->getCurrentFilter();
@@ -341,7 +341,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
aBuffer.appendAscii( " ", 1 );
aBuffer.append( aAction );
- if ( aType.equalsAscii( "checkbox" ) )
+ if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "checkbox" ) ) )
{
sal_Bool bControlValue;
if ( ( rValue >>= bControlValue ) && bControlValue )
@@ -349,7 +349,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
else
aBuffer.appendAscii( " false" );
}
- else if ( aType.equalsAscii( "listbox" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "listbox" ) ) )
{
switch ( nControlAction )
{
@@ -545,21 +545,21 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
uno::Any aAny;
if ( 0 == rArguments.getLength( ) )
throw lang::IllegalArgumentException(
- rtl::OUString::createFromAscii( "no arguments" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
static_cast< XFilePicker* >( this ), 1 );
aAny = rArguments[0];
if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) )
throw lang::IllegalArgumentException(
- rtl::OUString::createFromAscii( "invalid argument type" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
static_cast< XFilePicker* >( this ), 1 );
sal_Int16 templateId = -1;
aAny >>= templateId;
- ::rtl::OUString aTypeOpen = ::rtl::OUString::createFromAscii( "setType \"open\"" );
- ::rtl::OUString aTypeSaveAs = ::rtl::OUString::createFromAscii( "setType \"save\"" );
+ ::rtl::OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" ));
+ ::rtl::OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" ));
switch ( templateId )
{
@@ -636,7 +636,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
default:
throw lang::IllegalArgumentException(
- rtl::OUString::createFromAscii( "Unknown template" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
static_cast< XFilePicker* >( this ),
1 );
}
@@ -664,7 +664,7 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
rtl::OUString SAL_CALL UnxFilePicker::getImplementationName()
throw( uno::RuntimeException )
{
- return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
}
sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceName )
@@ -779,7 +779,7 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep
else
{
throw uno::RuntimeException(
- ::rtl::OUString::createFromAscii( "the external file picker does not run" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "the external file picker does not run" )),
*this );
}
}
@@ -789,7 +789,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand )
if ( m_nFilePickerWrite < 0 )
return;
- ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString::createFromAscii( "\n" ), RTL_TEXTENCODING_UTF8 );
+ ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\n" )), RTL_TEXTENCODING_UTF8 );
#if OSL_DEBUG_LEVEL > 0
::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 11:06:36 +0000