summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2001-03-01 12:29:19 +0000
committerFrank Schönheit <fs@openoffice.org>2001-03-01 12:29:19 +0000
commit6c48760989c68a78fd5e2d5a8e60dfbfb4edd159 (patch)
tree52a7984e87e583e44cbcb2bf692977f931b4c230
parent102086558874b2b2ec37a3f22eaaeb43e50d6e87 (diff)
+createTableWindowData
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx7
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx7
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx7
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx10
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx11
6 files changed, 35 insertions, 13 deletions
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index cbf395b0d05d..85fe260ff0bf 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinController.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:04:53 $
+ * last change: $Author: fs $ $Date: 2001-03-01 13:27:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -152,6 +152,9 @@ namespace dbaui
//
virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn);
virtual void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut);
+
+ protected:
+ virtual OTableWindowData* createTableWindowData() = 0;
};
}
#endif // DBAUI_JOINCONTROLLER_HXX
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index fb7dd72c9b54..5f6a65effddf 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RelationController.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:04:44 $
+ * last change: $Author: fs $ $Date: 2001-03-01 13:27:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -122,6 +122,9 @@ namespace dbaui
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
// lang::XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+ protected:
+ virtual OTableWindowData* createTableWindowData();
};
}
#endif // DBAUI_RELATIONCONTROLLER_HXX
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 4c67761a9168..1186970f0df1 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querycontroller.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:10:02 $
+ * last change: $Author: fs $ $Date: 2001-03-01 13:27:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -217,6 +217,9 @@ namespace dbaui
//
virtual void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxIn);
virtual void Save(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOut);
+
+ protected:
+ virtual OTableWindowData* createTableWindowData();
};
}
#endif // DBAUI_QUERYCONTROLLER_HXX
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 991975c3eee5..c8ee1a2aa63f 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: JoinController.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:16:07 $
+ * last change: $Author: fs $ $Date: 2001-03-01 13:27:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -265,7 +265,7 @@ void OJoinController::Load(const Reference< XObjectInputStream>& _rxIn)
_rxIn >> nCount;
for(sal_Int32 i=0;i<nCount;++i)
{
- OTableWindowData* pData = new OTableWindowData();
+ OTableWindowData* pData = createTableWindowData();
pData->Load(_rxIn);
m_vTableData.push_back(pData);
}
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index d06577a54e6c..047ca2841a45 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querycontroller.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:18:26 $
+ * last change: $Author: fs $ $Date: 2001-03-01 13:27:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1000,8 +1000,14 @@ void OQueryController::Load(const Reference< XObjectInputStream>& _rxIn)
{
}
}
+
// -----------------------------------------------------------------------------
+OTableWindowData* OQueryController::createTableWindowData()
+{
+ return new OQueryTableWindowData();
+}
+// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 5eb8c425a690..4abd23eb9315 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RelationController.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:06:31 $
+ * last change: $Author: fs $ $Date: 2001-03-01 13:29:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -549,6 +549,13 @@ sal_Bool ORelationController::existsTable(const ::rtl::OUString& _rComposedTable
}
return aIter != m_vTableData.end();
}
+
+// -----------------------------------------------------------------------------
+OTableWindowData* ORelationController::createTableWindowData()
+{
+ return new OTableWindowData();
+}
+
// -----------------------------------------------------------------------------
//void ORelationController::appendColumns(Reference<XColumnsSupplier>& _rxColSup,sal_Bool _bKeyColumns)
//{