Merge remote-tracking branch 'origin/master'

7 files changed, 72 insertions, 72 deletions

diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 1a2743375433..384cf3a45a67 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -373,7 +373,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
     uno::Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) );
     for( sal_Int32 nProperty = 0, nPropertyCount = aPageParms.getLength(); nProperty < nPropertyCount; ++nProperty )
     {
-        if( aPageParms[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) )
+        if ( aPageParms[ nProperty ].Name == "PageSize" )
         {
             awt::Size aSize;
             aPageParms[ nProperty].Value >>= aSize;
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index bb24eb6e7371..d44b19e41418 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -2936,53 +2936,53 @@ bool PrintFontManager::readOverrideMetrics()
         const NamedValue* pProps = aMetrics.getConstArray();
         for( sal_Int32 n = 0; n < nProps; n++ )
         {
-            if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FamilyName" ) ) )
+            if ( pProps[n].Name == "FamilyName" )
                 pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME,
                                                           getString(pProps[n].Value),
                                                           sal_True );
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PSName" ) ) )
+            else if ( pProps[n].Name == "PSName" )
                 pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME,
                                                       getString(pProps[n].Value),
                                                       sal_True );
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StyleName" ) ) )
+            else if ( pProps[n].Name == "StyleName" )
                 pFont->m_aStyleName = getString(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Italic" ) ) )
+            else if ( pProps[n].Name == "Italic" )
                 pFont->m_eItalic = static_cast<FontItalic>(getInt(pProps[n].Value));
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) )
+            else if ( pProps[n].Name == "Width" )
                 pFont->m_eWidth = static_cast<FontWidth>(getInt(pProps[n].Value));
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Weight" ) ) )
+            else if ( pProps[n].Name == "Weight" )
                 pFont->m_eWeight = static_cast<FontWeight>(getInt(pProps[n].Value));
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Pitch" ) ) )
+            else if ( pProps[n].Name == "Pitch" )
                 pFont->m_ePitch = static_cast<FontPitch>(getInt(pProps[n].Value));
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encoding" ) ) )
+            else if ( pProps[n].Name == "Encoding" )
                 pFont->m_aEncoding = static_cast<rtl_TextEncoding>(getInt(pProps[n].Value));
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FontEncodingOnly" ) ) )
+            else if ( pProps[n].Name == "FontEncodingOnly" )
                 pFont->m_bFontEncodingOnly = getBool(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GlobalMetricXWidth" ) ) )
+            else if ( pProps[n].Name == "GlobalMetricXWidth" )
                 pFont->m_aGlobalMetricX.width = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GlobalMetricXHeight" ) ) )
+            else if ( pProps[n].Name == "GlobalMetricXHeight" )
                 pFont->m_aGlobalMetricX.height = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GlobalMetricYWidth" ) ) )
+            else if ( pProps[n].Name == "GlobalMetricYWidth" )
                 pFont->m_aGlobalMetricY.width = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GlobalMetricYHeight" ) ) )
+            else if ( pProps[n].Name == "GlobalMetricYHeight" )
                 pFont->m_aGlobalMetricY.height = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Ascend" ) ) )
+            else if ( pProps[n].Name == "Ascend" )
                 pFont->m_nAscend = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Descend" ) ) )
+            else if ( pProps[n].Name == "Descend" )
                 pFont->m_nDescend = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Leading" ) ) )
+            else if ( pProps[n].Name == "Leading" )
                 pFont->m_nLeading = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "XMin" ) ) )
+            else if ( pProps[n].Name == "XMin" )
                 pFont->m_nXMin = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "YMin" ) ) )
+            else if ( pProps[n].Name == "YMin" )
                 pFont->m_nYMin = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "XMax" ) ) )
+            else if ( pProps[n].Name == "XMax" )
                 pFont->m_nXMax = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "YMax" ) ) )
