diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-07 22:54:13 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-08 09:29:31 +0100 |
commit | 3a53904ae64fa87216fcc972dbc746068c640818 (patch) | |
tree | 85dabe4176a00037e46920c8dd1c72a1656c95c6 /framework | |
parent | 595ce66e708da9e742a2c418f013fc675ffc45a3 (diff) |
callcatcher: update list
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/classes/rootactiontriggercontainer.hxx | 2 | ||||
-rw-r--r-- | framework/inc/framework/addonmenu.hxx | 1 | ||||
-rw-r--r-- | framework/inc/framework/addonsoptions.hxx | 10 | ||||
-rw-r--r-- | framework/inc/framework/menuconfiguration.hxx | 3 | ||||
-rw-r--r-- | framework/source/fwe/classes/addonmenu.cxx | 5 | ||||
-rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 19 | ||||
-rw-r--r-- | framework/source/fwe/classes/rootactiontriggercontainer.cxx | 5 | ||||
-rw-r--r-- | framework/source/fwe/xml/menuconfiguration.cxx | 11 |
8 files changed, 0 insertions, 56 deletions
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 406c8bb3275c..89b48fc8972b 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -57,8 +57,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, const Menu* GetMenu(); - ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId() const; - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index 0ec30f5432b0..0cef42caba0e 100644 --- a/framework/inc/framework/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -93,7 +93,6 @@ class FWE_DLLPUBLIC AddonMenuManager }; static sal_Bool HasAddonMenuElements(); - static sal_Bool HasAddonHelpMenuElements(); static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index b095f787f71a..08c55185db0a 100644 --- a/framework/inc/framework/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -193,16 +193,6 @@ class FWE_DLLPUBLIC AddonsOptions sal_Bool HasAddonsMenu() const; /*-****************************************************************************************************//** - @short returns if an addons help menu is available - @descr Call to retrieve if a addons menu is available - - - @return sal_True if there is a menu otherwise sal_False - *//*-*****************************************************************************************************/ - - sal_Bool HasAddonsHelpMenu() const; - - /*-****************************************************************************************************//** @short returns number of addons toolbars @descr Call to retrieve the number of addons toolbars diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx index 1671a594ec06..bf052bc67e59 100644 --- a/framework/inc/framework/menuconfiguration.hxx +++ b/framework/inc/framework/menuconfiguration.hxx @@ -114,9 +114,6 @@ class FWE_DLLPUBLIC MenuConfiguration ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream ) throw ( ::com::sun::star::lang::WrappedTargetException ); - static sal_Bool IsPickListItemId( sal_uInt16 nId ); - static sal_Bool IsWindowListItemId( sal_uInt16 nId ); - private: // do not hold the uno reference by reference const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager; diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index bae9efb23419..2a9196ae1b1f 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -133,11 +133,6 @@ sal_Bool AddonMenuManager::HasAddonMenuElements() return AddonsOptions().HasAddonsMenu(); } -sal_Bool AddonMenuManager::HasAddonHelpMenuElements() -{ - return AddonsOptions().HasAddonsHelpMenu(); -} - // Factory method to create different Add-On menu types PopupMenu* AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Reference< XFrame >& rFrame ) { diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 4e1b58316880..714f8fd13492 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -262,7 +262,6 @@ class AddonsOptions_Impl : public ConfigItem *//*-*****************************************************************************************************/ sal_Bool HasAddonsMenu () const ; - sal_Bool HasAddonsHelpMenu () const ; sal_Int32 GetAddonsToolBarCount() const ; const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ; const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ; @@ -515,14 +514,6 @@ sal_Bool AddonsOptions_Impl::HasAddonsMenu() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool AddonsOptions_Impl::HasAddonsHelpMenu () const -{ - return ( m_aCachedHelpMenuProperties.getLength() > 0 ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const { return m_aCachedToolBarPartProperties.size(); @@ -1665,16 +1656,6 @@ sal_Bool AddonsOptions::HasAddonsMenu() const // public method //***************************************************************************************************************** -sal_Bool AddonsOptions::HasAddonsHelpMenu() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->HasAddonsHelpMenu(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** - sal_Int32 AddonsOptions::GetAddonsToolBarCount() const { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 45598b6b47c1..9f6fe91a685b 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -72,11 +72,6 @@ RootActionTriggerContainer::~RootActionTriggerContainer() { } -Sequence< sal_Int8 > RootActionTriggerContainer::GetUnoTunnelId() const -{ - return impl_getStaticIdentifier(); -} - const Menu* RootActionTriggerContainer::GetMenu() { if ( !m_bContainerChanged ) diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index c0feda7ec766..d823edc7dc82 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -63,17 +63,6 @@ using namespace ::com::sun::star::io; namespace framework { -sal_Bool MenuConfiguration::IsPickListItemId( sal_uInt16 nId ) -{ - return (( START_ITEMID_PICKLIST <= nId ) && ( nId <= END_ITEMID_PICKLIST )); -} - -sal_Bool MenuConfiguration::IsWindowListItemId( sal_uInt16 nId ) -{ - return (( START_ITEMID_WINDOWLIST <= nId ) && ( nId <= END_ITEMID_WINDOWLIST )); -} - - MenuConfiguration::MenuConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ) : m_rxServiceManager( rServiceManager ) |