User: vg Date: 05/03/10 08:35:33 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: INTEGRATION: CWS dba24 (1.19.2); FILE MERGED 2005/02/22 10:07:21 oj 1.19.2.5: build problems 2005/02/21 13:09:11 oj 1.19.2.4: RESYNC: (1.19-1.20); FILE MERGED 2005/02/18 12:25:27 oj 1.19.2.3: #i42460# changes for the separation of datasource and database document(model) 2005/02/04 14:16:16 oj 1.19.2.2: #i42056# remember password if said so 2005/01/31 08:53:08 oj 1.19.2.1: #i40866# impl delete File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.20&r2=1.21 Delta lines: +13 -5 -------------------- --- documentdefinition.cxx 17 Feb 2005 11:04:03 -0000 1.20 +++ documentdefinition.cxx 10 Mar 2005 16:35:30 -0000 1.21 @@ -250,6 +250,7 @@ using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; +namespace css = ::com::sun::star; #define DEFAULT_WIDTH 15000 @@ -718,6 +719,8 @@ { } } + Reference<XModifiable> xModifiable(xModel,UNO_QUERY_THROW); + xModifiable->setModified(sal_False); } } } @@ -752,9 +755,6 @@ { xPersist->storeToEntry(xStorage,sPersistentName,Sequence<PropertyValue>(),Sequence<PropertyValue>()); xPersist->storeOwn(); -// Reference<XTransactedObject> xTransact(xStorage,UNO_QUERY); -// if ( xTransact.is() ) -// xTransact->commit(); } else throw CommandAbortedException(); @@ -791,6 +791,12 @@ ////////////////////////////////////////////////////////////////// // delete ////////////////////////////////////////////////////////////////// + closeObject(); + Reference< XStorage> xStorage = getStorage(); + if ( xStorage.is() ) + xStorage->removeElement(m_pImpl->m_aProps.sPersistentName); + + dispose(); } else aRet = OContentHelper::execute(aCommand,CommandId,Environment); @@ -1219,6 +1225,7 @@ { sal_Int32 nHandle = PROPERTY_ID_NAME; osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex); + Any aOld = makeAny(m_pImpl->m_aProps.aTitle); aGuard.clear(); Any aNew = makeAny(newName); @@ -1239,7 +1246,8 @@ { static const ::rtl::OUString s_sForms = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("forms")); static const ::rtl::OUString s_sReports = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reports")); - return m_pImpl->m_pDataSource ? m_pImpl->m_pDataSource->getStorage(m_bForm ? s_sForms : s_sReports) : Reference< XStorage>(); + Reference<css::embed::XTransactionListener> xEvt(m_pImpl->m_pDataSource->m_xModel,UNO_QUERY); + return m_pImpl->m_pDataSource ? m_pImpl->m_pDataSource->getStorage(m_bForm ? s_sForms : s_sReports,xEvt) : Reference< XStorage>(); } // ----------------------------------------------------------------------------- sal_Bool ODocumentDefinition::isModified() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
