diff options
| -rw-r--r-- | dbaccess/source/ui/inc/RTableConnectionData.hxx | 11 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RTableConnection.cxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index ccd644bd0541..c90e987c44f9 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -26,10 +26,9 @@ namespace dbaui { - const sal_uInt16 CARDINAL_UNDEFINED = 0x0000; - const sal_uInt16 CARDINAL_ONE_MANY = 0x0001; - const sal_uInt16 CARDINAL_MANY_ONE = 0x0002; - const sal_uInt16 CARDINAL_ONE_ONE = 0x0004; + enum class Cardinality { + Undefined, OneMany, ManyOne, OneOne + }; class OConnectionLineData; class ORelationTableConnectionData : public OTableConnectionData @@ -41,7 +40,7 @@ namespace dbaui // @see com.sun.star.sdbc.KeyRule sal_Int32 m_nUpdateRules; sal_Int32 m_nDeleteRules; - sal_Int32 m_nCardinality; + Cardinality m_nCardinality; bool checkPrimaryKey(const css::uno::Reference< css::beans::XPropertySet>& i_xTable, EConnectionSide _eEConnectionSide) const; bool IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); } @@ -74,7 +73,7 @@ namespace dbaui inline sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } inline sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } - inline sal_Int32 GetCardinality() const { return m_nCardinality; } + inline Cardinality GetCardinality() const { return m_nCardinality; } bool IsConnectionPossible(); void ChangeOrientation(); diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 35d9798f17f5..61834237b388 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -52,7 +52,7 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re { OTableConnection::Draw(rRenderContext, rRect); ORelationTableConnectionData* pData = static_cast< ORelationTableConnectionData* >(GetData().get()); - if (pData && (pData->GetCardinality() == CARDINAL_UNDEFINED)) + if (pData && (pData->GetCardinality() == Cardinality::Undefined)) return; // search lines for top line @@ -91,20 +91,21 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re switch (pData->GetCardinality()) { - case CARDINAL_ONE_MANY: + case Cardinality::OneMany: aSourceText = "1"; aDestText = "n"; break; - case CARDINAL_MANY_ONE: + case Cardinality::ManyOne: aSourceText = "n"; aDestText = "1"; break; - case CARDINAL_ONE_ONE: + case Cardinality::OneOne: aSourceText = "1"; aDestText = "1"; break; + default: break; } if (IsSelected()) diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 88654ee89d0b..59733aa125a4 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -47,7 +47,7 @@ ORelationTableConnectionData::ORelationTableConnectionData() :OTableConnectionData() ,m_nUpdateRules(KeyRule::NO_ACTION) ,m_nDeleteRules(KeyRule::NO_ACTION) - ,m_nCardinality(CARDINAL_UNDEFINED) + ,m_nCardinality(Cardinality::Undefined) { } @@ -57,7 +57,7 @@ ORelationTableConnectionData::ORelationTableConnectionData( const TTableWindowDa :OTableConnectionData( _pReferencingTable, _pReferencedTable ) ,m_nUpdateRules(KeyRule::NO_ACTION) ,m_nDeleteRules(KeyRule::NO_ACTION) - ,m_nCardinality(CARDINAL_UNDEFINED) + ,m_nCardinality(Cardinality::Undefined) { m_aConnName = rConnName; @@ -127,20 +127,20 @@ void ORelationTableConnectionData::ChangeOrientation() void ORelationTableConnectionData::SetCardinality() { ::osl::MutexGuard aGuard( m_aMutex ); - m_nCardinality = CARDINAL_UNDEFINED; + m_nCardinality = Cardinality::Undefined; if( IsSourcePrimKey() ) { if( IsDestPrimKey() ) - m_nCardinality = CARDINAL_ONE_ONE; + m_nCardinality = Cardinality::OneOne; else - m_nCardinality = CARDINAL_ONE_MANY; + m_nCardinality = Cardinality::OneMany; } if( IsDestPrimKey() ) { if( !IsSourcePrimKey() ) - m_nCardinality = CARDINAL_MANY_ONE; + m_nCardinality = Cardinality::ManyOne; } } |