sc: simplify deprecated XTypeProvider.getImplementationId

Change-Id: I4ecb4db1fdebf6f5f29262474d1e7cc490792a7f

22 files changed, 30 insertions, 218 deletions

diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index d5e556476384..5d81b4b22fab 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -70,7 +70,6 @@ private:
     ::com::sun::star::beans::XPropertySet*                                  pShapePropertySet;
     ::com::sun::star::beans::XPropertyState*                                pShapePropertyState;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo;
-    com::sun::star::uno::Sequence< sal_Int8 >*                              pImplementationId;
     bool                                                                    bIsTextShape;
     bool                                                                    bIsNoteCaption;
     bool                                                                    bInitializedNotifier;
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 9eb68d073578..9d8cf37ccc87 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -299,16 +299,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes()
     return comphelper::concatSequences(ScAccessibleCellBaseImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
-namespace
-{
-    class theScAccessibleCellBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCellBaseImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleCellBase::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleCellBaseImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 bool ScAccessibleCellBase::IsEditable(
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index ea73791b6620..490861e27f4c 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -498,16 +498,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes()
     return comphelper::concatSequences(ScAccessibleContextBaseWeakImpl::getTypes(), ScAccessibleContextBaseImplEvent::getTypes());
 }
 
-namespace
-{
-    class theScAccessibleContextBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleContextBaseImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleContextBase::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleContextBaseImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //=====  internal  ============================================================
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index f476434571f2..149580927a89 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -758,14 +758,9 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes(
     return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
 }
 
-namespace
-{
-    class theScAccessibleCsvRulerImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCsvRulerImplementationId > {};
-}
-
 Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return theScAccessibleCsvRulerImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
@@ -1269,14 +1264,9 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes()
     return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
 }
 
-namespace
-{
-    class theScAccessibleCsvGridImplementationId  : public rtl::Static< UnoTunnelIdInit, theScAccessibleCsvGridImplementationId > {};
-}
-
 Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return theScAccessibleCsvGridImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index fba49063987a..aca4092cf217 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -518,15 +518,10 @@ OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void)
 
     ///=====  XTypeProvider  ===================================================
 
-namespace
-{
-    class theScAccessibleDataPilotControlImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleDataPilotControlImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementationId(void)
         throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleDataPilotControlImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
     //=====  internal  ========================================================
@@ -748,15 +743,10 @@ OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void)
 
     ///=====  XTypeProvider  ===================================================
 
-namespace
-{
-    class theScAccessibleDataPilotButtonImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleDataPilotButtonImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationId(void)
         throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-    return theScAccessibleDataPilotButtonImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 2dc2db758c0a..00f7d5679809 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2098,16 +2098,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes()
     return comphelper::concatSequences(ScAccessibleDocumentImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
-namespace
-{
-    class theScAccessibleDocumentImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleDocumentImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleDocument::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleDocumentImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 ///=====  IAccessibleViewForwarder  ========================================
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 7a538168bcd8..151c298a572c 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1610,16 +1610,11 @@ uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedS
 
 //=====  XTypeProvider  =======================================================
 
-namespace
-{
-    class theScAccessibleDocumentPagePreviewImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleDocumentPagePreviewImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleDocumentPagePreview::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleDocumentPagePreviewImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //=====  internal  ========================================================
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 248a857d2f12..44e29b6ecb99 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -332,16 +332,11 @@ OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void)
 
 //=====  XTypeProvider  =======================================================
 
-namespace
-{
-    class theScAccessibleEditObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleEditObjectImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleEditObject::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleEditObjectImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
     //====  internal  =========================================================
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index ba055d14f976..3de43d43042d 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -262,8 +262,7 @@ void SAL_CALL ScAccessibleFilterMenu::release() throw ()
 Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId()
     throw (RuntimeException, std::exception)
 {
-    Sequence<sal_Int8> aId(16);
-    return aId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 66bc786ad466..78f8579726b5 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -203,16 +203,11 @@ uno::Sequence< OUString> SAL_CALL
 
 //=====  XTypeProvider  =======================================================
 
-namespace
-{
-    class theScAccessiblePageHeaderAreaImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessiblePageHeaderAreaImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePageHeaderArea::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessiblePageHeaderAreaImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //===== internal ==============================================================
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 9e456b6845f4..23650ecbc8e8 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -199,16 +199,11 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNam
 
 //=====  XTypeProvider  =======================================================
 
-namespace
-{
-    class theScAccessiblePreviewCellImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessiblePreviewCellImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePreviewCell::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessiblePreviewCellImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //====  internal  =========================================================
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 90cdb99bd2c5..fdfa6eeb2834 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -316,16 +316,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes()
     return comphelper::concatSequences(ScAccessiblePreviewHeaderCellImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
-namespace
-{
-    class theScAccessiblePreviewHeaderCellImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessiblePreviewHeaderCellImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePreviewHeaderCell::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessiblePreviewHeaderCellImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //====  internal  =========================================================
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 9a9e677d5929..1dd15c14f54c 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -594,15 +594,10 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewTable::getTypes()
     return comphelper::concatSequences(ScAccessiblePreviewTableImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
-namespace
-{
-    class theScAccessiblePreviewTableImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessiblePreviewTableImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScAccessiblePreviewTableImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //====  internal  =========================================================
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 1a4589cc1596..cc34fe4e19d6 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1327,16 +1327,11 @@ uno::Sequence< OUString> SAL_CALL
 
 //=====  XTypeProvider  =======================================================
 
-namespace
-{
-    class theScAccessibleSpreadsheetImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleSpreadsheetImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleSpreadsheet::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleSpreadsheetImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 ///=====  XAccessibleEventBroadcaster  =====================================
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 9edf44b4ed62..f3d641a0397d 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -464,16 +464,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes()
     return comphelper::concatSequences(ScAccessibleTableBaseImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
-namespace
-{
-    class theScAccessibleTableBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleTableBaseImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleTableBase::getImplementationId(void)
     throw (uno::RuntimeException, std::exception)
 {
-    return theScAccessibleTableBaseImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void ScAccessibleTableBase::CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index fa46980e3a18..9c8475323fbe 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1796,15 +1796,10 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::Runtim
     return aTypes;
 }
 
-namespace
-{
-    class theScCellRangesBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScCellRangesBaseImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScCellRangesBaseImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
@@ -4218,15 +4213,10 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime
     return aTypes;
 }
 
-namespace
-{
-    class theScCellRangesObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScCellRangesObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScCellRangesObj::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScCellRangesObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XCellRanges
@@ -4882,15 +4872,10 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE
     return aTypes;
 }
 
-namespace
-{
-    class theScCellRangeObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScCellRangeObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScCellRangeObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XCellRange
@@ -6174,14 +6159,9 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept
     return aTypes;
 }
 
-namespace
-{
-    class theScCellObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScCellObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::RuntimeException, std::exception)
 {
-    return theScCellObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //  Hilfsfunktionen
@@ -6966,14 +6946,9 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime
     return aTypes;
 }
 
-namespace
-{
-    class theScTableSheetObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScTableSheetObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() throw(uno::RuntimeException, std::exception)
 {
-    return theScTableSheetObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 //  Hilfsfunktionen
@@ -8783,14 +8758,9 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim
     return aTypes;
 }
 
-namespace
-{
-    class theScTableColumnObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScTableColumnObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(uno::RuntimeException, std::exception)
 {
-    return theScTableColumnObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XNamed
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index cd931df9fa61..b02f1bf975e4 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -90,14 +90,9 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime
     return aTypes;
 }
 
-namespace
-{
-    class theScCellCursorObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScCellCursorObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() throw(uno::RuntimeException, std::exception)
 {
-    return theScCellCursorObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XSheetCellCursor
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index e2794163e398..48fdf5ebb2c4 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -650,15 +650,10 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes()
     return aTypes;
 }
 
-namespace
-{
-    class theScDataPilotDescriptorBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScDataPilotDescriptorBaseImplementationId > {};
-}
-
 Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId()
                                                     throw(RuntimeException, std::exception)
 {
-    return theScDataPilotDescriptorBaseImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -1161,15 +1156,10 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce
     return aTypes;
 }
 
-namespace
-{
-    class theScDataPilotTableObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScDataPilotTableObjImplementationId > {};
-}
-
 Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId()
                                                     throw(RuntimeException, std::exception)
 {
-    return theScDataPilotTableObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 8a1cd1c3df2b..41ff1053113d 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -551,15 +551,10 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep
     return aTypes;
 }
 
-namespace
-{
-    class theScModelObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScModelObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScModelObj::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScModelObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 3930447450d9..a20cb578bf32 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -1475,15 +1475,10 @@ uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeE
     return aTypes;
 }
 
-namespace
-{
-    class theScEditFieldObjImplementationId : public rtl::Static<UnoTunnelIdInit, theScEditFieldObjImplementationId> {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScEditFieldObj::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScEditFieldObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index b3c7e6b98d5b..55378f740876 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <map>
-
 #include <comphelper/uno3.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
@@ -48,12 +46,6 @@
 
 using namespace ::com::sun::star;
 
-
-
-typedef std::map<OUString, uno::Sequence< sal_Int8 > *> ScShapeImplementationIdMap;
-
-static ScShapeImplementationIdMap aImplementationIdMap;
-
 static const SfxItemPropertyMapEntry* lcl_GetShapeMap()
 {
     static const SfxItemPropertyMapEntry aShapeMap_Impl[] =
@@ -104,7 +96,6 @@ namespace
 ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
       pShapePropertySet(NULL),
       pShapePropertyState(NULL),
-      pImplementationId(NULL),
       bIsTextShape(false),
       bIsNoteCaption(false),
       bInitializedNotifier(false)
@@ -1355,44 +1346,7 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep
 uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    SolarMutexGuard aGuard;
-    // do we need to compute the implementation id for this instance?
-    if( !pImplementationId && mxShapeAgg.is())
-    {
-        uno::Reference< drawing::XShape > xAggShape;
-        mxShapeAgg->queryAggregation( ::getCppuType((uno::Reference< drawing::XShape >*)0) ) >>= xAggShape;
-
-        if( xAggShape.is() )
-        {
-            const OUString aShapeType( xAggShape->getShapeType() );
-            // did we already compute an implementation id for the aggregated shape type?
-            ScShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) );
-            if( aIter == aImplementationIdMap.end() )
-            {
-                // we need to create a new implementation id for this
-                // note: this memory is not free'd until application exits
-                //       but since we have a fixed set of shapetypes and the
-                //       memory will be reused this is ok.
-                pImplementationId = new uno::Sequence< sal_Int8 >( 16 );
-                rtl_createUuid( (sal_uInt8 *) pImplementationId->getArray(), 0, sal_True );
-                aImplementationIdMap[ aShapeType ] = pImplementationId;
-            }
-            else
-            {
-                // use the already computed implementation id
-                pImplementationId = (*aIter).second;
-            }
-        }
-    }
-    if( NULL == pImplementationId )
-    {
-        OSL_FAIL( "Could not create an implementation id for a ScXShape!" );
-        return uno::Sequence< sal_Int8 > ();
-    }
-    else
-    {
-        return *pImplementationId;
-    }
+    return css::uno::Sequence<sal_Int8>();
 }
 
 SdrObject* ScShapeObj::GetSdrObject() const throw()
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index f7dd8ad43719..6004377a59a9 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -176,15 +176,10 @@ uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeE
     return aTypes;
 }
 
-namespace
-{
-    class theScViewPaneBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScViewPaneBaseImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScViewPaneBase::getImplementationId()
                                                     throw(uno::RuntimeException, std::exception)
 {
-    return theScViewPaneBaseImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XViewPane
@@ -639,15 +634,10 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc
     return aTypes;
 }
 
-namespace
-{
-    class theScTabViewObjImplementationId : public rtl::Static< UnoTunnelIdInit, theScTabViewObjImplementationId > {};
-}
-
 uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId()
                                                 throw(uno::RuntimeException, std::exception)
 {
-    return theScTabViewObjImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XDocumentView