Tag: cws_src680_dba24 User: oj Date: 05/02/25 03:42:23 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx
Log: #i42056# merge problem File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.8.2.11&r2=1.8.2.12 Delta lines: +7 -7 ------------------- --- databasedocument.cxx 25 Feb 2005 10:29:05 -0000 1.8.2.11 +++ databasedocument.cxx 25 Feb 2005 11:42:20 -0000 1.8.2.12 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.8.2.11 $ + * $Revision: 1.8.2.12 $ * - * last change: $Author: oj $ $Date: 2005/02/25 10:29:05 $ + * last change: $Author: oj $ $Date: 2005/02/25 11:42:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -291,11 +291,6 @@ if ( !m_pImpl->m_sName.getLength() ) m_pImpl->m_sName = m_pImpl->m_sFileURL; - if ( m_pImpl->m_pDBContext ) - { - m_pImpl->m_pDBContext->registerPrivate(_sURL,m_pImpl); - m_pImpl->setModified(sal_False); - } m_pImpl->getStorage(); Reference<XDataSource> xDs = m_pImpl->getDataSource(); @@ -347,6 +342,11 @@ { return sal_False; } + if ( m_pImpl->m_pDBContext ) + { + m_pImpl->m_pDBContext->registerPrivate(_sURL,m_pImpl); + m_pImpl->setModified(sal_False); + } return sal_True; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
