#86528# some outlining

8 files changed, 72 insertions, 36 deletions

diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 9cc320d48fa4e..35087df0bba35 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDeco.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-27 08:17:54 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:16:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -653,5 +653,19 @@ Reference< XPropertySet > ODBTableDecorator::createEmptyObject()
     return xRet;
 }
 // -----------------------------------------------------------------------------
+void SAL_CALL ODBTableDecorator::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTableDescriptor_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODBTableDecorator::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTableDescriptor_BASE::release();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException)
+{
+}
+// -----------------------------------------------------------------------------
 
 
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index e198f290da92b..3db151f01e8de 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycomposer.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-11 06:21:33 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:15:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1239,3 +1239,15 @@ Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters(  ) throw(Runti
     return m_pParameters;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL OQueryComposer::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OSubComponent::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OQueryComposer::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OSubComponent::release();
+}
+// -----------------------------------------------------------------------------
+
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index fc466dbd7ec3a..5ed86bc8ffa59 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-27 08:16:16 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:16:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -685,6 +685,17 @@ Reference< XPropertySet > ODBTable::createEmptyObject()
     return xRet;
 }
 // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void SAL_CALL ODBTable::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_Base::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ODBTable::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    OTable_Base::release();
+}
+// -----------------------------------------------------------------------------
 
 
 
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 91afde07751aa..0540581a464dd 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablecontainer.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: fs $ $Date: 2001-04-27 12:06:09 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:16:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -804,4 +804,14 @@ void SAL_CALL OTableContainer::dropByIndex( sal_Int32 index ) throw(SQLException
     dropByName((*m_aElements[index]).first);
 }
 // -------------------------------------------------------------------------
+void SAL_CALL OTableContainer::acquire() throw(::com::sun::star::uno::RuntimeException)
+{
+    m_rParent.acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL OTableContainer::release() throw(::com::sun::star::uno::RuntimeException)
+{
+    m_rParent.release();
+}
+// -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index 31022f5eeeb19..0504b57c66b7a 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableDeco.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-24 14:41:30 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:15:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -197,6 +197,8 @@ namespace dbaccess
 
         //XInterface
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException);
         //XTypeProvider
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
@@ -206,10 +208,6 @@ namespace dbaccess
 
     // ::com::sun::star::lang::XServiceInfo
         DECLARE_SERVICE_INFO();
-        // XInterface
-        DECLARE_CTY_DEFAULTS(OTableDescriptor_BASE);
-
-
         // XPropertySet
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
     // ::com::sun::star::sdbcx::XRename,
@@ -221,9 +219,7 @@ namespace dbaccess
 
         // XNamed
         virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException)
-        {
-        }
+        virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
         // com::sun::star::lang::XUnoTunnel
         virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index 016cb2147ad84..022e030bcc6e2 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycomposer.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-03-01 11:04:49 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:15:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -167,8 +167,6 @@ namespace dbaccess
 
         ~OQueryComposer();
 
-        DECLARE_CTY_DEFAULTS(OSubComponent);  // impl acquire and release
-
         void SAL_CALL disposing(void);
         // ::com::sun::star::lang::XTypeProvider
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
@@ -178,6 +176,8 @@ namespace dbaccess
         // ::com::sun::star::uno::XInterface
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
                 throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException);
         // XServiceInfo
         virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index f320c6ee57ce1..85b2e476ca358 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.hxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: oj $ $Date: 2001-04-20 13:09:12 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:15:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -180,15 +180,14 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
 
     // com::sun::star::uno::XInterface
-        //  virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException);
 
     // OComponentHelper
         virtual void SAL_CALL disposing(void);
 
     // ::com::sun::star::lang::XServiceInfo
         DECLARE_SERVICE_INFO();
-        // XInterface
-        DECLARE_CTY_DEFAULTS(OTable_Base);
 
     // com::sun::star::beans::XPropertySet
         //  virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index ef624849fcb8a..2be47263a1272 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tablecontainer.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-02 17:02:08 $
+ *  last change: $Author: oj $ $Date: 2001-04-30 10:15:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -202,14 +202,8 @@ namespace dbaccess
         virtual void SAL_CALL disposing();
 
         // XInterface
-        virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException)
-        {
-            m_rParent.acquire();
-        }
-        virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException)
-        {
-            m_rParent.release();
-        }
+        virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException);
     // ::com::sun::star::lang::XServiceInfo
         DECLARE_SERVICE_INFO();