summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/inc/FieldDescriptions.hxx85
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescriptions.cxx39
2 files changed, 74 insertions, 50 deletions
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index a0d882f76d59..012f50a4a639 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FieldDescriptions.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2001-06-12 09:59:19 $
+ * last change: $Author: oj $ $Date: 2002-07-22 12:11:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,7 @@
namespace dbaui
{
class OFieldDescription
+
{
private:
const OTypeInfo* m_pType;
@@ -88,6 +89,7 @@ namespace dbaui
::rtl::OUString m_sTypeName;
::rtl::OUString m_sDescription;
::rtl::OUString m_sDefaultValue;
+ ::rtl::OUString m_sAutoIncrementValue;
sal_Int32 m_nType; // only used when m_pType is null
sal_Int32 m_nPrecision;
sal_Int32 m_nScale;
@@ -105,6 +107,7 @@ namespace dbaui
const ::rtl::OUString& _sTypeName,
const ::rtl::OUString& _sDescription,
const ::rtl::OUString& _sDefaultValue,
+ const ::rtl::OUString& _sAutoIncrementValue,
const OTypeInfo* _pType,
sal_Int32 _nPrecision,
sal_Int32 _nScale,
@@ -113,55 +116,41 @@ namespace dbaui
SvxCellHorJustify _eHorJustify,
sal_Bool _bIsAutoIncrement,
sal_Bool _bIsPrimaryKey,
- sal_Bool _bIsCurrency) :
- m_sName(_sName)
- ,m_sTypeName(_sTypeName)
- ,m_sDescription(_sDescription)
- ,m_sDefaultValue(_sDefaultValue)
- ,m_pType(_pType)
- ,m_nPrecision(_nPrecision)
- ,m_nScale(_nScale)
- ,m_nIsNullable(_nIsNullable)
- ,m_nFormatKey(_nFormatKey)
- ,m_eHorJustify(_eHorJustify)
- ,m_bIsAutoIncrement(_bIsAutoIncrement)
- ,m_bIsPrimaryKey(_bIsPrimaryKey)
- ,m_bIsCurrency(_bIsCurrency)
- {
- }
+ sal_Bool _bIsCurrency);
OFieldDescription( const OFieldDescription& rDescr );
- virtual ~OFieldDescription();
+ ~OFieldDescription();
- void SetName(const ::rtl::OUString& _rName) { m_sName = _rName; }
- // void SetTypeName(const ::rtl::OUString& _rTypeName) { m_sTypeName = _rTypeName; }
- void SetDescription(const ::rtl::OUString& _rDescription) { m_sDescription = _rDescription; }
- void SetDefaultValue(const ::rtl::OUString& _rDefaultValue) { m_sDefaultValue = _rDefaultValue; }
- void SetType(const OTypeInfo* _pType) { m_pType = _pType; if (m_pType) m_nType = m_pType->nType; }
- void SetTypeValue(sal_Int32 _nType) { m_nType = _nType; OSL_ENSURE(!m_pType,"Invalid call here!");}
- void SetPrecision(const sal_Int32& _rPrecision) { m_nPrecision = _rPrecision; }
- void SetScale(const sal_Int32& _rScale) { m_nScale = _rScale; }
- void SetIsNullable(const sal_Int32& _rIsNullable) { m_nIsNullable = _rIsNullable; }
- void SetFormatKey(const sal_Int32& _rFormatKey) { m_nFormatKey = _rFormatKey; }
- void SetHorJustify(const SvxCellHorJustify& _rHorJustify) { m_eHorJustify = _rHorJustify; }
- void SetAutoIncrement(sal_Bool _bAuto) { m_bIsAutoIncrement = _bAuto; }
- void SetPrimaryKey(sal_Bool _bPKey) { m_bIsPrimaryKey = _bPKey; }
- void SetCurrency(sal_Bool _bIsCurrency) { m_bIsCurrency = _bIsCurrency; }
+ void SetName(const ::rtl::OUString& _rName) { m_sName = _rName; }
+ // void SetTypeName(const ::rtl::OUString& _rTypeName) { m_sTypeName = _rTypeName; }
+ void SetDescription(const ::rtl::OUString& _rDescription) { m_sDescription = _rDescription; }
+ void SetDefaultValue(const ::rtl::OUString& _rDefaultValue) { m_sDefaultValue = _rDefaultValue; }
+ void SetAutoIncrementValue(const ::rtl::OUString& _sAutoIncValue) { m_sAutoIncrementValue = _sAutoIncValue; }
+ void SetType(const OTypeInfo* _pType) { m_pType = _pType; if (m_pType) m_nType = m_pType->nType; }
+ void SetTypeValue(sal_Int32 _nType) { m_nType = _nType; OSL_ENSURE(!m_pType,"Invalid call here!");}
+ void SetPrecision(const sal_Int32& _rPrecision) { m_nPrecision = _rPrecision; }
+ void SetScale(const sal_Int32& _rScale) { m_nScale = _rScale; }
+ void SetIsNullable(const sal_Int32& _rIsNullable) { m_nIsNullable = _rIsNullable; }
+ void SetFormatKey(const sal_Int32& _rFormatKey) { m_nFormatKey = _rFormatKey; }
+ void SetHorJustify(const SvxCellHorJustify& _rHorJustify) { m_eHorJustify = _rHorJustify; }
+ void SetAutoIncrement(sal_Bool _bAuto) { m_bIsAutoIncrement = _bAuto; }
+ void SetPrimaryKey(sal_Bool _bPKey) { m_bIsPrimaryKey = _bPKey; }
+ void SetCurrency(sal_Bool _bIsCurrency) { m_bIsCurrency = _bIsCurrency; }
- ::rtl::OUString GetName() const { return m_sName; }
- // ::rtl::OUString GetTypeName() const { return m_sTypeName; }
- ::rtl::OUString GetDescription() const { return m_sDescription; }
- ::rtl::OUString GetDefaultValue() const { return m_sDefaultValue; }
- sal_Int32 GetType() const { return m_pType ? m_pType->nType : m_nType; }
- sal_Int32 GetPrecision() const { return m_nPrecision; }
- sal_Int32 GetScale() const { return m_nScale; }
- sal_Int32 GetIsNullable() const { return m_nIsNullable; }
- sal_Int32 GetFormatKey() const { return m_nFormatKey; }
- SvxCellHorJustify GetHorJustify() const { return m_eHorJustify; }
- const OTypeInfo* getTypeInfo() const { return m_pType; }
- sal_Bool IsAutoIncrement() const { return m_bIsAutoIncrement; }
- sal_Bool IsPrimaryKey() const { return m_bIsPrimaryKey; }
- sal_Bool IsCurrency() const { return m_bIsCurrency; }
- sal_Bool IsNullable() const { return m_nIsNullable == ::com::sun::star::sdbc::ColumnValue::NULLABLE; }
+ ::rtl::OUString GetName() const { return m_sName; }
+ ::rtl::OUString GetDescription() const { return m_sDescription; }
+ ::rtl::OUString GetDefaultValue() const { return m_sDefaultValue; }
+ ::rtl::OUString GetAutoIncrementValue() const { return m_sAutoIncrementValue; }
+ sal_Int32 GetType() const { return m_pType ? m_pType->nType : m_nType; }
+ sal_Int32 GetPrecision() const { return m_nPrecision; }
+ sal_Int32 GetScale() const { return m_nScale; }
+ sal_Int32 GetIsNullable() const { return m_nIsNullable; }
+ sal_Int32 GetFormatKey() const { return m_nFormatKey; }
+ SvxCellHorJustify GetHorJustify() const { return m_eHorJustify; }
+ const OTypeInfo* getTypeInfo() const { return m_pType; }
+ sal_Bool IsAutoIncrement() const { return m_bIsAutoIncrement; }
+ sal_Bool IsPrimaryKey() const { return m_bIsPrimaryKey; }
+ sal_Bool IsCurrency() const { return m_bIsCurrency; }
+ sal_Bool IsNullable() const { return m_nIsNullable == ::com::sun::star::sdbc::ColumnValue::NULLABLE; }
};
}
#endif // DBAUI_FIELDDESCRIPTIONS_HXX
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 4786f8ee7b5e..955e6795409e 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FieldDescriptions.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: oj $ $Date: 2001-07-02 10:31:49 $
+ * last change: $Author: oj $ $Date: 2002-07-22 12:11:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -115,6 +115,7 @@ OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) :
,m_sTypeName(rDescr.m_sTypeName)
,m_sDescription(rDescr.m_sDescription)
,m_sDefaultValue(rDescr.m_sDefaultValue)
+ ,m_sAutoIncrementValue(rDescr.m_sAutoIncrementValue)
,m_pType(rDescr.m_pType)
,m_nPrecision(rDescr.m_nPrecision)
,m_nScale(rDescr.m_nScale)
@@ -127,6 +128,38 @@ OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) :
{
DBG_CTOR(OFieldDescription,NULL);
}
+// -----------------------------------------------------------------------------
+OFieldDescription::OFieldDescription( const ::rtl::OUString& _sName,
+ const ::rtl::OUString& _sTypeName,
+ const ::rtl::OUString& _sDescription,
+ const ::rtl::OUString& _sDefaultValue,
+ const ::rtl::OUString& _sAutoIncrementValue,
+ const OTypeInfo* _pType,
+ sal_Int32 _nPrecision,
+ sal_Int32 _nScale,
+ sal_Int32 _nIsNullable,
+ sal_Int32 _nFormatKey,
+ SvxCellHorJustify _eHorJustify,
+ sal_Bool _bIsAutoIncrement,
+ sal_Bool _bIsPrimaryKey,
+ sal_Bool _bIsCurrency) :
+ m_sName(_sName)
+,m_sTypeName(_sTypeName)
+,m_sDescription(_sDescription)
+,m_sDefaultValue(_sDefaultValue)
+,m_sAutoIncrementValue(_sAutoIncrementValue)
+,m_pType(_pType)
+,m_nPrecision(_nPrecision)
+,m_nScale(_nScale)
+,m_nIsNullable(_nIsNullable)
+,m_nFormatKey(_nFormatKey)
+,m_eHorJustify(_eHorJustify)
+,m_bIsAutoIncrement(_bIsAutoIncrement)
+,m_bIsPrimaryKey(_bIsPrimaryKey)
+,m_bIsCurrency(_bIsCurrency)
+{
+ DBG_DTOR(OFieldDescription,NULL);
+}
//------------------------------------------------------------------------------
OFieldDescription::~OFieldDescription()
@@ -157,6 +190,8 @@ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedC
SetDescription(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_DESCRIPTION)));
if(xPropSetInfo->hasPropertyByName(PROPERTY_DEFAULTVALUE))
SetDefaultValue(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_DEFAULTVALUE)));
+ if(xPropSetInfo->hasPropertyByName(PROPERTY_AUTOINCREMENTVALUE))
+ SetAutoIncrementValue(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_AUTOINCREMENTVALUE)));
if(xPropSetInfo->hasPropertyByName(PROPERTY_TYPE))
SetTypeValue(::comphelper::getINT32(xAffectedCol->getPropertyValue(PROPERTY_TYPE)));
if(xPropSetInfo->hasPropertyByName(PROPERTY_PRECISION))