User: hr Date: 2007-09-26 14:53:24+0000 Modified: dba/dbaccess/source/ui/relationdesign/RelationController.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationController.cxx?r1=1.47&r2=1.48 Delta lines: +6 -3 ------------------- --- RelationController.cxx 2007-07-06 08:41:42+0000 1.47 +++ RelationController.cxx 2007-09-26 14:53:22+0000 1.48 @@ -309,7 +309,7 @@ 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 @@ Reference<XPropertySet> xPropSet; xColumns->getByName(*pIter) >>= xPropSet; OSL_ENSURE(xPropSet.is(),"Invalid column found in KeyColumns!"); + if ( xPropSet.is() ) + { xPropSet->getPropertyValue(PROPERTY_NAME) >>= sColumnName; xPropSet->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedName; + } pTabConnData->SetConnLine( j, sColumnName, sRelatedName ); } ////////////////////////////////////////////////////////////////////// --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
