Tag: cws_src680_dba26 User: fs Date: 05/03/14 06:00:21 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: RESYNC: (1.20-1.21); FILE MERGED 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.12.2&r2=1.20.12.3 Delta lines: +16 -8 -------------------- --- documentdefinition.cxx 11 Mar 2005 13:31:38 -0000 1.20.12.2 +++ documentdefinition.cxx 14 Mar 2005 14:00:18 -0000 1.20.12.3 @@ -250,6 +250,7 @@ using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; +namespace css = ::com::sun::star; #define DEFAULT_WIDTH 15000 @@ -720,6 +721,8 @@ { } } + Reference<XModifiable> xModifiable(xModel,UNO_QUERY_THROW); + xModifiable->setModified(sal_False); } } } @@ -754,9 +757,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(); @@ -793,6 +793,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); @@ -1225,8 +1231,9 @@ sal_Int32 nHandle = PROPERTY_ID_NAME; Any aOld = makeAny(m_pImpl->m_aProps.aTitle); - aGuard.clear(); Any aNew = makeAny(newName); + + aGuard.clear(); fire(&nHandle, &aNew, &aOld, 1, sal_True ); m_pImpl->m_aProps.aTitle = newName; fire(&nHandle, &aNew, &aOld, 1, sal_False ); @@ -1245,7 +1252,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]
