diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-26 13:53:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-26 13:53:22 +0000 |
| commit | 03ef7c3237937a72e72f585d20ce0045c3682d03 (patch) | |
| tree | 56f61980b5fa402ff4e949edcd335c40be5d8b4d /dbaccess/source/ui/relationdesign | |
| parent | 3bc972bf1aea0aeb788228a3175333f3a2705745 (diff) | |
INTEGRATION: CWS dba24a (1.47.18); FILE MERGED
2007/09/25 11:24:08 oj 1.47.18.2: #i81922# new method to compare relation data
2007/08/28 07:01:02 oj 1.47.18.1: #i68858# enable relation for mysql inodb
Diffstat (limited to 'dbaccess/source/ui/relationdesign')
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationController.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index e90ebbe9ce25..c915b1d2624b 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -4,9 +4,9 @@ * * $RCSfile: RelationController.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: rt $ $Date: 2007-07-06 08:41:42 $ + * last change: $Author: hr $ $Date: 2007-09-26 14:53:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -309,7 +309,7 @@ void ORelationController::impl_initialize() connectionLostMessage(); throw SQLException(); } - else if(getMetaData().is() && !getMetaData()->supportsIntegrityEnhancementFacility()) + else if( !getSdbMetaData().supportsRelations() ) {// check if this database supports relations setEditable(sal_False); @@ -495,8 +495,11 @@ void ORelationController::loadTableData(const Any& _aTable) Reference<XPropertySet> xPropSet; xColumns->getByName(*pIter) >>= xPropSet; OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!"); - xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; - xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; + if ( xPropSet.is() ) + { + xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; + xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; + } pTabConnData->SetConnLine( j, sColumnName, sRelatedName ); } ////////////////////////////////////////////////////////////////////// |