+            else if ( pProps[n].Name == "YMax" )
                 pFont->m_nYMax = getInt(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VerticalSubstitutes" ) ) )
+            else if ( pProps[n].Name == "VerticalSubstitutes" )
                 pFont->m_bHaveVerticalSubstitutedGlyphs = getBool(pProps[n].Value);
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "EncodingVector" ) ) )
+            else if ( pProps[n].Name == "EncodingVector" )
             {
                 Sequence< NamedValue > aEncoding;
                 pProps[n].Value >>= aEncoding;
@@ -2995,7 +2995,7 @@ bool PrintFontManager::readOverrideMetrics()
                     pFont->m_aEncodingVector[ cCode ] = nGlyph;
                 }
             }
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NonEncoded" ) ) )
+            else if ( pProps[n].Name == "NonEncoded" )
             {
                 Sequence< NamedValue > aEncoding;
                 pProps[n].Value >>= aEncoding;
@@ -3008,7 +3008,7 @@ bool PrintFontManager::readOverrideMetrics()
                     pFont->m_aNonEncoded[ cCode ] = OUStringToOString(aGlyphName,RTL_TEXTENCODING_ASCII_US);
                 }
             }
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharacterMetrics" ) ) )
+            else if ( pProps[n].Name == "CharacterMetrics" )
             {
                 // fill pFont->m_pMetrics->m_aMetrics
                 // expect triples of int: int -> CharacterMetric.{ width, height }
@@ -3022,7 +3022,7 @@ bool PrintFontManager::readOverrideMetrics()
                     pFont->m_pMetrics->m_aMetrics[ pInts[m] ].height = static_cast<short int>(pInts[m+2]);
                 }
             }
-            else if( pProps[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "XKernPairs" ) ) )
+            else if ( pProps[n].Name == "XKernPairs" )
             {
                 // fill pFont->m_pMetrics->m_aXKernPairs
                 // expection name: <unicode1><unicode2> value: ((height << 16)| width)
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 3c2222d316ed..e2809d995d80 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -315,7 +315,7 @@ com::sun::star::uno::Any AccessBridgeCurrentContext::getValueByName( const rtl::
     throw (com::sun::star::uno::RuntimeException)
 {
     com::sun::star::uno::Any ret;
-    if( Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "java-vm.interaction-handler" ) ) )
+    if ( Name == "java-vm.interaction-handler" )
     {
         // Currently, for accessbility no interaction handler shall be offered.
         // There may be introduced later on a handler using native toolkits
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 017681a323b6..8194f527f509 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -791,21 +791,21 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
     sal_Int32 nPaperBin = mnDefaultPaperBin;
     for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty )
     {
-        if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredPageSize" ) ) )
+        if ( i_rProps[ nProperty ].Name == "PreferredPageSize" )
         {
             i_rProps[ nProperty ].Value >>= aSetSize;
         }
-        else if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) )
+        else if ( i_rProps[ nProperty ].Name == "PageSize" )
         {
             i_rProps[ nProperty ].Value >>= aIsSize;
         }
-        else if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageIncludesNonprintableArea" ) ) )
+        else if ( i_rProps[ nProperty ].Name == "PageIncludesNonprintableArea" )
         {
             sal_Bool bVal = sal_False;
             i_rProps[ nProperty ].Value >>= bVal;
             aPageSize.bFullPaper = static_cast<bool>(bVal);
         }
