[Libreoffice-commits] .: connectivity/source cui/source filter/source framework/source reportdesign/source sc/source sfx2/source svtools/source sw/source vcl/aqua vcl/source
Takeshi Abe
tabe at kemper.freedesktop.org
Fri Feb 10 06:01:20 PST 2012
connectivity/source/drivers/postgresql/pq_connection.cxx | 8 -
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 4
cui/source/dialogs/SpellDialog.cxx | 2
filter/source/pdf/pdffilter.cxx | 2
filter/source/svg/svgexport.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 6
reportdesign/source/ui/report/ReportController.cxx | 14 +-
sc/source/core/data/documen5.cxx | 8 -
sfx2/source/view/viewprn.cxx | 2
svtools/source/filter/SvFilterOptionsDialog.cxx | 2
svtools/source/uno/unogridcolumnfacade.cxx | 16 +-
sw/source/ui/lingu/olmenu.cxx | 2
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 68 +++++-----
vcl/source/control/edit.cxx | 2
vcl/source/gdi/print3.cxx | 2
vcl/source/window/arrange.cxx | 6
vcl/source/window/window4.cxx | 6
17 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit 2b1758a2dc82200468905f7865468972a691b6a3
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Feb 10 23:00:44 2012 +0900
Prefer equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) to equalsAscii(...)
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 63236b8..4d8601c 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -181,13 +181,13 @@ static sal_Int32 readLogLevelFromConfiguration()
OUString str;
if( bootstrapHandle.getFrom( ASCII_STR( "PQ_LOGLEVEL" ), str ) )
{
- if( str.equalsAscii( "NONE" ) )
+ if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NONE")) )
loglevel = LogLevel::NONE;
- else if( str.equalsAscii( "ERROR" ) )
+ else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ERROR")) )
loglevel = LogLevel::ERROR;
- else if( str.equalsAscii( "SQL" ) )
+ else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SQL")) )
loglevel = LogLevel::SQL;
- else if( str.equalsAscii( "INFO" ) )
+ else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("INFO")) )
loglevel = LogLevel::SQL;
else
{
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index b596eb4..4cb7952 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1475,7 +1475,7 @@ static void columnMetaData2DatabaseTypeDescription(
queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "SELECT oid,typtype,typname FROM pg_TYPE WHERE " ) );
while( rs->next() )
{
- if( row->getString( 9 ).equalsAscii( "d" ) && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
+ if( row->getString( 9 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) && oidMap.find( row->getInt( 12 ) ) == oidMap.end() )
{
oidMap[row->getInt(12)] = DatabaseTypeDescription();
if( domains )
@@ -1646,7 +1646,7 @@ static void columnMetaData2DatabaseTypeDescription(
row[1] <<= sNewSchema;
row[2] <<= sNewTable;
row[3] <<= xRow->getString(3);
- if( xRow->getString(8).equalsAscii( "d" ) )
+ if( xRow->getString(8).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("d")) )
{
DatabaseTypeDescription desc( domainMap[xRow->getInt(11)] );
type = typeNameToDataType( desc.typeName, desc.typeType );
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a336a4b..483058e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1234,7 +1234,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
sal_Int32 i = 0;
while ( sFullCommentURL.isEmpty() && i < aProperties.getLength() )
{
- if ( aProperties[i].Name.equalsAscii( "FullCommentURL" ) )
+ if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullCommentURL")) )
{
uno::Any aValue = aProperties[i].Value;
aValue >>= sFullCommentURL;
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 7ee1655..51c001f 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -69,7 +69,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
pValue[ i ].Value >>= aFilterData;
else if ( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
pValue[ i ].Value >>= xStatusIndicator;
- else if( pValue[i].Name.equalsAscii( "InteractionHandler" ) )
+ else if( pValue[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InteractionHandler")) )
pValue[i].Value >>= xIH;
}
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 24aa950..df104a4 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -471,7 +471,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
if( pOStm )
xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) );
}
- else if( pValue[ i ].Name.equalsAscii( "FilterData" ) )
+ else if( pValue[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
{
pValue[ i ].Value >>= maFilterData;
}
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 9d5771d..8b8d86f 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -782,7 +782,7 @@ bool ToolbarLayoutManager::dockAllToolbars()
UIElementVector::iterator pIter;
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
{
- if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() &&
+ if ( pIter->m_aType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("toolbar")) && pIter->m_xUIElement.is() &&
pIter->m_bFloating && pIter->m_bVisible )
aToolBarNameVector.push_back( pIter->m_aName );
}
@@ -1191,9 +1191,9 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno
::rtl::OUString aTbxTitle;
for ( sal_Int32 j = 0; j < rTbxSeq.getLength(); j++ )
{
- if ( rTbxSeq[j].Name.equalsAscii( "ResourceURL" ))
+ if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ResourceURL")))
rTbxSeq[j].Value >>= aTbxResName;
- else if ( rTbxSeq[j].Name.equalsAscii( "UIName" ))
+ else if ( rTbxSeq[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UIName")))
rTbxSeq[j].Value >>= aTbxTitle;
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index ded47ec..bde3c7f 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2818,19 +2818,19 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw(
}
else
{
- if ( commandName->equalsAscii( "ShowRuler" ) )
+ if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ShowRuler")) )
OSL_VERIFY( rCommandValue >>= m_bShowRuler );
- else if ( commandName->equalsAscii( "HelplinesMove" ) )
+ else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HelplinesMove")) )
OSL_VERIFY( rCommandValue >>= m_bHelplinesMove );
- else if ( commandName->equalsAscii( "GridVisible" ) )
+ else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GridVisible")) )
OSL_VERIFY( rCommandValue >>= m_bGridVisible );
- else if ( commandName->equalsAscii( "GridUse" ) )
+ else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GridUse")) )
OSL_VERIFY( rCommandValue >>= m_bGridUse );
- else if ( commandName->equalsAscii( "ControlProperties" ) )
+ else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ControlProperties")) )
OSL_VERIFY( rCommandValue >>= m_bShowProperties );
- else if ( commandName->equalsAscii( "LastPropertyBrowserPage" ) )
+ else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LastPropertyBrowserPage")) )
OSL_VERIFY( rCommandValue >>= m_sLastActivePage );
- else if ( commandName->equalsAscii( "SplitPosition" ) )
+ else if ( commandName->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SplitPosition")) )
OSL_VERIFY( rCommandValue >>= m_nSplitPos );
}
}
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 4d4e3ca..bfb379f 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -86,13 +86,13 @@ void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xCh
const beans::PropertyValue& rProp = pPropArray[i];
rtl::OUString aPropName(rProp.Name);
- if (aPropName.equalsAscii( "CellRangeRepresentation" ))
+ if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
rProp.Value >>= rRanges;
- else if (aPropName.equalsAscii( "DataRowSource" ))
+ else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataRowSource")))
rDataRowSource = (chart::ChartDataRowSource)ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
- else if (aPropName.equalsAscii( "HasCategories" ))
+ else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")))
rHasCategories = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
- else if (aPropName.equalsAscii( "FirstCellAsLabel" ))
+ else if (aPropName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FirstCellAsLabel")))
rFirstCellAsLabel = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
}
}
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index a5ffa21..ddffcc2 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -610,7 +610,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
const beans::PropertyValue* pVal = rProps.getConstArray();
for( sal_Int32 i = 0; i < rProps.getLength(); i++ )
{
- if( pVal[i].Name.equalsAscii( "PrinterName" ) )
+ if( pVal[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrinterName")) )
{
rtl::OUString aPrinterName;
pVal[i].Value >>= aPrinterName;
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index f0f7541..d836c75 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -168,7 +168,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
{
maMediaDescriptor[ i ].Value >>= maFilterDataSequence;
}
- else if ( maMediaDescriptor[ i ].Name.equalsAscii( "SelectionOnly" ) )
+ else if ( maMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SelectionOnly")) )
{
maMediaDescriptor[ i ].Value >>= mbExportSelection;
}
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 62eaf31..47f0fe1 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -147,7 +147,7 @@ namespace svt { namespace table
//------------------------------------------------------------------------------------------------------------------
void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException)
{
- if ( i_event.AttributeName.equalsAscii( "DataColumnIndex" ) )
+ if ( i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DataColumnIndex")) )
{
SolarMutexGuard aGuard;
if ( m_pColumnImplementation != NULL )
@@ -157,15 +157,15 @@ namespace svt { namespace table
ColumnAttributeGroup nChangedAttributes( COL_ATTRS_NONE );
- if ( i_event.AttributeName.equalsAscii( "HorizontalAlign" ) )
+ if ( i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HorizontalAlign")) )
nChangedAttributes |= COL_ATTRS_APPEARANCE;
- if ( i_event.AttributeName.equalsAscii( "ColumnWidth" )
- || i_event.AttributeName.equalsAscii( "MaxWidth" )
- || i_event.AttributeName.equalsAscii( "MinWidth" )
- || i_event.AttributeName.equalsAscii( "PreferredWidth" )
- || i_event.AttributeName.equalsAscii( "Resizeable" )
- || i_event.AttributeName.equalsAscii( "Flexibility" )
+ if ( i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ColumnWidth"))
+ || i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MaxWidth"))
+ || i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MinWidth"))
+ || i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PreferredWidth"))
+ || i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Resizeable"))
+ || i_event.AttributeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Flexibility"))
)
nChangedAttributes |= COL_ATTRS_WIDTH;
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index eb2f796..db4bd4e 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -586,7 +586,7 @@ aInfo16( SW_RES(IMG_INFO_16) )
sal_Int32 i = 0;
while ( sExplanationLink.isEmpty() && i < aProperties.getLength() )
{
- if ( aProperties[i].Name.equalsAscii( "FullCommentURL" ) )
+ if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FullCommentURL")) )
{
uno::Any aValue = aProperties[i].Value;
aValue >>= sExplanationLink;
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 17ee5a4..ec37193 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -254,7 +254,7 @@ class ControllerProperties
if( pVal )
{
// ugly
- if( name_it->second.equalsAscii( "PrintContent" ) )
+ if( name_it->second.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")) )
pVal->Value <<= i_bValue ? sal_Int32(2) : sal_Int32(0);
else
pVal->Value <<= i_bValue;
@@ -294,7 +294,7 @@ class ControllerProperties
-1;
std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
- if( name_it != maTagToPropertyName.end() && ! name_it->second.equalsAscii( "PrintContent" ) )
+ if( name_it != maTagToPropertyName.end() && ! name_it->second.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")) )
{
BOOL bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO;
if( pCtrl )
@@ -1157,29 +1157,29 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
for( int n = 0; n < aOptProp.getLength(); n++ )
{
const beans::PropertyValue& rEntry( aOptProp[ n ] );
- if( rEntry.Name.equalsAscii( "ControlType" ) )
+ if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ControlType")) )
{
rEntry.Value >>= aCtrlType;
}
- else if( rEntry.Name.equalsAscii( "Choices" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Choices")) )
{
rEntry.Value >>= aChoices;
}
- else if( rEntry.Name.equalsAscii( "ChoicesDisabled" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChoicesDisabled")) )
{
rEntry.Value >>= aChoicesDisabled;
}
- else if( rEntry.Name.equalsAscii( "Property" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Property")) )
{
PropertyValue aVal;
rEntry.Value >>= aVal;
aPropertyName = aVal.Name;
- if( aPropertyName.equalsAscii( "PrintContent" ) )
+ if( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")) )
aVal.Value >>= aSelectionChecked;
}
}
- if( aCtrlType.equalsAscii( "Radio" ) &&
- aPropertyName.equalsAscii( "PrintContent" ) &&
+ if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Radio")) &&
+ aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("PrintContent")) &&
aChoices.getLength() > 2 )
{
bAddSelectionCheckBox = true;
@@ -1208,70 +1208,70 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
for( int n = 0; n < aOptProp.getLength(); n++ )
{
const beans::PropertyValue& rEntry( aOptProp[ n ] );
- if( rEntry.Name.equalsAscii( "Text" ) )
+ if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Text")) )
{
rEntry.Value >>= aText;
filterAccelerator( aText );
}
- else if( rEntry.Name.equalsAscii( "ControlType" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ControlType")) )
{
rEntry.Value >>= aCtrlType;
}
- else if( rEntry.Name.equalsAscii( "Choices" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Choices")) )
{
rEntry.Value >>= aChoices;
}
- else if( rEntry.Name.equalsAscii( "Property" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Property")) )
{
PropertyValue aVal;
rEntry.Value >>= aVal;
aPropertyName = aVal.Name;
}
- else if( rEntry.Name.equalsAscii( "Enabled" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enabled")) )
{
sal_Bool bValue = sal_True;
rEntry.Value >>= bValue;
bEnabled = bValue;
}
- else if( rEntry.Name.equalsAscii( "MinValue" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MinValue")) )
{
rEntry.Value >>= nMinValue;
}
- else if( rEntry.Name.equalsAscii( "MaxValue" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MaxValue")) )
{
rEntry.Value >>= nMaxValue;
}
- else if( rEntry.Name.equalsAscii( "AttachToDependency" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AttachToDependency")) )
{
nAttachOffset = 20;
}
- else if( rEntry.Name.equalsAscii( "InternalUIOnly" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InternalUIOnly")) )
{
rEntry.Value >>= bIgnore;
}
- else if( rEntry.Name.equalsAscii( "GroupingHint" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GroupingHint")) )
{
rEntry.Value >>= aGroupHint;
}
}
- if( aCtrlType.equalsAscii( "Group" ) ||
- aCtrlType.equalsAscii( "Subgroup" ) ||
- aCtrlType.equalsAscii( "Radio" ) ||
- aCtrlType.equalsAscii( "List" ) ||
- aCtrlType.equalsAscii( "Edit" ) ||
- aCtrlType.equalsAscii( "Range" ) ||
- aCtrlType.equalsAscii( "Bool" ) )
+ if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Group")) ||
+ aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Subgroup")) ||
+ aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Radio")) ||
+ aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("List")) ||
+ aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Edit")) ||
+ aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Range")) ||
+ aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bool")) )
{
// since our build target is MacOSX 10.4 we can have only one accessory view
// so we have a single accessory view that is tabbed for grouping
- if( aCtrlType.equalsAscii( "Group" )
+ if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Group"))
|| ! pCurParent
- || ( aCtrlType.equalsAscii( "Subgroup" ) && nCurY < -250 && ! bIgnore )
+ || ( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Subgroup")) && nCurY < -250 && ! bIgnore )
)
{
rtl::OUString aGroupTitle( aText );
- if( aCtrlType.equalsAscii( "Subgroup" ) )
+ if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Subgroup")) )
aGroupTitle = pControllerProperties->getMoreString();
// set size of current parent
if( pCurParent )
@@ -1306,7 +1306,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
}
}
- if( aCtrlType.equalsAscii( "Subgroup" ) && pCurParent )
+ if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Subgroup")) && pCurParent )
{
bIgnoreSubgroup = bIgnore;
if( bIgnore )
@@ -1318,7 +1318,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
{
continue;
}
- else if( aCtrlType.equalsAscii( "Bool" ) && pCurParent )
+ else if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bool")) && pCurParent )
{
sal_Bool bVal = sal_False;
PropertyValue* pVal = pController->getValue( aPropertyName );
@@ -1328,7 +1328,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
aText, true, aPropertyName, bVal,
aRightColumn, pControllerProperties, pCtrlTarget );
}
- else if( aCtrlType.equalsAscii( "Radio" ) && pCurParent )
+ else if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Radio")) && pCurParent )
{
// get currently selected value
sal_Int32 nSelectVal = 0;
@@ -1341,7 +1341,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
aLeftColumn, aRightColumn,
pControllerProperties, pCtrlTarget );
}
- else if( aCtrlType.equalsAscii( "List" ) && pCurParent )
+ else if( aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("List")) && pCurParent )
{
PropertyValue* pVal = pController->getValue( aPropertyName );
sal_Int32 aSelectVal = 0;
@@ -1353,7 +1353,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
aLeftColumn, aRightColumn,
pControllerProperties, pCtrlTarget );
}
- else if( (aCtrlType.equalsAscii( "Edit" ) || aCtrlType.equalsAscii( "Range" )) && pCurParent )
+ else if( (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Edit")) || aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Range"))) && pCurParent )
{
// current value
PropertyValue* pVal = pController->getValue( aPropertyName );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e69eb09..ec9d7b8 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -3079,7 +3079,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.equalsAscii( "text/plain" ) )
+ if( aMimetype.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text/plain")) )
{
mpDDInfo->bIsStringSupported = sal_True;
break;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 32ae196..482491d 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1376,7 +1376,7 @@ void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_
{
rEntry.Value >>= aDep.mnDependsOnEntry;
}
- else if( rEntry.Name.equalsAscii( "ChoicesDisabled" ) )
+ else if( rEntry.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ChoicesDisabled")) )
{
rEntry.Value >>= aChoicesDisabled;
}
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index 847abf2..86aba47 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.equalsAscii( "OuterBorder" ) )
+ if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("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.equalsAscii( "ManagedArea" ) )
+ else if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("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.equalsAscii( "Visible" ) )
+ else if( pProps[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("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 5000cda..238c032 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.equalsAscii( "Enabled" ) )
+ if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Enabled")) )
{
sal_Bool bVal = sal_True;
if( pVals[i].Value >>= bVal )
Enable( bVal );
}
- else if( pVals[i].Name.equalsAscii( "Visible" ) )
+ else if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Visible")) )
{
sal_Bool bVal = sal_True;
if( pVals[i].Value >>= bVal )
Show( bVal );
}
- else if( pVals[i].Name.equalsAscii( "Text" ) )
+ else if( pVals[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Text")) )
{
rtl::OUString aText;
if( pVals[i].Value >>= aText )
More information about the Libreoffice-commits
mailing list