summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-04 16:28:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-08-05 09:39:22 +0000
commit403c13487c36f4200adf0986c5d11398f719cd7a (patch)
tree21a4acf87dce1e6c8772f5cbcff3c2a3de21f4ba /framework
parent10560949f90e08fe4a04dd91c7d388c4998100e8 (diff)
loplugin:unusedmethods
Change-Id: I6801618efb5a66d24156fa429e026acb6ca03aba Reviewed-on: https://gerrit.libreoffice.org/17506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/macros/xserviceinfo.hxx16
-rw-r--r--framework/inc/tabwin/tabwindow.hxx2
-rw-r--r--framework/inc/uielement/macrosmenucontroller.hxx1
-rw-r--r--framework/inc/uifactory/configurationaccessfactorymanager.hxx4
-rw-r--r--framework/inc/uifactory/factoryconfiguration.hxx4
-rw-r--r--framework/inc/xml/imagesdocumenthandler.hxx5
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx1
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx16
8 files changed, 8 insertions, 41 deletions
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 22fd2015ab79..514f3c8249d8 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -145,14 +145,14 @@ namespace framework{
#define DECLARE_XSERVICEINFO_NOFACTORY \
/* interface XServiceInfo */ \
- virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- /* Helper for XServiceInfo */ \
- static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
- static OUString SAL_CALL impl_getStaticImplementationName ( ); \
- /* Helper for initialization of service by using own reference! */ \
- virtual void SAL_CALL impl_initService ( ); \
+ virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
+ virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
+ /* Helper for XServiceInfo */ \
+ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
+ static OUString SAL_CALL impl_getStaticImplementationName ( ); \
+ /* Helper for initialization of service by using own reference! */ \
+ virtual void SAL_CALL impl_initService ( ); \
#define DECLARE_XSERVICEINFO \
DECLARE_XSERVICEINFO_NOFACTORY \
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index e693ae20bb26..9bdc6a827b21 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -139,8 +139,6 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider ,
NOTIFY_DEACTIVATED
};
- sal_Int32 impl_GetPageIdFromIndex( ::sal_Int32 nIndex ) const;
- bool impl_CheckIndex( ::sal_Int32 nIndex ) const;
void implts_LayoutWindows() const;
void impl_SetTitle( const OUString& rTitle );
TabControl* impl_GetTabControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xTabControlWindow ) const;
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index d8803971beeb..c81f0e412cd1 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -50,7 +50,6 @@ namespace framework
::com::sun::star::util::URL aTargetURL;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
};
- DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
OUString m_aModuleIdentifier;
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 26349235e8ec..b704d7e0f703 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -62,10 +62,6 @@ namespace framework {
OUStringHash,
std::equal_to< OUString > >
{
- inline void free()
- {
- FactoryManagerMap().swap( *this );// get rid of reserved capacity
- }
};
bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const;
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index d63bdc201882..a913129431d2 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -78,10 +78,6 @@ private:
OUStringHash,
std::equal_to< OUString > >
{
- inline void free()
- {
- MenuControllerMap().swap( *this );// get rid of reserved capacity
- }
};
bool impl_getElementProps( const ::com::sun::star::uno::Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const;
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index fcdaa6a1874b..abc52a3461b3 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -113,11 +113,6 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::s
OUStringHash,
std::equal_to< OUString > >
{
- public:
- inline void free()
- {
- ImageHashMap().swap( *this );// get rid of reserved capacity
- }
};
bool m_bImageContainerStartFound;
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index a72e8274bb43..fac7f3533904 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -66,7 +66,6 @@ namespace framework
protected:
void impl_fillCommandToImageNameMap();
ImageList* impl_getImageList( sal_Int16 nImageType );
- std::vector< OUString >& impl_getImageNameVector() { return m_aImageNameVector;}
std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;}
private:
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index adc215eda5fa..132771b07f54 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -122,22 +122,6 @@ void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) th
}
}
-IMPL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
-{
- try
- {
- // Asynchronous execution as this can lead to our own destruction!
- // Framework can recycle our current frame and the layout manager disposes all user interface
- // elements if a component gets detached from its frame!
- pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
- }
- catch ( const Exception& )
- {
- }
- delete pExecuteInfo;
- return 0;
-}
-
OUString MacrosMenuController::RetrieveLabelFromCommand(const OUString& rCmdURL)
{
bool bModuleIdentified = !m_aModuleIdentifier.isEmpty();