Tag: cws_src680_dba24 User: oj Date: 05/02/22 02:07:24 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx, ModelImpl.hxx, databasecontext.cxx, databasedocument.cxx, databasedocument.hxx, datasource.cxx, documentcontainer.cxx, documentdefinition.cxx
Log: build problems File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +4 -4 ------------------- --- ModelImpl.cxx 22 Feb 2005 09:01:15 -0000 1.1.2.4 +++ ModelImpl.cxx 22 Feb 2005 10:07:19 -0000 1.1.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: ModelImpl.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2005/02/22 09:01:15 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -590,7 +590,7 @@ return m_xStorage; } // ----------------------------------------------------------------------------- -Reference<XStorage> ODatabaseModelImpl::getStorage(const ::rtl::OUString& _sStorageName,const Reference<css::lang::XEventListener>& _xEventListener, sal_Int32 nMode) +Reference<XStorage> ODatabaseModelImpl::getStorage(const ::rtl::OUString& _sStorageName,const Reference<css::embed::XTransactionListener>& _xEventListener, sal_Int32 nMode) { OSL_ENSURE(_sStorageName.getLength(),"ODatabaseModelImpl::getStorage: Invalid storage name!"); OSL_ENSURE(_xEventListener.is(),"No Eventlistener set!"); @@ -607,7 +607,7 @@ xStorage = xMyStorage->openStorageElement(_sStorageName, m_bDocumentReadOnly ? ElementModes::READ : nMode); Reference<XTransactionBroadcaster> xBroad(xStorage,UNO_QUERY); if ( xBroad.is() ) - xBroad->addTransactionListener(this); + xBroad->addTransactionListener(_xEventListener); aFind = m_aStorages.insert(TStorages::value_type(_sStorageName,xStorage)).first; } catch(Exception&) File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +5 -4 ------------------- --- ModelImpl.hxx 22 Feb 2005 06:35:46 -0000 1.1.2.2 +++ ModelImpl.hxx 22 Feb 2005 10:07:20 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2005/02/22 06:35:46 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,6 +179,7 @@ #ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> #endif +#include <com/sun/star/embed/XTransactionListener.hpp> #ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include <com/sun/star/util/XRefreshable.hpp> #endif @@ -334,7 +335,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); + void dispose( ); // ::com::sun::star::frame::XModel sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; @@ -364,7 +365,7 @@ // XCloseable void SAL_CALL close( sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> getStorage(const ::rtl::OUString& _sStorageName,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _xEventListener, sal_Int32 nMode = ::com::sun::star::embed::ElementModes::READWRITE); + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> getStorage(const ::rtl::OUString& _sStorageName,const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener>& _xEventListener, sal_Int32 nMode = ::com::sun::star::embed::ElementModes::READWRITE); // helper const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& getNumberFormatsSupplier(); File [changed]: databasecontext.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasecontext.cxx?r1=1.26.2.4&r2=1.26.2.5 Delta lines: +15 -9 -------------------- --- databasecontext.cxx 21 Feb 2005 13:08:35 -0000 1.26.2.4 +++ databasecontext.cxx 22 Feb 2005 10:07:20 -0000 1.26.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: databasecontext.cxx,v $ * - * $Revision: 1.26.2.4 $ + * $Revision: 1.26.2.5 $ * - * last change: $Author: oj $ $Date: 2005/02/21 13:08:35 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,6 +150,7 @@ #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <svtools/pathoptions.hxx> #endif +#include <svtools/filenotation.hxx> #ifndef _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ #include "databasedocument.hxx" #endif @@ -208,6 +209,8 @@ static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Location"); return s_sNodeName; } + } + //= ODatabaseContext //========================================================================== DBG_NAME(ODatabaseContext) @@ -302,6 +305,9 @@ } if ( !xExistent.is() ) xExistent = createInstance(); + + return xExistent; +} // DatabaseAccessContext_Base //------------------------------------------------------------------------------ void ODatabaseContext::disposing() @@ -441,18 +447,18 @@ { const Sequence< PropertyValue >& rSessionPersistentProps = m_aDatasourceProperties[_sURL]; const PropertyValue* pSessionPersistentProps = rSessionPersistentProps.getConstArray(); + try + { for (sal_Int32 i=0; i<rSessionPersistentProps.getLength(); ++i, ++pSessionPersistentProps) { xDSProps->setPropertyValue(pSessionPersistentProps->Name, pSessionPersistentProps->Value); } + } catch(Exception&) { DBG_ERROR("ODatabaseContext::setTransientProperties: could not set a session-persistent property on the data source!"); } - } - else - DBG_ERROR("ODatabaseContext::getRegisteredObject: missing an interface!"); } else DBG_ERROR("ODatabaseContext::setTransientProperties: missing an interface!"); File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.8.2.5&r2=1.8.2.6 Delta lines: +15 -33 --------------------- --- databasedocument.cxx 22 Feb 2005 06:34:40 -0000 1.8.2.5 +++ databasedocument.cxx 22 Feb 2005 10:07:20 -0000 1.8.2.6 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.8.2.5 $ + * $Revision: 1.8.2.6 $ * - * last change: $Author: oj $ $Date: 2005/02/22 06:34:40 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -504,14 +504,14 @@ if ( !xStorage.is() ) throw IOException(); - if ( m_sConnectURL.compareToAscii("sdbc:embedded:",14) == 0 ) - clearConnections(); - commitEmbeddedStorage(); + if ( m_pImpl->m_sConnectURL.compareToAscii("sdbc:embedded:",14) == 0 ) + m_pImpl->clearConnections(); + m_pImpl->commitEmbeddedStorage(); Reference<XStorage> xMyStorage = m_pImpl->getStorage(); if ( xMyStorage.is() ) { - commitStorages(); + m_pImpl->commitStorages(); xMyStorage->copyToStorage( xStorage ); } @@ -1203,20 +1203,20 @@ m_pImpl->disposing(Source); } //------------------------------------------------------------------ -void SAL_CALL ODatabaseSource::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseDocument::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ -void SAL_CALL ODatabaseSource::commited( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseDocument::commited( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) { - ::osl::MutexGuard aGuard(m_aMutex); - TStorages::iterator aFind = m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); + ::osl::MutexGuard aGuard(m_pImpl->m_aMutex); + TStorages::iterator aFind = m_pImpl->m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); Reference<XStorage> xStorage(aEvent.Source,UNO_QUERY); - if ( aFind != m_aStorages.end() && aFind->second == xStorage ) + if ( aFind != m_pImpl->m_aStorages.end() && aFind->second == xStorage ) { try { - Reference<XTransactedObject> xTransact(getStorage(),UNO_QUERY); + Reference<XTransactedObject> xTransact(m_pImpl->getStorage(),UNO_QUERY); if ( xTransact.is() ) xTransact->commit(); } @@ -1227,32 +1227,14 @@ } } //------------------------------------------------------------------ -void SAL_CALL ODatabaseSource::preRevert( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseDocument::preRevert( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ -void SAL_CALL ODatabaseSource::reverted( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseDocument::reverted( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------ -void ODatabaseSource::commitStorages() -{ - try - { - TStorages::iterator aIter = m_aStorages.begin(); - TStorages::iterator aEnd = m_aStorages.end(); - for (; aIter != aEnd ; ++aIter) - { - Reference<XTransactedObject> xTrans(aIter->second,UNO_QUERY); - if ( xTrans.is() ) - xTrans->commit(); - } - } - catch(WrappedTargetException) - { - throw IOException(); - } -} //........................................................................ } // namespace dbaccess //........................................................................ File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +4 -3 ------------------- --- databasedocument.hxx 21 Feb 2005 11:03:50 -0000 1.1.2.2 +++ databasedocument.hxx 22 Feb 2005 10:07:20 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2005/02/21 11:03:50 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,6 +103,7 @@ #ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #endif +#include <com/sun/star/embed/XTransactionListener.hpp> #include <boost/shared_ptr.hpp> #ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" @@ -124,7 +125,7 @@ , ::com::sun::star::util::XModifiable , ::com::sun::star::frame::XStorable , ::com::sun::star::document::XEventBroadcaster - , ::com::sun::star::document::XEventListener + , ::com::sun::star::embed::XTransactionListener , ::com::sun::star::view::XPrintable , ::com::sun::star::util::XCloseable , ::com::sun::star::lang::XServiceInfo File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.53.2.4&r2=1.53.2.5 Delta lines: +4 -5 ------------------- --- datasource.cxx 21 Feb 2005 13:08:47 -0000 1.53.2.4 +++ datasource.cxx 22 Feb 2005 10:07:20 -0000 1.53.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: datasource.cxx,v $ * - * $Revision: 1.53.2.4 $ + * $Revision: 1.53.2.5 $ * - * last change: $Author: oj $ $Date: 2005/02/21 13:08:47 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -661,7 +661,6 @@ //------------------------------------------------------------------------------ void ODatabaseSource::disposing() { - notifyEvent(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnload"))); OSubComponent::disposing(); OPropertySetHelper::disposing(); @@ -732,7 +731,7 @@ aDriverInfo[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aDriverInfo[nCount++].Value <<= m_pImpl->getURL(); aDriverInfo[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")); - Reference<css::lang::XEventListener> xEvt(m_pImpl->m_xModel,UNO_QUERY); + Reference<css::embed::XTransactionListener> xEvt(m_pImpl->m_xModel,UNO_QUERY); aDriverInfo[nCount++].Value <<= m_pImpl->getStorage(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database")),xEvt,ElementModes::READWRITE); } if (nAdditionalArgs) File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.10.28.2&r2=1.10.28.3 Delta lines: +4 -4 ------------------- --- documentcontainer.cxx 18 Feb 2005 12:25:27 -0000 1.10.28.2 +++ documentcontainer.cxx 22 Feb 2005 10:07:21 -0000 1.10.28.3 @@ -2,9 +2,9 @@ * * $RCSfile: documentcontainer.cxx,v $ * - * $Revision: 1.10.28.2 $ + * $Revision: 1.10.28.3 $ * - * last change: $Author: oj $ $Date: 2005/02/18 12:25:27 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -663,7 +663,7 @@ { static const ::rtl::OUString s_sForms = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("forms")); static const ::rtl::OUString s_sReports = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reports")); - Reference<XEventListener> xEvt(m_pImpl->m_pDataSource->m_xModel,UNO_QUERY); + Reference<XTransactionListener> xEvt(m_pImpl->m_pDataSource->m_xModel,UNO_QUERY); return m_pImpl->m_pDataSource ? m_pImpl->m_pDataSource->getStorage(m_bFormsContainer ? s_sForms : s_sReports,xEvt) : Reference< XStorage>(); } // ----------------------------------------------------------------------------- File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.19.2.4&r2=1.19.2.5 Delta lines: +4 -4 ------------------- --- documentdefinition.cxx 21 Feb 2005 13:09:11 -0000 1.19.2.4 +++ documentdefinition.cxx 22 Feb 2005 10:07:21 -0000 1.19.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.19.2.4 $ + * $Revision: 1.19.2.5 $ * - * last change: $Author: oj $ $Date: 2005/02/21 13:09:11 $ + * last change: $Author: oj $ $Date: 2005/02/22 10:07:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1246,7 +1246,7 @@ { static const ::rtl::OUString s_sForms = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("forms")); static const ::rtl::OUString s_sReports = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reports")); - Reference<css::lang::XEventListener> xEvt(m_pImpl->m_pDataSource->m_xModel,UNO_QUERY); + 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>(); } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
