mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No more need for PartialWeakComponentImplHelper here

Browse Source 
...since 70626249cd "API CHANGE a11y unpublishing
and add/removeListener rename."

Change-Id: I89d81326d97712abcac94c3436a13905954c55cf
This commit is contained in:
Stephan Bergmann
2015-04-21 22:48:02 +02:00
parent e468131fa4
commit da36fc8c95
12 changed files with 13 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
chart2/source/controller/inc/AccessibleBase.hxx
View File

@@ -79,7 +79,7 @@ struct AccessibleElementInfo
namespace impl
{
typedef ::cppu::PartialWeakComponentImplHelper6<
typedef ::cppu::WeakComponentImplHelper6<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleComponent,
@@ -221,14 +221,6 @@ protected:
void SetInfo( const AccessibleElementInfo & rNewInfo );
AccessibleUniqueId GetId() const { return m_aAccInfo.m_aOID;}
// ________ XComponent ________
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// ________ WeakComponentImplHelper (XComponent::dispose) ________
virtual void SAL_CALL disposing() SAL_OVERRIDE;

9
comphelper/source/misc/accessiblewrapper.cxx
View File

@@ -658,15 +658,6 @@ namespace comphelper
if ( nClientId )
AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this );
}
void SAL_CALL OAccessibleContextWrapper::dispose() throw( RuntimeException, std::exception )
{
// simply disambiguate
WeakComponentImplHelperBase::dispose();
}
} // namespace accessibility

11
editeng/source/accessibility/AccessibleContextBase.cxx
View File

@@ -42,17 +42,10 @@ namespace accessibility {
//===== internal ============================================================
// Define a shortcut for the somewhot longish base class name.
typedef ::cppu::PartialWeakComponentImplHelper4<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::lang::XServiceInfo> BaseClass;
AccessibleContextBase::AccessibleContextBase (
const uno::Reference<XAccessible>& rxParent,
const sal_Int16 aRole)
: BaseClass (MutexOwner::maMutex),
: WeakComponentImplHelper4 (MutexOwner::maMutex),
mxStateSet (NULL),
mxRelationSet (NULL),
mxParent(rxParent),
@@ -495,7 +488,7 @@ uno::Sequence< ::com::sun::star::uno::Type>
// This class supports no interfaces on its own. Just return those
// supported by the base class.
return BaseClass::getTypes();
return WeakComponentImplHelper4::getTypes();
}
uno::Sequence<sal_Int8> SAL_CALL

9
include/comphelper/accessiblewrapper.hxx
View File

@@ -235,7 +235,7 @@ namespace comphelper
//= OAccessibleContextWrapper
typedef ::cppu::PartialWeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster
, ::com::sun::star::accessibility::XAccessibleContext
> OAccessibleContextWrapper_CBase;
@@ -296,13 +296,6 @@ namespace comphelper
// OAccessibleContextWrapper
virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// OComponentHelper
using OAccessibleContextWrapperHelper::disposing;
virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

2
include/editeng/AccessibleContextBase.hxx
View File

@@ -52,7 +52,7 @@ struct MutexOwner {mutable ::osl::Mutex maMutex;};
*/
class EDITENG_DLLPUBLIC AccessibleContextBase
: public MutexOwner,
public cppu::PartialWeakComponentImplHelper4<
public cppu::WeakComponentImplHelper4<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,

2
include/editeng/AccessibleEditableTextPara.hxx
View File

@@ -46,7 +46,7 @@
namespace accessibility
{
typedef ::cppu::PartialWeakComponentImplHelper9< ::com::sun::star::accessibility::XAccessible,
typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleComponent,
::com::sun::star::accessibility::XAccessibleEditableText,

11
sd/source/ui/inc/AccessibleSlideSorterObject.hxx
View File

@@ -39,7 +39,7 @@ class SlideSorter;
namespace accessibility {
typedef ::cppu::PartialWeakComponentImplHelper5<
typedef ::cppu::WeakComponentImplHelper5<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
@@ -84,15 +84,6 @@ public:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
//===== XComponent ==============================================
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
//===== XAccessible =======================================================
virtual ::com::sun::star::uno::Reference<

11
sd/source/ui/inc/AccessibleSlideSorterView.hxx
View File

@@ -44,7 +44,7 @@ namespace accessibility {
class AccessibleSlideSorterObject;
typedef ::cppu::PartialWeakComponentImplHelper6<
typedef ::cppu::WeakComponentImplHelper6<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
@@ -89,15 +89,6 @@ public:
*/
AccessibleSlideSorterObject* GetAccessibleChildImplementation (sal_Int32 nIndex);
//===== XComponent ==============================================
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
//===== XAccessible =======================================================
virtual ::com::sun::star::uno::Reference<

11
sdext/source/presenter/PresenterAccessibility.cxx
View File

@@ -52,7 +52,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext { namespace presenter {
namespace {
typedef ::cppu::PartialWeakComponentImplHelper5 <
typedef ::cppu::WeakComponentImplHelper5 <
css::accessibility::XAccessible,
css::accessibility::XAccessibleContext,
css::accessibility::XAccessibleComponent,
@@ -94,15 +94,6 @@ public:
void UpdateStateSet();
//----- XComponent ---------------------------------------------------
virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const css::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const css::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
//----- XAccessible -------------------------------------------------------
virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL

10
sfx2/source/control/thumbnailviewacc.hxx
View File

@@ -38,7 +38,7 @@
class ThumbnailView;
class ThumbnailViewItem;
typedef ::cppu::PartialWeakComponentImplHelper6<
typedef ::cppu::WeakComponentImplHelper6<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
@@ -76,14 +76,6 @@ public:
*/
void LoseFocus();
// XComponent
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

19
svtools/source/control/toolbarmenuimp.hxx
View File

@@ -105,7 +105,7 @@ public:
// - ToolbarMenuAcc -
typedef ::cppu::PartialWeakComponentImplHelper5<
typedef ::cppu::WeakComponentImplHelper5<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
@@ -127,14 +127,6 @@ public:
public:
// XComponent
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -201,7 +193,7 @@ private:
// - ToolbarMenuEntryAcc -
typedef ::cppu::PartialWeakComponentImplHelper4< ::com::sun::star::accessibility::XAccessible,
typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase;
@@ -215,13 +207,6 @@ public:
bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

10
svtools/source/control/valueimp.hxx
View File

@@ -68,7 +68,7 @@ struct ValueSetItem
GetAccessible( bool bIsTransientChildrenDisabled );
};
typedef ::cppu::PartialWeakComponentImplHelper6<
typedef ::cppu::WeakComponentImplHelper6<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
::com::sun::star::accessibility::XAccessibleContext,
@@ -103,14 +103,6 @@ public:
*/
void LoseFocus();
// XComponent
virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::dispose(); }
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::addEventListener(xListener); }
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ WeakComponentImplHelperBase::removeEventListener(xListener); }
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;