diff options
Diffstat (limited to 'framework')
12 files changed, 49 insertions, 49 deletions
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index a8bf41ca63b4..e280b304a8b9 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -288,7 +288,7 @@ throw( SAXException, RuntimeException ) ++m_nElementDepth; m_xReader->startElement( aName, xAttrList ); } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR ))) + else if ( aName == ELEMENT_MENUBAR ) { ++m_nElementDepth; m_bMenuBarMode = sal_True; @@ -369,7 +369,7 @@ throw( SAXException, RuntimeException ) ++m_nElementDepth; m_xReader->startElement( rName, xAttrList ); } - else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) + else if ( rName == ELEMENT_MENU ) { ++m_nElementDepth; @@ -397,13 +397,13 @@ throw( SAXException, RuntimeException ) { ::rtl::OUString aName = xAttrList->getNameByIndex( i ); ::rtl::OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) + if ( aName == ATTRIBUTE_ID ) aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) + else if ( aName == ATTRIBUTE_LABEL ) aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) + else if ( aName == ATTRIBUTE_HELPID ) aHelpId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE ))) + else if ( aName == ATTRIBUTE_STYLE ) { ::rtl::OUString aTemp( aValue ); sal_Int32 nIndex = 0; @@ -412,11 +412,11 @@ throw( SAXException, RuntimeException ) ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex ); if ( !aToken.isEmpty() ) { - if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) ) + if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; - else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) + else if ( aToken == ATTRIBUTE_ITEMSTYLE_IMAGE ) nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; - else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) ) + else if ( aToken == ATTRIBUTE_ITEMSTYLE_RADIO ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } @@ -522,7 +522,7 @@ throw( SAXException, RuntimeException ) ++m_nElementDepth; m_xReader->startElement( aName, xAttrList ); } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP ))) + else if ( aName == ELEMENT_MENUPOPUP ) { ++m_nElementDepth; m_bMenuPopupMode = sal_True; @@ -607,7 +607,7 @@ throw( SAXException, RuntimeException ) if ( m_bMenuMode ) m_xReader->startElement( rName, xAttrList ); - else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) + else if ( rName == ELEMENT_MENU ) { ::rtl::OUString aHelpId; ::rtl::OUString aCommandId; @@ -632,13 +632,13 @@ throw( SAXException, RuntimeException ) { ::rtl::OUString aName = xAttrList->getNameByIndex( i ); ::rtl::OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) + if ( aName == ATTRIBUTE_ID ) aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) + else if ( aName == ATTRIBUTE_LABEL ) aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) + else if ( aName == ATTRIBUTE_HELPID ) aHelpId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE ))) + else if ( aName == ATTRIBUTE_STYLE ) { ::rtl::OUString aTemp( aValue ); sal_Int32 nIndex = 0; @@ -647,11 +647,11 @@ throw( SAXException, RuntimeException ) ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex ); if ( !aToken.isEmpty() ) { - if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) ) + if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; - else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) + else if ( aToken == ATTRIBUTE_ITEMSTYLE_IMAGE ) nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; - else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) ) + else if ( aToken == ATTRIBUTE_ITEMSTYLE_RADIO ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } @@ -678,7 +678,7 @@ throw( SAXException, RuntimeException ) m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( xSubItemContainer, m_xContainerFactory )); m_xReader->startDocument(); } - else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) + else if ( rName == ELEMENT_MENUITEM ) { ::rtl::OUString aHelpId; ::rtl::OUString aCommandId; @@ -689,13 +689,13 @@ throw( SAXException, RuntimeException ) { ::rtl::OUString aName = xAttrList->getNameByIndex( i ); ::rtl::OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) + if ( aName == ATTRIBUTE_ID ) aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) + else if ( aName == ATTRIBUTE_LABEL ) aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) + else if ( aName == ATTRIBUTE_HELPID ) aHelpId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE ))) + else if ( aName == ATTRIBUTE_STYLE ) { ::rtl::OUString aTemp( aValue ); sal_Int32 nIndex = 0; @@ -704,11 +704,11 @@ throw( SAXException, RuntimeException ) ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex ); if ( !aToken.isEmpty() ) { - if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) ) + if ( aToken == ATTRIBUTE_ITEMSTYLE_TEXT ) nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; - else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) + else if ( aToken == ATTRIBUTE_ITEMSTYLE_IMAGE ) nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; - else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) ) + else if ( aToken == ATTRIBUTE_ITEMSTYLE_RADIO ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } @@ -728,7 +728,7 @@ throw( SAXException, RuntimeException ) m_nNextElementExpected = ELEM_CLOSE_MENUITEM; } - else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR ))) + else if ( rName == ELEMENT_MENUSEPARATOR ) { Sequence< PropertyValue > aMenuSeparator( 1 ); aMenuSeparator[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 150481e410f0..6ead1feee3f3 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -197,7 +197,7 @@ ConstItemContainer::ConstItemContainer( const Reference< XIndexAccess >& rSource Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) + if ( aPropSeq[j].Name == "ItemDescriptorContainer" ) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -234,7 +234,7 @@ void ConstItemContainer::copyItemContainer( const std::vector< Sequence< Propert Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) + if ( aPropSeq[j].Name == "ItemDescriptorContainer" ) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 6e0dce68852d..ede715b89e08 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -81,7 +81,7 @@ ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) + if ( aPropSeq[j].Name == "ItemDescriptorContainer" ) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; @@ -117,7 +117,7 @@ void ItemContainer::copyItemContainer( const std::vector< Sequence< PropertyValu Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) + if ( aPropSeq[j].Name == "ItemDescriptorContainer" ) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index d52e7c4f624f..2aa7b7cca92c 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -126,7 +126,7 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo Reference< XIndexAccess > xIndexAccess; for ( sal_Int32 j = 0; j < aPropSeq.getLength(); j++ ) { - if ( aPropSeq[j].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemDescriptorContainer" ) )) + if ( aPropSeq[j].Name == "ItemDescriptorContainer" ) { aPropSeq[j].Value >>= xIndexAccess; nContainerIndex = j; diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 339ee0379735..cc03c0ddbd48 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -128,9 +128,9 @@ throw ( Exception, RuntimeException ) PropertyValue aPropValue; if ( aArguments[n] >>= aPropValue ) { - if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) )) + if ( aPropValue.Name == "ResourceURL" ) aPropValue.Value >>= m_aResourceURL; - else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) + else if ( aPropValue.Name == "Frame" ) { Reference< XFrame > xFrame; aPropValue.Value >>= xFrame; diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index ed6d016f30f6..b4affd0192d9 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -122,7 +122,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument PropertyValue aPropValue; if ( aArguments[n] >>= aPropValue ) { - if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) )) + if ( aPropValue.Name == "ConfigurationData" ) aPropValue.Value >>= m_aConfigData; } } diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 1a1613f6aa48..42c13b005bec 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -148,11 +148,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { if ( aArguments[i] >>= aPropValue ) { - if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) + if ( aPropValue.Name == "Frame" ) m_xFrame.set(aPropValue.Value,UNO_QUERY); - else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) )) + else if ( aPropValue.Name == "CommandURL" ) aPropValue.Value >>= m_aCommandURL; - else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ServiceManager" ) )) + else if ( aPropValue.Name == "ServiceManager" ) m_xServiceManager.set(aPropValue.Value,UNO_QUERY); } } diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 2de8e8d5833b..3016cffe89c8 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -107,7 +107,7 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno:: Sequence< PropertyValue > aPrinterSeq = xPrintable->getPrinter(); for ( int i = 0; i < aPrinterSeq.getLength(); i++ ) { - if ( aPrinterSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) )) + if ( aPrinterSeq[i].Name == "Name" ) { aPrinterSeq[i].Value >>= aPrinterName; break; diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index fb7c59a05a1a..2a9e54f99878 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -326,15 +326,15 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com:: // TODO: Fill menu with the information retrieved by the status update - if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageSelectionMenu" ) )) + if ( m_aCommandURL == ".uno:SetLanguageSelectionMenu" ) { fillPopupMenu(m_xPopupMenu, MODE_SetLanguageSelectionMenu ); } - else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageParagraphMenu" ) )) + else if ( m_aCommandURL == ".uno:SetLanguageParagraphMenu" ) { fillPopupMenu(m_xPopupMenu, MODE_SetLanguageParagraphMenu ); } - else if( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SetLanguageAllTextMenu" ) )) + else if ( m_aCommandURL == ".uno:SetLanguageAllTextMenu" ) { fillPopupMenu(m_xPopupMenu, MODE_SetLanguageAllTextMenu ); } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 1bffc3966f17..d500be371fc4 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -261,7 +261,7 @@ rtl::OUString ToolbarsMenuController::getUINameFromCommand( const rtl::OUString& { for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) { - if ( aPropSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Label" ) )) + if ( aPropSeq[i].Name == "Label" ) { aPropSeq[i].Value >>= aStr; break; @@ -500,7 +500,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) || m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) )) addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), aEmptyString ); - else if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) )) + else if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" ) addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), aEmptyString ); else addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), aEmptyString ); diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 2516de5a3304..c8d0d6d13d63 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -173,11 +173,11 @@ throw ( ::com::sun::star::container::NoSuchElementException, for ( sal_Int32 n = 0; n < Args.getLength(); n++ ) { - if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ConfigurationData" ) )) + if ( Args[n].Name == "ConfigurationData" ) Args[n].Value >>= aConfigData; - else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) + else if ( Args[n].Name == "Frame" ) Args[n].Value >>= xFrame; - else if ( Args[n].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) )) + else if ( Args[n].Name == "ResourceURL" ) Args[n].Value >>= aResourceURL; } diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 9838427b3048..965feec9770d 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -148,9 +148,9 @@ throw (uno::Exception, uno::RuntimeException) beans::PropertyValue aPropValue; if ( Arguments[i] >>= aPropValue ) { - if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Frame" ) )) + if ( aPropValue.Name == "Frame" ) aPropValue.Value >>= xFrame; - else if ( aPropValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ResourceURL" ) )) + else if ( aPropValue.Name == "ResourceURL" ) aPropValue.Value >>= aResourceURL; } } |