diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 11:03:11 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 17:39:51 +0100 |
commit | acca15f7a0e06694af7f62dc4eca3023c4bcfca8 (patch) | |
tree | 812e3dea8953353496a7ebc459120720dbf9f8f4 /accessibility | |
parent | 630360529726f4bd627a7f02e7a0ee247d0e0f63 (diff) |
accessibility: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I7f8848adf245a4fdf56bff67cc15ee0efb818c43
Diffstat (limited to 'accessibility')
9 files changed, 9 insertions, 75 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index d228eda70c27..9fa315c19420 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -326,15 +326,10 @@ void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( // XTypeProvider -------------------------------------------------------------- -namespace -{ - class theAccessibleBrowseBoxBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleBrowseBoxBaseImplementationId > {}; -} - Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() throw ( uno::RuntimeException, std::exception ) { - return theAccessibleBrowseBoxBaseImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // XServiceInfo --------------------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 7a3814a04774..0062dc0ee7be 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -325,15 +325,10 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName() return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ); } -namespace -{ - class theAccessibleBrowseBoxHeaderBarImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleBrowseBoxHeaderBarImplementationId > {}; -} - Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId() throw ( uno::RuntimeException, std::exception ) { - return theAccessibleBrowseBoxHeaderBarImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // internal virtual methods --------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 59136847ac9c..36b8166d6da1 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -188,15 +188,10 @@ Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes() AccessibleBrowseBoxTableImplHelper::getTypes() ); } -namespace -{ - class theAccessibleBrowseBoxTableBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleBrowseBoxTableBaseImplementationId > {}; -} - Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxTableBase::getImplementationId() throw ( uno::RuntimeException, std::exception ) { - return theAccessibleBrowseBoxTableBaseImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // internal virtual methods --------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 4187cf225a36..8299290c9e6b 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -284,15 +284,10 @@ void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( // XTypeProvider -------------------------------------------------------------- -namespace -{ - class theAccessibleGridControlBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleGridControlBaseImplementationId > {}; -} - Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() throw ( uno::RuntimeException, std::exception ) { - return theAccessibleGridControlBaseImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // XServiceInfo --------------------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index b4e635347f88..5f87437ca1ed 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -214,15 +214,10 @@ OUString SAL_CALL AccessibleGridControlHeader::getImplementationName() return OUString( "com.sun.star.accessibility.AccessibleGridControlHeader" ); } -namespace -{ - class theAccessibleGridControlHeaderImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleGridControlHeaderImplementationId > {}; -} - Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId() throw ( uno::RuntimeException, std::exception ) { - return theAccessibleGridControlHeaderImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // internal virtual methods --------------------------------------------------- diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 6d2166cc1f59..272d1cfa68c2 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -200,15 +200,10 @@ Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes() AccessibleGridControlTableImplHelper::getTypes() ); } -namespace -{ - class theAccessibleGridControlTableBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleGridControlTableBaseImplementationId > {}; -} - Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId() throw ( uno::RuntimeException, std::exception ) { - return theAccessibleGridControlTableBaseImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // internal helper methods ---------------------------------------------------- diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index c91b26f61e21..3d33822607fa 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -203,19 +203,7 @@ throw(RuntimeException, std::exception) Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException, std::exception) { - static ::cppu::OImplementationId* pId = NULL; - - if ( !pId ) - { - ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); - - if ( !pId ) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } // XComponent diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 89fa4e939923..245cd5293c47 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -217,19 +217,7 @@ namespace accessibility Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException, std::exception) { - static ::cppu::OImplementationId* pId = NULL; - - if ( !pId ) - { - ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); - - if ( !pId ) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index fb507bec6b6c..9396b826bd2e 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -170,19 +170,7 @@ Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes( ) throw (RuntimeExc Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException, std::exception) { - static ::cppu::OImplementationId* pId = NULL; - - if ( !pId ) - { - ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); - - if ( !pId ) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } // XComponent |