Tag: cws_src680_dba24a User: oj Date: 2007-08-28 07:01:05+0000 Modified: dba/dbaccess/source/ui/relationdesign/RelationController.cxx dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx
Log: #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.47.18.1 Delta lines: +4 -4 ------------------- --- RelationController.cxx 2007-07-06 08:41:42+0000 1.47 +++ RelationController.cxx 2007-08-28 07:01:02+0000 1.47.18.1 @@ -4,9 +4,9 @@ * * $RCSfile: RelationController.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.47.18.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:41:42 $ + * last change: $Author: oj $ $Date: 2007/08/28 07:01:02 $ * * 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 @@ connectionLostMessage(); throw SQLException(); } - else if(getMetaData().is() && !getMetaData()->supportsIntegrityEnhancementFacility()) + else if( !getSdbMetaData().supportsRelations() ) {// check if this database supports relations setEditable(sal_False); File [changed]: RelationTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx?r1=1.24&r2=1.24.118.1 Delta lines: +4 -24 -------------------- --- RelationTableView.cxx 2006-09-17 07:28:33+0000 1.24 +++ RelationTableView.cxx 2007-08-28 07:01:02+0000 1.24.118.1 @@ -4,9 +4,9 @@ * * $RCSfile: RelationTableView.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.118.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 07:28:33 $ + * last change: $Author: oj $ $Date: 2007/08/28 07:01:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -237,27 +237,7 @@ { DBG_CHKTHIS(ORelationTableView,NULL); - BOOL bAllowed = !m_pView->getController()->isReadOnly(); - if ( bAllowed ) - { - Reference<XConnection> xConnection = m_pView->getController()->getConnection(); - if(!xConnection.is()) - bAllowed = FALSE; - else - { - try - { - Reference < XDatabaseMetaData > xMetaData( xConnection->getMetaData() ); - OSL_ENSURE(xMetaData.is(),"ORelationTableView::IsAddAllowed: The metadata is null!"); - - bAllowed = xMetaData.is() && xMetaData->supportsIntegrityEnhancementFacility(); - } - catch(const SQLException&) - { - } - } - } - return bAllowed; + return !m_pView->getController()->isReadOnly(); } //------------------------------------------------------------------------ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
