summaryrefslogtreecommitdiff
path: root/framework/source/uielement
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/uielement')
-rw-r--r--framework/source/uielement/menubarmanager.cxx4
-rw-r--r--framework/source/uielement/menubarwrapper.cxx2
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/statusbarmanager.cxx12
-rw-r--r--framework/source/uielement/toolbarmanager.cxx28
5 files changed, 24 insertions, 24 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0ff34d6d097b..38b14b1d8114 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -883,7 +883,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
// Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
// Only non-popup menu items can have a short-cut
- if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+ if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
{
KeyCode aKeyCode( KEY_F1 );
pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
@@ -1481,7 +1481,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
// Set key code, workaround for hard-coded shortcut F1 mapped to .uno:HelpIndex
// Only non-popup menu items can have a short-cut
- if ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aCmdHelpIndex)) )
+ if ( pMenuItemHandler->aMenuItemURL == aCmdHelpIndex )
{
KeyCode aKeyCode( KEY_F1 );
pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode );
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index a89ca7e8653f..45d5bf849ad6 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -193,7 +193,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
PropertyValue aPropValue;
if ( aArguments[n] >>= aPropValue )
{
- if ( aPropValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MenuOnly")) )
+ if ( aPropValue.Name == "MenuOnly" )
aPropValue.Value >>= bMenuOnly;
}
}
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index d2731962f4c2..d82be5a8629a 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -514,7 +514,7 @@ void NewMenuController::impl_setPopupMenu()
{
for ( sal_Int32 y = 0; y < aSeq.getLength(); y++ )
{
- if ( aSeq[y].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooSetupFactoryEmptyDocumentURL")) )
+ if ( aSeq[y].Name == "ooSetupFactoryEmptyDocumentURL" )
{
aSeq[y].Value >>= m_aEmptyDocURL;
break;
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 3093ec77ad0e..ef15fe75c06d 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -490,27 +490,27 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[i].Value >>= aCommandURL;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
{
aProp[i].Value >>= aHelpURL;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
{
aProp[i].Value >>= nStyle;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
{
aProp[i].Value >>= nType;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
{
aProp[i].Value >>= nWidth;
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_OFFSET)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_OFFSET )
{
aProp[i].Value >>= nOffset;
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 067dbe4eacb1..80adbd735883 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -547,7 +547,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
if ( m_bDisposed )
return;
- if ( Event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:ImageOrientation")) )
+ if ( Event.FeatureURL.Complete == ".uno:ImageOrientation" )
{
SfxImageItem aItem( 1, 0 );
aItem.PutValue( Event.State );
@@ -872,7 +872,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Name")) )
+ if ( aPropSeq[i].Name == "Name" )
{
aPropSeq[i].Value >>= aLabel;
break;
@@ -890,7 +890,7 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString&
aPropSeq = GetPropsForCommand( aCmdURL );
for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
{
- if ( aPropSeq[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Properties")) )
+ if ( aPropSeq[i].Name == "Properties" )
{
aPropSeq[i].Value >>= nProperties;
break;
@@ -1282,7 +1282,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
{
for ( int i = 0; i < aProp.getLength(); i++ )
{
- if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[i].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[i].Value >>= aCommandURL;
if ( aCommandURL.compareToAscii(MENUPREFIX, RTL_CONSTASCII_LENGTH(MENUPREFIX) ) == 0 )
@@ -1303,7 +1303,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
xMenuContainer->getByIndex(0) >>= aProps;
for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
{
- if ( aProps[ index ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_CONTAINER)) )
+ if ( aProps[ index ].Name == ITEM_DESCRIPTOR_CONTAINER )
{
aProps[ index ].Value >>= aMenuDesc;
@@ -1317,19 +1317,19 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_HELPURL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_HELPURL )
aProp[i].Value >>= aHelpURL;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TOOLTIP)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TOOLTIP )
aProp[i].Value >>= aTooltip;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_LABEL)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_LABEL )
aProp[i].Value >>= aLabel;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_TYPE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_TYPE )
aProp[i].Value >>= nType;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_VISIBLE )
aProp[i].Value >>= bIsVisible;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_WIDTH)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_WIDTH )
aProp[i].Value >>= nWidth;
- else if ( aProp[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_STYLE)) )
+ else if ( aProp[i].Name == ITEM_DESCRIPTOR_STYLE )
aProp[i].Value >>= nStyle;
}
@@ -2005,11 +2005,11 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
{
for ( sal_Int32 j = 0; j < aProp.getLength(); j++ )
{
- if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_COMMANDURL)) )
+ if ( aProp[j].Name == ITEM_DESCRIPTOR_COMMANDURL )
{
aProp[j].Value >>= aCommandURL;
}
- else if ( aProp[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ITEM_DESCRIPTOR_VISIBLE)) )
+ else if ( aProp[j].Name == ITEM_DESCRIPTOR_VISIBLE )
{
aProp[j].Value >>= bVisible;
nVisibleIndex = j;
generated by cgit (git 2.34.1) at 2024-08-20 22:00:47 +0000