diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-07 15:53:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-07 15:54:16 +0100 |
| commit | aefbfc7101bb9b4ef20968d45306ab97573f6597 (patch) | |
| tree | 314a80042f59b05443276d6e311d0cbc71684087 /toolkit | |
| parent | 3f2b771e5f53a7f079416ae6fc42625420b725d7 (diff) | |
callcatcher: update and remove newly unused methods
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 1 | ||||
| -rw-r--r-- | toolkit/inc/toolkit/helper/macros.hxx | 7 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index 13c3b38e9cc3..99722b775ce1 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -126,7 +126,6 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static UnoControlModel* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCloneable diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 7275b8a7ffd3..b2acbf28de83 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -31,7 +31,7 @@ #include <comphelper/servicehelper.hxx> -#define IMPL_XUNOTUNNEL( ClassName ) \ +#define IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) \ { \ if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ @@ -47,7 +47,10 @@ namespace \ const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() throw() \ { \ return the##ClassName##UnoTunnelId::get().getSeq(); \ -} \ +} + +#define IMPL_XUNOTUNNEL( ClassName ) \ +IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 75e7882fc667..2d0a2fdf832c 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -448,7 +448,7 @@ void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rId } // ::com::sun::star::lang::XUnoTunnel -IMPL_XUNOTUNNEL( UnoControlModel ) +IMPL_XUNOTUNNEL_MINIMAL( UnoControlModel ) // XInterface IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base ) |