summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-20 11:23:45 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-01-20 11:23:45 +0100
commit88fa511a7748ff920546bd28ac9e15f5e0ba2fb0 (patch)
tree4555e53c8209dbeb038221ab142cbb9c445b1330 /fpicker
parentd1041919f51c597b5c098ca716f141e494c22c49 (diff)
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx6
-rw-r--r--fpicker/source/office/commonpicker.cxx2
-rw-r--r--fpicker/source/office/iodlg.cxx2
-rw-r--r--fpicker/source/unx/kde_unx/UnxCommandThread.cxx22
-rw-r--r--fpicker/source/unx/kde_unx/UnxFilePicker.cxx4
5 files changed, 18 insertions, 18 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 20b542825c8b..47d774bc4d78 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1107,19 +1107,19 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
//-------------------------------------------------------------------------
sal_Bool SvtFilePicker::implHandleInitializationArgument( const ::rtl::OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
{
- if ( _rName.equalsAscii( "TemplateDescription" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TemplateDescription" ) ) )
{
m_nServiceType = TemplateDescription::FILEOPEN_SIMPLE;
OSL_VERIFY( _rValue >>= m_nServiceType );
return sal_True;
}
- if ( _rName.equalsAscii( "StandardDir" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StandardDir" ) ) )
{
OSL_VERIFY( _rValue >>= m_aStandardDir );
return sal_True;
}
- if ( _rName.equalsAscii( "BlackList" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BlackList" ) ) )
{
OSL_VERIFY( _rValue >>= m_aBlackList );
return sal_True;
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 59181a3db9e6..e87f0d5c4857 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -490,7 +490,7 @@ namespace svt
sal_Bool OCommonPicker::implHandleInitializationArgument( const ::rtl::OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
{
sal_Bool bKnown = sal_True;
- if ( _rName.equalsAscii( "ParentWindow" ) )
+ if ( _rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ParentWindow" ) ) )
{
m_xDialogParent.clear();
OSL_VERIFY( _rValue >>= m_xDialogParent );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index f7d48f81b72a..44077baedf9b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2062,7 +2062,7 @@ short SvtFileDialog::PrepareExecute()
{
rtl::OUString aEnvValue;
if ( getEnvironmentValue( "WorkDirMustContainRemovableMedia", aEnvValue ) &&
- aEnvValue.equalsAscii( "1" ) )
+ aEnvValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "1" ) ) )
{
try
{
diff --git a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
index cc19ae3f62a5..3b113346eb40 100644
--- a/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
+++ b/fpicker/source/unx/kde_unx/UnxCommandThread.cxx
@@ -188,27 +188,27 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
::rtl::OUString aCommandName = aList.front();
aList.pop_front();
- if ( aCommandName.equalsAscii( "accept" ) )
+ if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "accept" ) ) )
{
m_aResult = sal_True;
m_aExecCondition.set();
}
- else if ( aCommandName.equalsAscii( "reject" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "reject" ) ) )
{
m_aResult = sal_False;
m_aExecCondition.set();
}
- else if ( aCommandName.equalsAscii( "fileSelectionChanged" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "fileSelectionChanged" ) ) )
{
if ( m_pNotifyThread )
m_pNotifyThread->fileSelectionChanged();
}
- else if ( aCommandName.equalsAscii( "files" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "files" ) ) )
{
m_aGetFiles = aList;
m_aGetFilesCondition.set();
}
- else if ( aCommandName.equalsAscii( "value" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "value" ) ) )
{
::rtl::OUString aType;
if ( !aList.empty() )
@@ -217,14 +217,14 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
aList.pop_front();
}
- if ( aType.equalsAscii( "bool" ) )
+ if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bool" ) ) )
{
sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCaseAscii( "true" );
m_aGetValue <<= bValue;
m_aGetValueCondition.set();
}
- else if ( aType.equalsAscii( "int" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int" ) ) )
{
sal_Int32 nValue = 0;
if ( !aList.empty() )
@@ -233,7 +233,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
m_aGetValue <<= nValue;
m_aGetValueCondition.set();
}
- else if ( aType.equalsAscii( "string" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "string" ) ) )
{
::rtl::OUString aValue;
if ( !aList.empty() )
@@ -242,7 +242,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
m_aGetValue <<= aValue;
m_aGetValueCondition.set();
}
- else if ( aType.equalsAscii( "stringList" ) )
+ else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stringList" ) ) )
{
uno::Sequence< ::rtl::OUString > aSequence( aList.size() );
sal_Int32 nIdx = 0;
@@ -258,12 +258,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
m_aGetValueCondition.set();
}
}
- else if ( aCommandName.equalsAscii( "currentFilter" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "currentFilter" ) ) )
{
m_aGetCurrentFilter = aList.empty()? ::rtl::OUString(): aList.front();
m_aGetCurrentFilterCondition.set();
}
- else if ( aCommandName.equalsAscii( "currentDirectory" ) )
+ else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "currentDirectory" ) ) )
{
m_aGetDirectory = aList.empty()? ::rtl::OUString(): aList.front();
m_aGetDirectoryCondition.set();
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
index e280d837fc3c..8c7cd91a9ec0 100644
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
@@ -339,7 +339,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 )
@@ -347,7 +347,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 )
{