diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 14:26:24 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 17:39:54 +0100 |
commit | 447e910c19defcda3922396254a44a50ca19b9b5 (patch) | |
tree | 04a469bed488b08866750f482785b2c30dbfe10c | |
parent | 2f3be987324f0ca3c3b4c9b167b6d76b6e1d5612 (diff) |
editeng: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I4135695eccb486e5df180f98a247755ba85a9454
-rw-r--r-- | editeng/source/accessibility/AccessibleContextBase.cxx | 7 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 7 | ||||
-rw-r--r-- | editeng/source/uno/unopracc.cxx | 7 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 21 | ||||
-rw-r--r-- | editeng/source/uno/unotext2.cxx | 14 |
5 files changed, 8 insertions, 48 deletions
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index e0ff20c837c0..5a90b6f7dba6 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -508,16 +508,11 @@ uno::Sequence< ::com::sun::star::uno::Type> return BaseClass::getTypes(); } -namespace -{ - class theAccessibleContextBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theAccessibleContextBaseImplementationId > {}; -} - uno::Sequence<sal_Int8> SAL_CALL AccessibleContextBase::getImplementationId (void) throw (::com::sun::star::uno::RuntimeException, std::exception) { - return theAccessibleContextBaseImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } //===== internal ============================================================ diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 12a80a4c2fa6..f20cddae10d4 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -548,15 +548,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() return maTypeSequence; } -namespace -{ - class theSvxUnoTextFieldImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextFieldImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextField::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theSvxUnoTextFieldImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } uno::Any SAL_CALL SvxUnoTextField::queryInterface( const uno::Type & rType ) diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index ef033abcdb44..be290bd007bf 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -100,15 +100,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr return pTypeCollection->getTypes() ; } -namespace -{ - class theSvxAccessibleTextPropertySetImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxAccessibleTextPropertySetImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theSvxAccessibleTextPropertySetImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // XServiceInfo diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index c9a3eccea4e3..e2107565ed23 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1649,15 +1649,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextRange::getTypes() return theSvxUnoTextRangeTypes::get(); } -namespace -{ - class theSvxUnoTextRangeImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextRangeImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextRange::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theSvxUnoTextRangeImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // XTextRange @@ -1785,15 +1780,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getTypes() return getStaticTypes(); } -namespace -{ - class theSvxUnoTextBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextBaseImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextBase::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theSvxUnoTextBaseImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection( const ESelection& rSel ) @@ -2379,14 +2369,9 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes( ) throw( uno::Runtime return SvxUnoTextBase::getTypes(); } -namespace -{ - class theSvxUnoTextImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( ) throw( uno::RuntimeException, std::exception ) { - return theSvxUnoTextImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } namespace diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index 5d37aeecd2bc..e66110241fd8 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -202,15 +202,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextContent::getTypes() return theSvxUnoTextContentTypes::get(); } -namespace -{ - class theSvxUnoTextContentImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextContentImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theSvxUnoTextContentImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // text::XTextRange @@ -564,15 +559,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextCursor::getTypes() return theSvxUnoTextCursorTypes::get(); } -namespace -{ - class theSvxUnoTextCursorImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextCursorImplementationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextCursor::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theSvxUnoTextCursorImplementationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // text::XTextCursor |