summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/source/app/svmain.cxx2
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/gdi/print3.cxx2
-rw-r--r--vcl/source/window/arrange.cxx6
-rw-r--r--vcl/source/window/window4.cxx6
-rw-r--r--vcl/unx/generic/app/saldata.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx36
8 files changed, 29 insertions, 29 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index d44b19e41418..06bfb7b1dad5 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1431,7 +1431,7 @@ namespace
bool isBadTNR(const OUString &rName, ::std::set< OUString >& rSet)
{
bool bRet = false;
- if (rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Berling Antiqua")))
+ if ( rName == "Berling Antiqua" )
{
::std::set< OUString >::iterator aEnd = rSet.end();
::std::set< OUString >::iterator aI = rSet.find(OUString(RTL_CONSTASCII_USTRINGPARAM("Times New Roman")));
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 2624e6c32b44..3147b9a85910 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -249,7 +249,7 @@ uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const rtl::OUString
{
uno::Any retVal;
- if (Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("system.desktop-environment")))
+ if ( Name == "system.desktop-environment" )
{
retVal = uno::makeAny( Application::GetDesktopEnvironment() );
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index aaa72bbe88ea..128d7db6b878 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -3080,7 +3080,7 @@ void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragE
{
sal_Int32 nIndex = 0;
rtl::OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex );
- if( aMimetype.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text/plain")) )
+ if ( aMimetype == "text/plain" )
{
mpDDInfo->bIsStringSupported = sal_True;
break;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 8194f527f509..1a4b9405c390 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1396,7 +1396,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_
{
rEntry.Value >>= aDep.mnDependsOnEntry;
}
- else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChoicesDisabled")) )
+ else if ( rEntry.Name == "ChoicesDisabled" )
{
rEntry.Value >>= aChoicesDisabled;
}
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index 5ff1ac48a738..e24706fb459d 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -237,7 +237,7 @@ void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >&
bool bResize = false;
for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ )
{
- if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OuterBorder")) )
+ if ( pProps[i].Name == "OuterBorder" )
{
sal_Int32 nVal = 0;
if( pProps[i].Value >>= nVal )
@@ -249,7 +249,7 @@ void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >&
}
}
}
- else if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ManagedArea")) )
+ else if ( pProps[i].Name == "ManagedArea" )
{
awt::Rectangle aArea( 0, 0, 0, 0 );
if( pProps[i].Value >>= aArea )
@@ -261,7 +261,7 @@ void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >&
bResize = true;
}
}
- else if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Visible")) )
+ else if ( pProps[i].Name == "Visible" )
{
sal_Bool bVal = sal_False;
if( pProps[i].Value >>= bVal )
diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx
index 238c032cd4be..f0d8f47b2515 100644
--- a/vcl/source/window/window4.cxx
+++ b/vcl/source/window/window4.cxx
@@ -161,19 +161,19 @@ void Window::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProp
const beans::PropertyValue* pVals = i_rProps.getConstArray();
for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ )
{
- if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enabled")) )
+ if ( pVals[i].Name == "Enabled" )
{
sal_Bool bVal = sal_True;
if( pVals[i].Value >>= bVal )
Enable( bVal );
}
- else if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Visible")) )
+ else if ( pVals[i].Name == "Visible" )
{
sal_Bool bVal = sal_True;
if( pVals[i].Value >>= bVal )
Show( bVal );
}
- else if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Text")) )
+ else if ( pVals[i].Name == "Text" )
{
rtl::OUString aText;
if( pVals[i].Value >>= aText )
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index d1424762b946..c0fcf8768d4d 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -428,7 +428,7 @@ void SalXLib::Init()
for (sal_uInt16 i=0; i<nParams; i++)
{
osl_getCommandArg(i, &aParam.pData);
- if (aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("-display")))
+ if ( aParam == "-display" )
{
osl_getCommandArg(i+1, &aParam.pData);
aDisplay = rtl::OUStringToOString(
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 4ea5f7b10a82..2f4c9f639c9e 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -502,35 +502,35 @@ GtkPrintDialog::impl_initCustomTab()
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" )
{
rtl::OUString aValue;
rEntry.Value >>= aValue;
aText = aValue.replace('~', '_');
}
- 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" )
{
beans::PropertyValue aVal;
rEntry.Value >>= aVal;
aPropertyName = aVal.Name;
}
- 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("HelpId")))
+ else if ( rEntry.Name == "HelpId" )
{
uno::Sequence<rtl::OUString> aHelpIds;
lcl_extractHelpTextsOrIds(rEntry, aHelpIds);
@@ -545,16 +545,16 @@ GtkPrintDialog::impl_initCustomTab()
else // fallback
aHelpTexts = aHelpIds;
}
- else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HelpText")))
+ else if ( rEntry.Name == "HelpText" )
lcl_extractHelpTextsOrIds(rEntry, aHelpTexts);
- else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InternalUIOnly")))
+ else if ( rEntry.Name == "InternalUIOnly" )
rEntry.Value >>= bIgnore;
- else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enabled")))
+ else if ( rEntry.Name == "Enabled" )
{
// Ignore this. We use UIControlOptions::isUIOptionEnabled
// to check whether a control should be enabled.
}
- else if (rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GroupingHint")))
+ else if ( rEntry.Name == "GroupingHint" )
{
// Ignore this. We cannot add/modify controls to/on existing
// tabs of the Gtk print dialog.
@@ -565,7 +565,7 @@ GtkPrintDialog::impl_initCustomTab()
}
}
- if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")))
+ if ( aPropertyName == "PrintContent" )
bGtkInternal = true;
if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Group")) || !pCurParent)
@@ -591,7 +591,7 @@ GtkPrintDialog::impl_initCustomTab()
// special case: we need to map these to controls of the gtk print dialog
else if (bGtkInternal)
{
- if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")))
+ if ( aPropertyName == "PrintContent" )
{
// What to print? And, more importantly, is there a selection?
impl_initPrintContent(aChoicesDisabled);
@@ -672,7 +672,7 @@ GtkPrintDialog::impl_initCustomTab()
GtkWidget* const pHbox = gtk_hbox_new(FALSE, 12);
gtk_container_set_border_width(GTK_CONTAINER(pHbox), 0);
- if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("List")))
+ if ( aCtrlType == "List" )
{
pWidget = lcl_combo_box_text_new();