summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/inc')
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx6
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx61
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx6
3 files changed, 45 insertions, 28 deletions
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 5c5f5a30857b..6e2318eb7f89 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: TableController.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: fs $ $Date: 2001-06-21 17:43:46 $
+ * last change: $Author: oj $ $Date: 2001-07-02 10:31:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -126,14 +126,12 @@ namespace dbaui
void reSyncRows();
void assignTable(); // set the table if a name is given
void loadData();
- void fillTypeInfo(); // fills a vector with type info
sal_Bool checkColumns(sal_Bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names
String createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxTables,const String& _rDefault);
void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup,sal_Bool _bKeyColumns=sal_False);
void appendKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup);
void alterColumns();
void dropKey();
- void setColumnProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,const OFieldDescription* _pFieldDesc);
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const;
::rtl::OUString createUniqueName(const ::rtl::OUString& _rName);
void setTitle(const ::rtl::OUString & _rTitle);
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 50585297f6b7..c986c7062c10 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: UITools.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-02-28 10:10:01 $
+ * last change: $Author: oj $ $Date: 2001-07-02 10:31:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,30 +61,33 @@
#ifndef DBAUI_TOOLS_HXX
#define DBAUI_TOOLS_HXX
-#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
-#include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
-#include <com/sun/star/beans/XPropertySet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
-#include <com/sun/star/container/XNameAccess.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_
-#include <com/sun/star/lang/XEventListener.hpp>
-#endif
#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include <connectivity/dbexception.hxx>
#endif
#ifndef _VECTOR_
#include <vector>
#endif
+#ifndef DBAUI_TYPEINFO_HXX
+#include "TypeInfo.hxx"
+#endif
+
+// we only need forward decl here
+namespace com { namespace sun { namespace star {
+
+ namespace beans { class XPropertySet;}
+ namespace container { class XNameAccess;}
+ namespace lang
+ {
+ class XEventListener;
+ class XMultiServiceFactory;
+ }
+ namespace sdbc
+ {
+ class XDatabaseMetaData;
+ class XConnection;
+ }
+
+}}}
class Window;
// .........................................................................
@@ -132,6 +135,24 @@ namespace dbaui
getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxTable,
sal_Int32 _nKeyType);
+ /** fills a map and a vector with localized type names
+ @param _rxConnection the connection to acces the metadata
+ @param _rsTypeNames a list of localized type names seperated with ';'
+ @param _rTypeInfoMap the filled map with the type names
+ @param _rTypeInfoIters the vector filled with map iterators
+ */
+ void fillTypeInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection,
+ const String& _rsTypeNames,
+ OTypeInfoMap& _rTypeInfoMap,
+ ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters);
+
+ /** fill a column with data of a field description
+ @param _rxColumn the column which should be filled
+ @param _pFieldDesc the source of the data
+ */
+ class OFieldDescription;
+ void setColumnProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
+ const OFieldDescription* _pFieldDesc);
// .........................................................................
}
// .........................................................................
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 48cf81d0fb5c..9ad538404417 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: WCopyTable.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fme $ $Date: 2001-06-21 15:21:14 $
+ * last change: $Author: oj $ $Date: 2001-07-02 10:31:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -143,14 +143,12 @@ namespace dbaui
DECL_LINK( ImplOKHdl , OKButton* );
DECL_LINK( ImplActivateHdl, WizardDialog* );
void CheckColumns();
- void fillTypeInfo();
void loadData();
void construct();
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getKeyColumns() const;
// need for table creation
void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup,const ODatabaseExport::TColumnVector* _pVec,sal_Bool _bKeyColumns=sal_False);
void appendKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup,const ODatabaseExport::TColumnVector* _pVec);
- void setColumnProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,const OFieldDescription* _pFieldDesc);
protected:
OTypeInfoMap m_aTypeInfo;