summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/control/ColumnControlWindow.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-07-08 09:38:47 +0000
committerOliver Bolte <obo@openoffice.org>2005-07-08 09:38:47 +0000
commit7ca30bb7474442be06962d4342c1080f2ad5a772 (patch)
tree3a8e008cd40bea0bfba308fd6b218bf42e7189f4 /dbaccess/source/ui/control/ColumnControlWindow.cxx
parent52cd9a6e46dae1053dc20f1cdf1544f1a8d21a2e (diff)
INTEGRATION: CWS dba20blocker (1.3.134); FILE MERGED
2005/06/24 09:13:39 fs 1.3.134.3: #i46266# 2005/06/23 13:56:20 fs 1.3.134.2: oops. Didn't intend to move this change herein 2005/06/23 13:34:40 fs 1.3.134.1: copying fix for #i46266# into this CWS
Diffstat (limited to 'dbaccess/source/ui/control/ColumnControlWindow.cxx')
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index b9e77fc6539d..f87bfb79bb8b 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ColumnControlWindow.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: pjunck $ $Date: 2004-10-27 12:56:28 $
+ * last change: $Author: obo $ $Date: 2005-07-08 10:38:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,7 +116,7 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
- case tpAutoIncrement:
+// case tpAutoIncrement:
case tpColumnName:
break;
default:
@@ -130,7 +130,7 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
- case tpAutoIncrement:
+// case tpAutoIncrement:
case tpColumnName:
break;
default:
@@ -207,6 +207,8 @@ void OColumnControlWindow::setConnection(const Reference< XConnection>& _xCon)
Init();
::dbaui::fillTypeInfo(m_xConnection,m_sTypeNames,m_aDestTypeInfo,m_aDestTypeInfoIndex);
+ // read autoincrement value set in the datasource
+ ::dbaui::fillAutoIncrementValue(m_xConnection,m_bAutoIncrementEnabled,m_sAutoIncrementValue);
}
}
// -----------------------------------------------------------------------------