-        else if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrinterPaperTray" ) ) )
+        else if ( i_rProps[ nProperty ].Name == "PrinterPaperTray" )
         {
             sal_Int32 nBin = -1;
             i_rProps[ nProperty ].Value >>= nBin;
@@ -1372,7 +1372,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_
         for( int n = 0; n < aOptProp.getLength(); n++ )
         {
             const beans::PropertyValue& rEntry( aOptProp[ n ] );
-            if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Property" ) ) )
+            if ( rEntry.Name == "Property" )
             {
                 PropertyValue aVal;
                 rEntry.Value >>= aVal;
@@ -1382,17 +1382,17 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_
                 aPropName = aVal.Name;
                 bHaveProperty = true;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Enabled" ) ) )
+            else if ( rEntry.Name == "Enabled" )
             {
                 sal_Bool bValue = sal_True;
                 rEntry.Value >>= bValue;
                 bIsEnabled = bValue;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DependsOnName" ) ) )
+            else if ( rEntry.Name == "DependsOnName" )
             {
                 rEntry.Value >>= aDep.maDependsOnName;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DependsOnEntry" ) ) )
+            else if ( rEntry.Name == "DependsOnEntry" )
             {
                 rEntry.Value >>= aDep.mnDependsOnEntry;
             }
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index ee646e81a341..89bc71ca5163 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1095,58 +1095,58 @@ void PrintDialog::setupOptionalUI()
         for( int n = 0; n < aOptProp.getLength(); n++ )
         {
             const beans::PropertyValue& rEntry( aOptProp[ n ] );
-            if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Text" ) ) )
+            if ( rEntry.Name == "Text" )
             {
                 rEntry.Value >>= aText;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ControlType" ) ) )
+            else if ( rEntry.Name == "ControlType" )
             {
                 rEntry.Value >>= aCtrlType;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Choices" ) ) )
+            else if ( rEntry.Name == "Choices" )
             {
                 rEntry.Value >>= aChoices;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ChoicesDisabled" ) ) )
+            else if ( rEntry.Name == "ChoicesDisabled" )
             {
                 rEntry.Value >>= aChoicesDisabled;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Property" ) ) )
+            else if ( rEntry.Name == "Property" )
             {
                 PropertyValue aVal;
                 rEntry.Value >>= aVal;
                 aPropertyName = aVal.Name;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Enabled" ) ) )
+            else if ( rEntry.Name == "Enabled" )
             {
                 sal_Bool bValue = sal_True;
                 rEntry.Value >>= bValue;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GroupingHint" ) ) )
+            else if ( rEntry.Name == "GroupingHint" )
             {
                 rEntry.Value >>= aGroupingHint;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DependsOnName" ) ) )
+            else if ( rEntry.Name == "DependsOnName" )
             {
                 rEntry.Value >>= aDependsOnName;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DependsOnEntry" ) ) )
+            else if ( rEntry.Name == "DependsOnEntry" )
             {
                 rEntry.Value >>= nDependsOnValue;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AttachToDependency" ) ) )
+            else if ( rEntry.Name == "AttachToDependency" )
             {
                 rEntry.Value >>= bUseDependencyRow;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MinValue" ) ) )
+            else if ( rEntry.Name == "MinValue" )
             {
                 rEntry.Value >>= nMinValue;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MaxValue" ) ) )
+            else if ( rEntry.Name == "MaxValue" )
             {
                 rEntry.Value >>= nMaxValue;
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HelpText" ) ) )
+            else if ( rEntry.Name == "HelpText" )
             {
                 if( ! (rEntry.Value >>= aHelpTexts) )
                 {
@@ -1158,7 +1158,7 @@ void PrintDialog::setupOptionalUI()
                     }
                 }
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HelpId" ) ) )
+            else if ( rEntry.Name == "HelpId" )
             {
                 if( ! (rEntry.Value >>= aHelpIds ) )
                 {
@@ -1170,7 +1170,7 @@ void PrintDialog::setupOptionalUI()
                     }
                 }
             }
-            else if( rEntry.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HintNoLayoutPage" ) ) )
+            else if ( rEntry.Name == "HintNoLayoutPage" )
             {
                 sal_Bool bNoLayoutPage = sal_False;
                 rEntry.Value >>= bNoLayoutPage;
@@ -1198,25 +1198,25 @@ void PrintDialog::setupOptionalUI()
             bOnStaticPage = false;
             bSubgroupOnStaticPage = false;
 
-            if( aGroupingHint.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintRange" ) ) )
+            if ( aGroupingHint == "PrintRange" )
             {
                 pCurColumn = maJobPage.mxPrintRange;
                 pCurParent = &maJobPage;            // set job page as current parent
                 bOnStaticPage = true;
             }
-            else if( aGroupingHint.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OptionsPage" ) ) )
+            else if ( aGroupingHint == "OptionsPage" )
             {
                 pCurColumn = boost::dynamic_pointer_cast<vcl::RowOrColumn>(maOptionsPage.getLayout());
                 pCurParent = &maOptionsPage;        // set options page as current parent
                 bOnStaticPage = true;
             }
-            else if( aGroupingHint.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OptionsPageOptGroup" ) ) )
+            else if ( aGroupingHint == "OptionsPageOptGroup" )
             {
                 pCurColumn = maOptionsPage.mxOptGroup;
                 pCurParent = &maOptionsPage;        // set options page as current parent
                 bOnStaticPage = true;
             }
-            else if( aGroupingHint.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LayoutPage" ) ) )
+            else if ( aGroupingHint == "LayoutPage" )
             {
                 pCurColumn = boost::dynamic_pointer_cast<vcl::RowOrColumn>(maNUpPage.getLayout());
                 pCurParent = &maNUpPage;            // set layout page as current parent
@@ -1261,7 +1261,7 @@ void PrintDialog::setupOptionalUI()
                )
             {
                 Window* pNewSub = NULL;
-                if( aGroupingHint.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintRange" ) ) )
+                if ( aGroupingHint == "PrintRange" )
                     pNewSub = new FixedText( pCurParent, WB_VCENTER );
                 else
                     pNewSub = new FixedLine( pCurParent );
@@ -1447,7 +1447,7 @@ void PrintDialog::setupOptionalUI()
                     pLabel->setLabel( pHeading );
                 }
 
-                if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "List" ) ) )
+                if ( aCtrlType == "List" )
                 {
                     ListBox* pList = new ListBox( pCurParent, WB_DROPDOWN | WB_BORDER );
                     maControls.push_front( pList );
@@ -1480,7 +1480,7 @@ void PrintDialog::setupOptionalUI()
                     else
                         pFieldColumn->addWindow( pList );
                 }
-                else if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Range" ) ) )
+                else if ( aCtrlType == "Range" )
                 {
                     NumericField* pField = new NumericField( pCurParent, WB_BORDER | WB_SPIN );
                     maControls.push_front( pField );
@@ -1513,7 +1513,7 @@ void PrintDialog::setupOptionalUI()
                     else
                         pFieldColumn->addWindow( pField );
                 }
-                else if( aCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Edit" ) ) )
+                else if ( aCtrlType == "Edit" )
                 {
                     Edit* pField = new Edit( pCurParent, WB_BORDER );
                     maControls.push_front( pField );
@@ -2219,7 +2219,7 @@ void PrintDialog::updateWindowFromProperty( const rtl::OUString& i_rProperty )
                 {
                     pBox->Check( bVal );
                 }
-                else if( i_rProperty.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintProspect" ) ) )
+                else if ( i_rProperty == "PrintProspect" )
                 {
                     // EVIL special case
                     if( bVal )
diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx
index 8f7ee3d0c21c..ace8c44b405c 100644
--- a/vcl/unx/kde/UnxCommandThread.cxx
+++ b/vcl/unx/kde/UnxCommandThread.cxx
@@ -188,27 +188,27 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
     ::rtl::OUString aCommandName = aList.front();
     aList.pop_front();
 
-    if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "accept" ) ) )
+    if ( aCommandName == "accept" )
     {
         m_aResult = sal_True;
         m_aExecCondition.set();
     }
-    else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "reject" ) ) )
+    else if ( aCommandName == "reject" )
     {
         m_aResult = sal_False;
         m_aExecCondition.set();
     }
-    else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "fileSelectionChanged" ) ) )
+    else if ( aCommandName == "fileSelectionChanged" )
     {
         if ( m_pNotifyThread )
             m_pNotifyThread->fileSelectionChanged();
     }
-    else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "files" ) ) )
+    else if ( aCommandName == "files" )
     {
         m_aGetFiles = aList;
         m_aGetFilesCondition.set();
     }
-    else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "value" ) ) )
+    else if ( aCommandName == "value" )
     {
         ::rtl::OUString aType;
         if ( !aList.empty() )
@@ -217,14 +217,14 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
             aList.pop_front();
         }
 
-        if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bool" ) ) )
+        if ( aType == "bool" )
         {
             sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
 
             m_aGetValue <<= bValue;
             m_aGetValueCondition.set();
         }
-        else if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int" ) ) )
+        else if ( aType == "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.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "string" ) ) )
+        else if ( aType == "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.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stringList" ) ) )
+        else if ( aType == "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.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "currentFilter" ) ) )
+    else if ( aCommandName == "currentFilter" )
     {
         m_aGetCurrentFilter = aList.empty()? ::rtl::OUString(): aList.front();
         m_aGetCurrentFilterCondition.set();
     }
-    else if ( aCommandName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "currentDirectory" ) ) )
+    else if ( aCommandName == "currentDirectory" )
     {
         m_aGetDirectory = aList.empty()? ::rtl::OUString(): aList.front();
         m_aGetDirectoryCondition.set();
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 1a30913d1797..3c29047a1cec 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -341,7 +341,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
         aBuffer.appendAscii( " ", 1 );
         aBuffer.append( aAction );
 
-        if ( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "checkbox" ) ) )
+        if ( aType == "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.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "listbox" ) ) )
+        else if ( aType == "listbox" )
         {
             switch ( nControlAction )
             {