summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-30 18:01:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-30 18:01:37 +0000
commit83eab20dc3f5bf397d84c321efe75f2a7acf5729 (patch)
treea02e42104a65bcbff98e54ad00d5593f5de14537 /framework
parent27429c46dbee072bfc83b1f24c7bf051809bd4a3 (diff)
equalsAscii -> equalsAsciiL
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/statusbarmanager.cxx12
-rw-r--r--framework/source/xml/menudocumenthandler.cxx22
2 files changed, 17 insertions, 17 deletions
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index a939b2c472f4..0c26320ab174 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -496,27 +496,27 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+ if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
{
aProp[i].Value >>= aCommandURL;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+ else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
{
aProp[i].Value >>= aHelpURL;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+ else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
{
aProp[i].Value >>= nStyle;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
+ else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
{
aProp[i].Value >>= nType;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
+ else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
{
aProp[i].Value >>= nWidth;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_OFFSET ))
+ else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_OFFSET)) )
{
aProp[i].Value >>= nOffset;
}
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx
index 271dcbf5eee5..92ad6780ecf0 100644
--- a/framework/source/xml/menudocumenthandler.cxx
+++ b/framework/source/xml/menudocumenthandler.cxx
@@ -140,28 +140,28 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
{
for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
{
- if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+ if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
{
rProp[i].Value >>= rCommandURL;
rCommandURL = rCommandURL.intern();
}
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+ else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
{
rProp[i].Value >>= rHelpURL;
}
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
+ else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
{
rProp[i].Value >>= rSubMenu;
}
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
+ else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
{
rProp[i].Value >>= rLabel;
}
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
+ else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
{
rProp[i].Value >>= rType;
}
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+ else if ( rProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
{
rProp[i].Value >>= rStyle;
}
@@ -893,8 +893,8 @@ throw ( SAXException, RuntimeException )
ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL, xSubMenu, nType, nItemBits );
if ( xSubMenu.is() )
{
- if ( aCommandURL.equalsAscii( ADDDIRECT_CMD ) ||
- aCommandURL.equalsAscii( AUTOPILOTMENU_CMD ))
+ if ( aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ADDDIRECT_CMD)) ||
+ aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AUTOPILOTMENU_CMD)) )
{
WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
bSeparator = sal_False;
@@ -908,7 +908,7 @@ throw ( SAXException, RuntimeException )
m_aAttributeType,
aCommandURL );
- if ( !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+ if ( !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL))) )
pListMenu->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
m_aAttributeType,
aLabel );
@@ -967,13 +967,13 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandUR
aHelpURL );
}
- if (( aLabel.getLength() > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+ if (( aLabel.getLength() > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)) ))
{
pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
m_aAttributeType,
aLabel );
}
- if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+ if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CMD_PROTOCOL)) ))
{
rtl::OUString aValue;
MenuStyleItem* pStyle = MenuItemStyles;