diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess')
41 files changed, 464 insertions, 467 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 10361a3aa280..ec71f05aceef 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace dbaccess { //........................................................................ /// helper class for column property change events which holds the OComponentDefinition weak -typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; +typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; class OColumnPropertyListener : public TColumnPropertyListener_BASE { OComponentDefinition* m_pComponent; @@ -103,7 +103,7 @@ public: } void clear() { m_pComponent = NULL; } }; -DBG_NAME(OComponentDefinition_Impl) +DBG_NAME(OComponentDefinition_Impl) OComponentDefinition_Impl::OComponentDefinition_Impl() { DBG_CTOR(OComponentDefinition_Impl,NULL); @@ -111,7 +111,7 @@ OComponentDefinition_Impl::OComponentDefinition_Impl() // ----------------------------------------------------------------------------- OComponentDefinition_Impl::~OComponentDefinition_Impl() { - DBG_DTOR(OComponentDefinition_Impl,NULL); + DBG_DTOR(OComponentDefinition_Impl,NULL); } //========================================================================== //= OComponentDefinition @@ -140,7 +140,7 @@ void OComponentDefinition::registerProperties() //-------------------------------------------------------------------------- OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable) :OContentHelper(_xORB,_xParentContainer,_pImpl) @@ -157,7 +157,7 @@ OComponentDefinition::~OComponentDefinition() } //-------------------------------------------------------------------------- -OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer +OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer ,const ::rtl::OUString& _rElementName ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl @@ -195,7 +195,7 @@ Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_stati Sequence< ::rtl::OUString > aServices(2); aServices.getArray()[0] = SERVICE_SDB_TABLEDEFINITION; aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Content")); - + return aServices; } @@ -277,7 +277,7 @@ OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const if ( aFind != rDefinition.end() ) { aFind->second->addPropertyChangeListener(::rtl::OUString(),m_xColumnPropertyListener.getRef()); - return new OTableColumnWrapper( aFind->second, aFind->second, true ); + return new OTableColumnWrapper( aFind->second, aFind->second, true ); } OSL_ENSURE( false, "OComponentDefinition::createColumn: is this a valid case?" ); // This here is the last place creating a OTableColumn, and somehow /me thinks it is not needed ... @@ -295,7 +295,7 @@ void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co notifyDataSourceModified(); } // ----------------------------------------------------------------------------- -void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) +void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) { getDefinition().erase( _sName ); notifyDataSourceModified(); @@ -323,6 +323,6 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 834e7a9979fa..3a535c5c0a4e 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,8 +91,8 @@ namespace dbaccess Columns m_aColumns; public: - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sCatalogName; + ::rtl::OUString m_sSchemaName; + ::rtl::OUString m_sCatalogName; public: OComponentDefinition_Impl(); @@ -118,27 +118,27 @@ class OColumnPropertyListener; //========================================================================= //= OComponentDefinition - a database "document" which describes a query //========================================================================= -class OComponentDefinition :public OContentHelper +class OComponentDefinition :public OContentHelper ,public ODataSettings ,public IColumnFactory ,public OComponentDefinition_BASE ,public ::comphelper::OPropertyArrayUsageHelper< OComponentDefinition > { OComponentDefinition(); - + protected: ::std::auto_ptr< OColumns > m_pColumns; - ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener> + ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener> m_xColumnPropertyListener; - sal_Bool m_bTable; + sal_Bool m_bTable; - virtual ~OComponentDefinition(); + virtual ~OComponentDefinition(); virtual void SAL_CALL disposing(); protected: OComponentDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable = sal_True); @@ -179,7 +179,7 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -201,7 +201,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 3ed2649caabe..6f2e24aec9fc 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,17 +95,17 @@ using namespace ::cppu; DBG_NAME(OContentHelper_Impl) OContentHelper_Impl::OContentHelper_Impl() { - DBG_CTOR(OContentHelper_Impl,NULL); + DBG_CTOR(OContentHelper_Impl,NULL); } // ----------------------------------------------------------------------------- OContentHelper_Impl::~OContentHelper_Impl() { - DBG_DTOR(OContentHelper_Impl,NULL); + DBG_DTOR(OContentHelper_Impl,NULL); } // ----------------------------------------------------------------------------- OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl) : OContentHelper_COMPBASE(m_aMutex) ,m_aContentListeners(m_aMutex) @@ -269,7 +269,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma Reference<XPropertySet> xProp(*this,UNO_QUERY); if ( xProp.is() ) aRet <<= xProp->getPropertySetInfo(); - // aRet <<= getPropertySetInfo(); // TODO + // aRet <<= getPropertySetInfo(); // TODO } else { @@ -342,7 +342,7 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< :: // ----------------------------------------------------------------------------- // XPropertyContainer -void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { DBG_ERROR( "OContentHelper::addProperty: not implemented!" ); } @@ -386,7 +386,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue PropertyChangeEvent aEvent; aEvent.Source = static_cast< cppu::OWeakObject * >( this ); - aEvent.Further = sal_False; + aEvent.Further = sal_False; aEvent.PropertyHandle = -1; const PropertyValue* pValues = rValues.getConstArray(); @@ -477,7 +477,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue if ( nChanged > 0 ) { // @@@ Save changes. -// storeData(); +// storeData(); notifyDataSourceModified(); aGuard.clear(); @@ -595,7 +595,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent typedef Sequence< PropertyChangeEvent > PropertyEventSequence; typedef ::std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap; PropertiesEventListenerMap aListeners; - + const PropertyChangeEvent* propertyChangeEvent = evt.getConstArray(); @@ -696,14 +696,14 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN Sequence< PropertyChangeEvent > aChanges( 1 ); aChanges[0].Source = static_cast< cppu::OWeakObject * >( this ); - aChanges[0].Further = sal_False; + aChanges[0].Further = sal_False; aChanges[0].PropertyName = PROPERTY_NAME; aChanges[0].PropertyHandle = PROPERTY_ID_NAME; aChanges[0].OldValue <<= m_pImpl->m_aProps.aTitle; aChanges[0].NewValue <<= _sNewName; - + aGuard.clear(); - + m_pImpl->m_aProps.aTitle = _sNewName; if ( _bNotify ) notifyPropertiesChange( aChanges ); @@ -717,39 +717,39 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN // ----------------------------------------------------------------------------- void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { - + impl_rename_throw(newName); //Reference<XNameContainer> xNameCont(m_xParentContainer,UNO_QUERY); //if ( xNameCont.is() ) //{ - // if ( xNameCont->hasByName(newName) ) - // throw ElementExistException(newName,*this); - - // try - // { - // if ( xNameCont->hasByName(m_pImpl->m_aProps.aTitle) ) - // xNameCont->removeByName(m_pImpl->m_aProps.aTitle); - - // m_pImpl->m_aProps.aTitle = newName; - // xNameCont->insertByName(m_pImpl->m_aProps.aTitle,makeAny(Reference<XContent>(*this,UNO_QUERY))); - // notifyDataSourceModified(); - // } - // catch(IllegalArgumentException) - // { - // throw SQLException(); - // } - // catch(NoSuchElementException) - // { - // throw SQLException(); - // } - // catch(WrappedTargetException) - // { - // throw SQLException(); - // } + // if ( xNameCont->hasByName(newName) ) + // throw ElementExistException(newName,*this); + + // try + // { + // if ( xNameCont->hasByName(m_pImpl->m_aProps.aTitle) ) + // xNameCont->removeByName(m_pImpl->m_aProps.aTitle); + + // m_pImpl->m_aProps.aTitle = newName; + // xNameCont->insertByName(m_pImpl->m_aProps.aTitle,makeAny(Reference<XContent>(*this,UNO_QUERY))); + // notifyDataSourceModified(); + // } + // catch(IllegalArgumentException) + // { + // throw SQLException(); + // } + // catch(NoSuchElementException) + // { + // throw SQLException(); + // } + // catch(WrappedTargetException) + // { + // throw SQLException(); + // } //} //else - // m_pImpl->m_aProps.aTitle = newName; - + // m_pImpl->m_aProps.aTitle = newName; + } // ----------------------------------------------------------------------------- void OContentHelper::notifyDataSourceModified() @@ -757,6 +757,6 @@ void OContentHelper::notifyDataSourceModified() ::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True); } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index ee50bea00dd0..94165392379e 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1167,7 +1167,7 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() AsciiPropertyValue( "Reports", makeAny( ::rtl::OUString() ) ), AsciiPropertyValue( "KeyAlterationServiceName", makeAny( ::rtl::OUString() ) ), AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ), - + AsciiPropertyValue() }; return aKnownSettings; @@ -1497,6 +1497,6 @@ ModelDependentComponent::~ModelDependentComponent() } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index f83b2230c2b4..36fdc427ec1b 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -148,7 +148,7 @@ public: VosMutexFacade( ::osl::Mutex& _rMutex ); // IMutex - virtual void SAL_CALL acquire(); + virtual void SAL_CALL acquire(); virtual sal_Bool SAL_CALL tryToAcquire(); virtual void SAL_CALL release(); @@ -190,8 +190,8 @@ public: private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; DocumentStorageAccess* m_pStorageAccess; ::comphelper::SharedMutex m_aMutex; @@ -205,14 +205,14 @@ private: SharedStorage m_xDocumentStorage; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListener; - ODatabaseContext* m_pDBContext; + ODatabaseContext* m_pDBContext; DocumentEventsData m_aDocumentEvents; ::comphelper::NamedValueCollection m_aMediaDescriptor; /// the URL the document was loaded from - ::rtl::OUString m_sDocFileLocation; + ::rtl::OUString m_sDocFileLocation; - oslInterlockedCount m_refCount; + oslInterlockedCount m_refCount; /// do we have any object (forms/reports) which contains macros? ::boost::optional< EmbeddedMacros > m_aEmbeddedMacros; @@ -238,32 +238,32 @@ public: const ::comphelper::ComponentContext m_aContext; public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::rtl::OUString m_sConnectURL; - ::rtl::OUString m_sName; // transient, our creator has to tell us the title - ::rtl::OUString m_sUser; - ::rtl::OUString m_aPassword; // transient ! + ::rtl::OUString m_sConnectURL; + ::rtl::OUString m_sName; // transient, our creator has to tell us the title + ::rtl::OUString m_sUser; + ::rtl::OUString m_aPassword; // transient ! ::rtl::OUString m_sFailedPassword; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; sal_Int32 m_nLoginTimeout; - sal_Bool m_bReadOnly : 1; - sal_Bool m_bPasswordRequired : 1; - sal_Bool m_bSuppressVersionColumns : 1; - sal_Bool m_bModified : 1; - sal_Bool m_bDocumentReadOnly : 1; + sal_Bool m_bReadOnly : 1; + sal_Bool m_bPasswordRequired : 1; + sal_Bool m_bSuppressVersionColumns : 1; + sal_Bool m_bModified : 1; + sal_Bool m_bDocumentReadOnly : 1; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; - OSharedConnectionManager* m_pSharedConnectionManager; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; - sal_uInt16 m_nControllerLockCount; + sal_uInt16 m_nControllerLockCount; void reset(); @@ -334,7 +334,7 @@ public: stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments ); // other stuff - void flushTables(); + void flushTables(); // disposes all elements in m_aStorages, and clears it void disposeStorages() SAL_THROW(()); @@ -479,7 +479,7 @@ public: if any of the invoked operations does so */ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > - switchToStorage( + switchToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxNewRootStorage ); @@ -634,7 +634,7 @@ public: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index d2b9f4d5196a..48f80ada2523 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,20 +41,20 @@ namespace dbaccess using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -// using namespace ::com::sun::star::reflection; +// using namespace ::com::sun::star::reflection; using namespace connectivity; DBG_NAME(OSharedConnection) OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnection) : OSharedConnection_BASE(m_aMutex) { - DBG_CTOR(OSharedConnection,NULL); + DBG_CTOR(OSharedConnection,NULL); setDelegation(_rxProxyConnection,m_refCount); } // ----------------------------------------------------------------------------- OSharedConnection::~OSharedConnection() { - DBG_DTOR(OSharedConnection,NULL); + DBG_DTOR(OSharedConnection,NULL); } // ----------------------------------------------------------------------------- void SAL_CALL OSharedConnection::disposing(void) @@ -67,7 +67,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQ { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->createStatement(); } @@ -76,7 +76,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->prepareStatement(sql); } @@ -85,7 +85,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const : { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->prepareCall(sql); } @@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const : { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->nativeSQL(sql); } @@ -103,7 +103,7 @@ sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) throw(SQLException, Runti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->getAutoCommit(); } @@ -112,7 +112,7 @@ void SAL_CALL OSharedConnection::commit( ) throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + m_xConnection->commit(); } @@ -121,7 +121,7 @@ void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + m_xConnection->rollback(); } @@ -129,7 +129,7 @@ void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeExcepti sal_Bool SAL_CALL OSharedConnection::isClosed( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - + return m_xConnection->isClosed(); } // -------------------------------------------------------------------------------- @@ -137,16 +137,16 @@ Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) throw { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->getMetaData(); } // -------------------------------------------------------------------------------- sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeException) -{ +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->isReadOnly(); } @@ -155,7 +155,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeE { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->getCatalog(); } @@ -164,7 +164,7 @@ sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) throw(SQLExcep { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->getTransactionIsolation(); } @@ -173,14 +173,14 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); - + return m_xConnection->getTypeMap(); } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index 7691411cd08b..e90ea054c685 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,10 +30,10 @@ #ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" #endif -#ifndef _CPPUHELPER_COMPONENT_HXX_ +#ifndef _CPPUHELPER_COMPONENT_HXX_ #include <cppuhelper/component.hxx> #endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ +#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> #endif #ifndef _CPPUHELPER_COMPBASE1_HXX_ @@ -66,7 +66,7 @@ #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ +#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> #endif @@ -81,9 +81,9 @@ namespace dbaccess //======================================================================================= typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection > OSharedConnection_BASE; - typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; + typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; - class OSharedConnection : public ::comphelper::OBaseMutex + class OSharedConnection : public ::comphelper::OBaseMutex , public OSharedConnection_BASE , public OSharedConnection_BASE2 { @@ -99,10 +99,10 @@ namespace dbaccess virtual void SAL_CALL release() throw() { OSharedConnection_BASE::release(); } virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException) { - return ::comphelper::concatSequences( - OSharedConnection_BASE::getTypes(), + return ::comphelper::concatSequences( + OSharedConnection_BASE::getTypes(), OSharedConnection_BASE2::getTypes() - ); + ); } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) @@ -119,14 +119,14 @@ namespace dbaccess { ::osl::MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(rBHelper.bDisposed); - + } dispose(); } // XConnection virtual void SAL_CALL setAutoCommit( sal_Bool /*autoCommit*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) - { + { throw ::com::sun::star::sdbc::SQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("This call is not allowed when sharing connections.")),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S10000")),0,::com::sun::star::uno::Any()); } virtual void SAL_CALL setReadOnly( sal_Bool /*readOnly*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) @@ -160,12 +160,12 @@ namespace dbaccess virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - + #ifdef IMPLEMENT_GET_IMPLEMENTATION_ID IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection ); #endif //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // DBA_CORE_SHARED_CONNECTION_HXX diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 08321a0e0053..e68794789b2e 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -328,7 +328,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr Sequence< ::rtl::OUString > aNames(m_aBookmarks.size()); ::rtl::OUString* pNames = aNames.getArray(); ; - for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); + for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); aNameIter != m_aBookmarksIndexed.end(); ++pNames, ++aNameIter ) @@ -355,7 +355,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) // look for the name in the index access vector MapString2StringIterator aMapPos = m_aBookmarks.end(); - for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); + for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); aSearch != m_aBookmarksIndexed.end(); ++aSearch ) @@ -387,7 +387,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl:: MutexGuard aGuard(m_rMutex); OSL_ENSURE(m_aBookmarks.find(_rName) == m_aBookmarks.end(),"Bookmark already known!"); - m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); + m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); } //-------------------------------------------------------------------------- @@ -417,5 +417,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 0a43371c51e5..04a446f22a8d 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,17 +74,17 @@ namespace dbaccess //........................................................................ //========================================================================== -//= OBookmarkContainer - base class of collections of database definition -//= documents +//= OBookmarkContainer - base class of collections of database definition +//= documents //========================================================================== -typedef ::cppu::WeakImplHelper6 < +typedef ::cppu::WeakImplHelper6 < ::com::sun::star::container::XIndexAccess - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::container::XContainer - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::container::XChild - > OBookmarkContainer_Base; + , ::com::sun::star::container::XNameContainer + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::container::XContainer + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::container::XChild + > OBookmarkContainer_Base; class OBookmarkContainer :public OBookmarkContainer_Base @@ -93,21 +93,21 @@ protected: DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String); DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); - MapString2String m_aBookmarks; // the bookmarks itself - MapIteratorVector m_aBookmarksIndexed; // for index access to the + MapString2String m_aBookmarks; // the bookmarks itself + MapIteratorVector m_aBookmarksIndexed; // for index access to the protected: - ::cppu::OWeakObject& m_rParent; // for the ref counting + ::cppu::OWeakObject& m_rParent; // for the ref counting ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::osl::Mutex& m_rMutex; + ::osl::Mutex& m_rMutex; public: /** constructs the container.<BR> after the construction of the object the creator has to call <code>initialize</code>. - @param _rParent the parent object which is used for ref counting - @param _rMutex the parent's mutex object for access safety + @param _rParent the parent object which is used for ref counting + @param _rMutex the parent's mutex object for access safety */ OBookmarkContainer( ::cppu::OWeakObject& _rParent, @@ -162,26 +162,26 @@ public: /** tell the container to free all resources. After that it's in a state like after the construction, i.e. you may call <code>initialize</code> again (maybe with another configuration node). */ - virtual void dispose(); + virtual void dispose(); protected: - /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and + /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and not disposed (@see dispose) - @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration. + @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration. if sal_True and the configuration is readonly, a runtime exception with a description string is thrown. */ - void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException); + void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. - @param _rName the object name to check - @return sal_True if there already exists such an object + @param _rName the object name to check + @return sal_True if there already exists such an object */ - inline sal_Bool checkExistence(const ::rtl::OUString& _rName); + inline sal_Bool checkExistence(const ::rtl::OUString& _rName); - void implAppend( + void implAppend( const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation ); @@ -195,13 +195,13 @@ protected: }; //-------------------------------------------------------------------------- -inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) +inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) { return m_aBookmarks.find(_rName) != m_aBookmarks.end(); } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_CORE_BOOKMARKCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 34d7283b1837..fab4ec682591 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,10 +62,10 @@ namespace dbaccess DBG_NAME(OCommandContainer) //-------------------------------------------------------------------------- OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTables - ) + ) :ODefinitionContainer(_xORB,_xParentContainer,_pImpl,!_bTables) ,m_bTables(_bTables) { @@ -110,6 +110,6 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exc } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 4528224ce24d..69f50ce4316e 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace dbaccess typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XSingleServiceFactory > OCommandContainer_BASE; -class OCommandContainer : public ODefinitionContainer +class OCommandContainer : public ODefinitionContainer ,public OCommandContainer_BASE { sal_Bool m_bTables; @@ -61,7 +61,7 @@ public: */ OCommandContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTables ); @@ -85,7 +85,7 @@ protected: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index b3b41ff903b8..ec3729ce6224 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ void OCommandDefinition::registerProperties() //-------------------------------------------------------------------------- OCommandDefinition::OCommandDefinition(const Reference< XMultiServiceFactory >& _xORB ,const Reference< XInterface >& _rxContainer - ,const TContentPtr& _pImpl) + ,const TContentPtr& _pImpl) :OComponentDefinition(_xORB,_rxContainer,_pImpl,sal_False) { DBG_CTOR(OCommandDefinition, NULL); @@ -102,7 +102,7 @@ OCommandDefinition::~OCommandDefinition() } //-------------------------------------------------------------------------- -OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer +OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer ,const ::rtl::OUString& _rElementName ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl) @@ -174,6 +174,6 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 6d245324c831..27dd4bb864e5 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ namespace dbaccess public: }; -typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename - > OCommandDefinition_Base; +typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename + > OCommandDefinition_Base; class OCommandDefinition; typedef ::comphelper::OPropertyArrayUsageHelper< OCommandDefinition > - OCommandDefinition_PROP; - + OCommandDefinition_PROP; + -class OCommandDefinition :public OComponentDefinition +class OCommandDefinition :public OComponentDefinition ,public OCommandDefinition_Base ,public OCommandDefinition_PROP { @@ -92,7 +92,7 @@ protected: virtual ~OCommandDefinition(); OCommandDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ); @@ -136,7 +136,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index f543e2665a7e..00df5b9c270b 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -597,7 +597,7 @@ Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( Ru MutexGuard aGuard(m_aMutex); checkDisposed(); - // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier(); + // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier(); Reference< XSQLQueryComposer > xComposer( new OQueryComposer( this ) ); m_aComposers.push_back(WeakReferenceHelper(xComposer)); return xComposer; @@ -626,11 +626,11 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed) getMasterTables(); if (m_xMasterTables.is() && m_xMasterTables->getTables().is()) - { // yes -> wrap them + { // yes -> wrap them m_pTables->construct(m_xMasterTables->getTables(),m_aTableFilter, m_aTableTypeFilter); } else - { // no -> use an own container + { // no -> use an own container m_pTables->construct(m_aTableFilter, m_aTableTypeFilter); } } @@ -941,6 +941,6 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index eb80cc2fc7db..321c4ae63346 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ class ODatabaseSource; //========================================================================== //= OConnection //========================================================================== -class OConnection :public ::comphelper::OBaseMutex +class OConnection :public ::comphelper::OBaseMutex ,public OSubComponent ,public ::connectivity::OConnectionWrapper ,public OConnection_Base @@ -94,16 +94,16 @@ class OConnection :public ::comphelper::OBaseMutex protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > m_xMasterTables; // just to avoid the recreation of the catalog - OWeakRefArray m_aStatements; + OWeakRefArray m_aStatements; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xQueries; - OWeakRefArray m_aComposers; + OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XTableUIProvider > m_xTableUIProvider; @@ -113,13 +113,13 @@ protected: TSupportServices m_aSupportServices; - OTableContainer* m_pTables; - OViewContainer* m_pViews; + OTableContainer* m_pTables; + OViewContainer* m_pViews; ::dbtools::WarningsContainer m_aWarnings; oslInterlockedCount m_nInAppend; - sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type - sal_Bool m_bSupportsUsers; - sal_Bool m_bSupportsGroups; + sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type + sal_Bool m_bSupportsUsers; + sal_Bool m_bSupportsGroups; protected: virtual ~OConnection(); @@ -167,7 +167,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); -// XConnection +// XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -215,7 +215,7 @@ public: virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); protected: - inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) + inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) { if ( rBHelper.bDisposed || !m_xConnection.is() ) throw ::com::sun::star::lang::DisposedException(); @@ -244,7 +244,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_CORE_CONNECTION_HXX_ diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index ad5078825a16..c8f9cf383052 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 315cbcca3b7e..e584553e65e3 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -304,7 +304,7 @@ void ODatabaseContext::disposing() // dispose the data sources ObjectCache::iterator aEnd = m_aDatabaseObjects.end(); - for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin(); + for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin(); aIter != aEnd; ++aIter ) @@ -489,8 +489,8 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl const Property* pProperties = aProperties.getConstArray(); for ( sal_Int32 i=0; i<aProperties.getLength(); ++i, ++pProperties ) { - if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 ) - && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 ) + if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 ) + && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 ) ) { // found such a property @@ -677,19 +677,19 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen return makeAny( xExistent ); } catch (NoSuchElementException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (WrappedTargetException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (RuntimeException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (Exception& e) - { // exceptions other than the speciafied ones -> wrap + { // exceptions other than the speciafied ones -> wrap Any aError = ::cppu::getCaughtException(); throw WrappedTargetException(_rName, *this, aError ); } @@ -805,5 +805,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index dc55ff62b694..072299c76407 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,15 +74,15 @@ class DatabaseDocumentLoader; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); -typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::container::XNameAccess - , ::com::sun::star::uno::XNamingService - , ::com::sun::star::container::XContainer - , ::com::sun::star::lang::XSingleServiceFactory - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::sdb::XDatabaseRegistrations - > DatabaseAccessContext_Base; +typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::container::XNameAccess + , ::com::sun::star::uno::XNamingService + , ::com::sun::star::container::XContainer + , ::com::sun::star::lang::XSingleServiceFactory + , ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::sdb::XDatabaseRegistrations + > DatabaseAccessContext_Base; class ODatabaseContext :public DatabaseAccessContext_Base ,public ::basic::BasicManagerCreationListener @@ -91,7 +91,7 @@ private: /** loads the given object from the given URL @throws WrappedTargetException if an error occurs accessing the URL via the UCB - + */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > loadObjectFromURL(const ::rtl::OUString& _rName,const ::rtl::OUString& _sURL); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getObject( const ::rtl::OUString& _rURL ); @@ -108,7 +108,7 @@ private: impl_createNewDataSource(); protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::comphelper::ComponentContext m_aContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > @@ -117,17 +117,17 @@ protected: m_xDatabaseRegistrations; DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache ); - ObjectCache m_aDatabaseObjects; + ObjectCache m_aDatabaseObjects; DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache ); - PropertyCache m_aDatasourceProperties; + PropertyCache m_aDatasourceProperties; // as we hold our data sources weak, we have to cache all properties on the data sources which are // transient but stored as long as the session lasts. The database context is the session (as it lives // as long as the session does), but the data sources may die before the session does, and then be // recreated afterwards. So it's our (the context's) responsibility to store the session-persistent // properties. - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; DatabaseDocumentLoader* m_pDatabaseDocumentLoader; public: @@ -205,7 +205,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_ diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 125c54121628..d748154d8eef 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -167,7 +167,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument() } //-------------------------------------------------------------------------- -ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl ) +ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl ) :ModelDependentComponent( _pImpl ) ,ODatabaseDocument_OfficeDocument( getMutex() ) ,m_aModifyListeners( getMutex() ) @@ -259,7 +259,7 @@ void SAL_CALL ODatabaseDocument::release( ) throw () ODatabaseDocument_OfficeDocument::release(); } //------------------------------------------------------------------------------ -Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException) { Sequence< Type > aTypes = ::comphelper::concatSequences( ODatabaseDocument_OfficeDocument::getTypes(), @@ -2185,7 +2185,7 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference //------------------------------------------------------------------ //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index d2aa57130d18..a299d984e7d9 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,11 +165,11 @@ typedef ::comphelper::WeakComponentImplHelper17 < ::com::sun::star::frame::XMo > ODatabaseDocument_OfficeDocument; typedef ::cppu::ImplHelper3< ::com::sun::star::frame::XTitle - , ::com::sun::star::frame::XTitleChangeBroadcaster - , ::com::sun::star::frame::XUntitledNumbers + , ::com::sun::star::frame::XTitleChangeBroadcaster + , ::com::sun::star::frame::XUntitledNumbers > ODatabaseDocument_Title; -class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first! +class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first! ,public ODatabaseDocument_OfficeDocument ,public ODatabaseDocument_Title { @@ -181,11 +181,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe }; DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >,TNumberedController); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; - ::cppu::OInterfaceContainerHelper m_aCloseListener; - ::cppu::OInterfaceContainerHelper m_aStorageListeners; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aCloseListener; + ::cppu::OInterfaceContainerHelper m_aStorageListeners; DocumentEvents* m_pEventContainer; ::rtl::Reference< DocumentEventExecutor > m_pEventExecutor; @@ -195,8 +195,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe Controllers m_aControllers; ViewMonitor m_aViewMonitor; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; ::com::sun::star::uno::WeakReference< ::com::sun::star::script::provider::XScriptProvider > m_xScriptProvider; /** @short such module manager is used to classify new opened documents. */ @@ -248,8 +248,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe /// write a single XML stream into the package void WriteThroughComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > & xComponent, /// the component we export - const sal_Char* pStreamName, /// the stream name - const sal_Char* pServiceName, /// service name of the component + const sal_Char* pStreamName, /// the stream name + const sal_Char* pServiceName, /// service name of the component const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, /// the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc,/// output descriptor const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo @@ -267,11 +267,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe ) const; /** writes the content and settings - @param sURL + @param sURL The URL - @param lArguments + @param lArguments The media descriptor - @param _xStorageToSaveTo + @param _xStorageToSaveTo The storage which should be used for saving */ void impl_writeStorage_throw( @@ -317,7 +317,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); @@ -371,12 +371,12 @@ public: // XEventBroadcaster virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - + // XDocumentEventBroadcaster virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - + // XPrintable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL setPrinter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPrinter ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; @@ -620,7 +620,7 @@ private: denotes additional document parameters @param _rDocGuard is the guard which currently protects the document instance - + */ sal_Bool impl_attachResource( const ::rtl::OUString& i_rLogicalDocumentURL, @@ -704,6 +704,6 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 6a8e7db21236..c6c8233731df 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -210,7 +210,7 @@ namespace dbaccess ::rtl::OUStringBuffer aReset( aNewNodeName ); sNewNodeName = aNewNodeName.makeStringAndClear(); sal_Int32 i=2; - while ( m_aConfigurationRoot.hasByName( sNewNodeName ) ) + while ( m_aConfigurationRoot.hasByName( sNewNodeName ) ) { aNewNodeName = aReset; aNewNodeName.appendAscii( " " ); @@ -254,7 +254,7 @@ namespace dbaccess ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( _Name ); return aNodeForName.isValid(); } - + //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) { @@ -273,7 +273,7 @@ namespace dbaccess { ::utl::OConfigurationNode aRegistrationNode = m_aConfigurationRoot.openNode( *pName ); OSL_VERIFY( aRegistrationNode.getNodeValue( getNameNodeName() ) >>= *pDisplayName ); - + } return aDisplayNames; @@ -292,7 +292,7 @@ namespace dbaccess return sLocation; } - + //-------------------------------------------------------------------- void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) { @@ -311,7 +311,7 @@ namespace dbaccess aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent ); } - + //-------------------------------------------------------------------- void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { @@ -337,7 +337,7 @@ namespace dbaccess aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent ); } - + //-------------------------------------------------------------------- void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx index 3d771625aa4a..927f484b709c 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 835f5398efc7..6a1151580a2e 100755 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -314,8 +314,8 @@ class OSharedConnectionManager : public OConnectionHelper_BASE // contains the currently used master connections typedef struct { - Reference< XConnection > xMasterConnection; - oslInterlockedCount nALiveCount; + Reference< XConnection > xMasterConnection; + oslInterlockedCount nALiveCount; } TConnectionHolder; // the less-compare functor, used for the stl::map @@ -330,13 +330,13 @@ class OSharedConnectionManager : public OConnectionHelper_BASE } }; - typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections - typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections + typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections + typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections - ::osl::Mutex m_aMutex; - TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest - TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map - Reference< XProxyFactory > m_xProxyFactory; + ::osl::Mutex m_aMutex; + TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest + TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map + Reference< XProxyFactory > m_xProxyFactory; protected: ~OSharedConnectionManager(); @@ -345,7 +345,7 @@ public: OSharedConnectionManager(const Reference< XMultiServiceFactory >& _rxServiceFactory); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException); - Reference<XConnection> getConnection( const rtl::OUString& url, + Reference<XConnection> getConnection( const rtl::OUString& url, const rtl::OUString& user, const rtl::OUString& password, const Sequence< PropertyValue >& _aInfo, @@ -382,7 +382,7 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang: } } -Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUString& url, +Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUString& url, const rtl::OUString& user, const rtl::OUString& password, const Sequence< PropertyValue >& _aInfo, @@ -393,15 +393,15 @@ Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUStr Sequence< PropertyValue > aInfoCopy(_aInfo); sal_Int32 nPos = aInfoCopy.getLength(); aInfoCopy.realloc( nPos + 2 ); - aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter")); + aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter")); aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableFilter; - aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter")); + aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter")); aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter; // #22377# OJ ::rtl::OUString sUser = user; ::rtl::OUString sPassword = password; if ((0 == sUser.getLength()) && (0 == sPassword.getLength()) && (0 != _pDataSource->m_pImpl->m_sUser.getLength())) - { // ease the usage of this method. data source which are intended to have a user automatically + { // ease the usage of this method. data source which are intended to have a user automatically // fill in the user/password combination if the caller of this method does not specify otherwise // 86951 - 05/08/2001 - frank.schoenheit@germany.sun.com sUser = _pDataSource->m_pImpl->m_sUser; @@ -484,7 +484,7 @@ namespace } } if ( !aRet.empty() ) - return Sequence< PropertyValue >(&(*aRet.begin()),aRet.size()); + return Sequence< PropertyValue >(&(*aRet.begin()),aRet.size()); } return Sequence< PropertyValue >(); } @@ -568,7 +568,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTypes" ); - OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), + OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 ), ::getCppuType( (const Reference< XMultiPropertySet > *)0 )); @@ -698,7 +698,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O ::rtl::OUString sUser(_rUid); ::rtl::OUString sPwd(_rPwd); if ((0 == sUser.getLength()) && (0 == sPwd.getLength()) && (0 != m_pImpl->m_sUser.getLength())) - { // ease the usage of this method. data source which are intended to have a user automatically + { // ease the usage of this method. data source which are intended to have a user automatically // fill in the user/password combination if the caller of this method does not specify otherwise // 86951 - 05/08/2001 - frank.schoenheit@germany.sun.com sUser = m_pImpl->m_sUser; @@ -809,19 +809,19 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::createArrayHelper" ); BEGIN_PROPERTY_HELPER(13) - DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); - DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); - DECL_PROP1_BOOL(ISREADONLY, READONLY); - DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); - DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); - DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT); + DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); + DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); + DECL_PROP1_BOOL(ISREADONLY, READONLY); + DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); + DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); + DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT); DECL_PROP2_IFACE(SETTINGS, XPropertySet, BOUND, READONLY); - DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND); - DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND); - DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND); - DECL_PROP1(URL, ::rtl::OUString, BOUND); - DECL_PROP1(USER, ::rtl::OUString, BOUND); + DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND); + DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(URL, ::rtl::OUString, BOUND); + DECL_PROP1(USER, ::rtl::OUString, BOUND); END_PROPERTY_HELPER(); } @@ -865,7 +865,7 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & case PROPERTY_ID_URL: { bModified = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_pImpl->m_sConnectURL); - } break; + } break; case PROPERTY_ID_INFO: { Sequence<PropertyValue> aValues; @@ -1173,7 +1173,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const sal_Bool bNewPasswordGiven = sal_False; if (m_pImpl->m_bPasswordRequired && (0 == sPassword.getLength())) - { // we need a password, but don't have one yet. + { // we need a password, but don't have one yet. // -> ask the user // build an interaction request @@ -1470,7 +1470,7 @@ Reference< XInterface > ODatabaseSource::getThis() const } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index b84b3d74c727..6a94fa66d0a3 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -161,8 +161,8 @@ class ODatabaseSource :public ModelDependentComponent // must be first private: using ODatabaseSource_Base::rBHelper; - OBookmarkContainer m_aBookmarks; - ::cppu::OInterfaceContainerHelper m_aFlushListeners; + OBookmarkContainer m_aBookmarks; + ::cppu::OInterfaceContainerHelper m_aFlushListeners; private: virtual ~ODatabaseSource(); @@ -297,7 +297,7 @@ protected: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 33ce2782a1dd..8613a0849c14 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,7 +139,7 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr DBG_NAME(ODefinitionContainer) //-------------------------------------------------------------------------- ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFactory >& _xORB - , const Reference< XInterface >& _xParentContainer + , const Reference< XInterface >& _xParentContainer , const TContentPtr& _pImpl , bool _bCheckSlash ) @@ -154,7 +154,7 @@ ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFact const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); ODefinitionContainer_Impl::const_iterator aEnd = rDefinitions.end(); - for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin(); + for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin(); aDefinition != aEnd; ++aDefinition ) @@ -181,7 +181,7 @@ void SAL_CALL ODefinitionContainer::disposing() Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (; aIter != aEnd; ++aIter) + for (; aIter != aEnd; ++aIter) { Reference<XContent> xProp = aIter->second; if ( xProp.is() ) @@ -432,7 +432,7 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu Documents::iterator aPos = m_aDocuments[_nIndex]; Reference<XContent> xProp = aPos->second; if (!xProp.is()) - { // that's the first access to the object + { // that's the first access to the object // -> create it xProp = createObject(aPos->first); aPos->second = Documents::mapped_type(); @@ -460,7 +460,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& Reference< XContent > xProp = aMapPos->second; if (_bReadIfNeccessary && !xProp.is()) - { // the object has never been accessed before, so we have to read it now + { // the object has never been accessed before, so we have to read it now // (that's the expensive part) // create the object and insert it into the map @@ -480,7 +480,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size()); ::rtl::OUString* pNames = aNames.getArray(); Documents::iterator aEnd = m_aDocumentMap.end(); - for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); + for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); aNameIter != aEnd; ++pNames, ++aNameIter ) @@ -507,7 +507,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr // it's one of our documents .... Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (;aIter != aEnd;++aIter ) + for (;aIter != aEnd;++aIter ) { if ( xSource == aIter->second.get() ) { diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index d9427eff0463..5d20a28853f3 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ namespace dbaccess //........................................................................ //========================================================================== -//= LocalNameApproval +//= LocalNameApproval //========================================================================== class LocalNameApproval : public IContainerApprove { @@ -142,7 +142,7 @@ void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName, DBG_NAME(ODocumentContainer) //-------------------------------------------------------------------------- ODocumentContainer::ODocumentContainer(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl , sal_Bool _bFormsContainer ) @@ -350,11 +350,11 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments Reference< XCommandProcessor > xCommandProcessor(xContent,UNO_QUERY); if ( xContent.is() ) { - xCommandProcessor->execute(aCommand,-1,Reference< XCommandEnvironment >()); + xCommandProcessor->execute(aCommand,-1,Reference< XCommandEnvironment >()); } } - - // xRet = xContent; + + // xRet = xContent; } else if ( ServiceSpecifier == SERVICE_NAME_FORM_COLLECTION || SERVICE_NAME_REPORT_COLLECTION == ServiceSpecifier ) { @@ -389,7 +389,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments pElementImpl = aFind->second; OSL_ENSURE( pElementImpl ," Invalid entry in map!"); xContent = new ODocumentContainer( m_aContext.getLegacyServiceFactory(), *this, pElementImpl, ServiceSpecifier == SERVICE_NAME_FORM_COLLECTION ); - + // copy children if ( xCopyFrom.is() ) { @@ -425,7 +425,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments { if ( m_bFormsContainer ) sServiceName = SERVICE_NAME_FORM_COLLECTION; - else + else sServiceName = SERVICE_NAME_REPORT_COLLECTION; } else @@ -455,7 +455,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getAvailableServiceName Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException) { Any aRet; - if ( aCommand.Name.compareToAscii( "open" ) == 0 ) + if ( aCommand.Name.compareToAscii( "open" ) == 0 ) { ////////////////////////////////////////////////////////////////// // open command for a folder content @@ -526,13 +526,13 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com ////////////////////////////////////////////////////////////////// Sequence< ::rtl::OUString> aSeq = getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) removeByName(*pIter); dispose(); } - else + else aRet = OContentHelper::execute(aCommand,CommandId,Environment); return aRet; } @@ -563,8 +563,8 @@ namespace } } if ( nIndex == -1 ) - _sSimpleName = sName; // a content - else + _sSimpleName = sName; // a content + else _xNameContainer.clear(); // a sub folder doesn't exist return bRet; } @@ -653,7 +653,7 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUStrin ::rtl::OUString sName; if ( lcl_queryContent(_sName,xNameContainer,aContent,sName) ) throw ElementExistException(_sName,*this); - + if ( !xNameContainer.is() ) { ::rtl::OUString sMessage( DBA_RES( RID_STR_NO_SUB_FOLDER ) ); @@ -768,7 +768,7 @@ void SAL_CALL ODocumentContainer::revert( ) throw (::com::sun::star::io::IOExce } // ----------------------------------------------------------------------------- Reference< XStorage> ODocumentContainer::getContainerStorage() const -{ +{ return m_pImpl->m_pDataSource ? m_pImpl->m_pDataSource->getStorage( m_bFormsContainer ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) : Reference< XStorage>(); @@ -798,7 +798,7 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName ) // do the removal implRemove(_rName); - // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name + // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers ); } @@ -828,6 +828,6 @@ void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index c1a9c424d7d3..f401d68b6688 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ +#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> #endif #ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_ @@ -48,7 +48,7 @@ #endif #ifndef _COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include <com/sun/star/embed/XTransactedObject.hpp> -#endif +#endif #ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include <comphelper/propertystatecontainer.hxx> #endif @@ -63,28 +63,28 @@ namespace dbaccess { //........................................................................ -typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader - , ::com::sun::star::lang::XMultiServiceFactory - , ::com::sun::star::container::XHierarchicalNameContainer - , ::com::sun::star::container::XHierarchicalName - , ::com::sun::star::embed::XTransactedObject - > ODocumentContainer_Base; +typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader + , ::com::sun::star::lang::XMultiServiceFactory + , ::com::sun::star::container::XHierarchicalNameContainer + , ::com::sun::star::container::XHierarchicalName + , ::com::sun::star::embed::XTransactedObject + > ODocumentContainer_Base; //========================================================================== -//= ODocumentContainer - collections of database documents (reports/forms) +//= ODocumentContainer - collections of database documents (reports/forms) //========================================================================== -class ODocumentContainer : public ODefinitionContainer +class ODocumentContainer : public ODefinitionContainer , public ODocumentContainer_Base , public ::comphelper::OPropertyStateContainer , public ::comphelper::OPropertyArrayUsageHelper< ODocumentContainer > { - sal_Bool m_bFormsContainer; + sal_Bool m_bFormsContainer; public: /** constructs the container.<BR> */ ODocumentContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl , sal_Bool _bFormsContainer ); @@ -161,7 +161,7 @@ protected: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 4615c65fc042..ef8fc20ae600 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -316,13 +316,13 @@ namespace dbaccess //================================================================== // OEmbedObjectHolder //================================================================== - typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder; - class OEmbedObjectHolder : public ::comphelper::OBaseMutex + typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder; + class OEmbedObjectHolder : public ::comphelper::OBaseMutex ,public TEmbedObjectHolder { Reference< XEmbeddedObject > m_xBroadCaster; - ODocumentDefinition* m_pDefinition; - bool m_bInStateChange; + ODocumentDefinition* m_pDefinition; + bool m_bInStateChange; bool m_bInChangingState; protected: virtual void SAL_CALL disposing(); @@ -504,14 +504,14 @@ namespace dbaccess //================================================================== class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { - ::rtl::OUString m_sName; - Reference<XContent> m_xParentContainer; + ::rtl::OUString m_sName; + Reference<XContent> m_xParentContainer; public: ODocumentSaveContinuation() { } - inline Reference<XContent> getContent() const { return m_xParentContainer; } - inline ::rtl::OUString getName() const { return m_sName; } + inline Reference<XContent> getContent() const { return m_xParentContainer; } + inline ::rtl::OUString getName() const { return m_sName; } // XInteractionDocumentSave virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); @@ -1424,10 +1424,10 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R } // @@@ -// storeData(); +// storeData(); aGuard.clear(); -// inserted(); +// inserted(); } // ----------------------------------------------------------------------------- sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) @@ -1569,16 +1569,7 @@ sal_Bool ODocumentDefinition::saveAs() Reference<XNameContainer> xNC(pDocuSave->getContent(),UNO_QUERY); if ( xNC.is() ) { - if ( m_pImpl->m_aProps.aTitle == pDocuSave->getName() ) - { - Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); - if ( xPersist.is() ) - { - xPersist->storeOwn(); - notifyDataSourceModified(); - } - } - else + if ( m_pImpl->m_aProps.aTitle != pDocuSave->getName() ) { try { @@ -1618,6 +1609,12 @@ sal_Bool ODocumentDefinition::saveAs() DBG_UNHANDLED_EXCEPTION(); } } + Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); + if ( xPersist.is() ) + { + xPersist->storeOwn(); + notifyDataSourceModified(); + } } } } @@ -2332,7 +2329,7 @@ void ODocumentDefinition::updateDocumentTitle() if ( xUntitledProvider.is() ) sName += ::rtl::OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); } - + Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY); if ( xDatabaseDocumentModel.is() ) sName = xDatabaseDocumentModel->getTitle() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")) + sName; @@ -2402,6 +2399,6 @@ void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable ) } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 76427ea78baf..b011728a682a 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ namespace dbaccess class OEmbeddedClientHelper; //========================================================================== //= ODocumentDefinition - a database "document" which is simply a link to a real -//= document +//= document //========================================================================== typedef ::cppu::ImplHelper4 < ::com::sun::star::embed::XComponentSupplier @@ -94,16 +94,16 @@ class ODocumentDefinition ,public ::comphelper::OPropertyArrayUsageHelper< ODocumentDefinition > ,public ODocumentDefinition_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xLastKnownConnection; - OInterceptor* m_pInterceptor; - sal_Bool m_bForm; // <TRUE/> if it is a form - sal_Bool m_bOpenInDesign; - sal_Bool m_bInExecute; - sal_Bool m_bRemoveListener; - OEmbeddedClientHelper* m_pClientHelper; + OInterceptor* m_pInterceptor; + sal_Bool m_bForm; // <TRUE/> if it is a form + sal_Bool m_bOpenInDesign; + sal_Bool m_bInExecute; + sal_Bool m_bRemoveListener; + OEmbeddedClientHelper* m_pClientHelper; protected: virtual ~ODocumentDefinition(); @@ -315,7 +315,7 @@ private: ); /** loads the EmbeddedObject if not already loaded - @param _aClassID + @param _aClassID If set, it will be used to create the embedded object. */ void loadEmbeddedObject( @@ -355,7 +355,7 @@ private: /** searches for read-only flag in the args of the model and sets it to the given value, if the value was not found, it will be appended. - @param _bReadOnly + @param _bReadOnly If <TRUE/> the document will be switched to readonly mode */ void updateDocumentTitle(); @@ -403,7 +403,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index c25d052a396c..6788abf596db 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -187,7 +187,7 @@ namespace dbaccess const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( _Event.EventName ) ); - + ::rtl::OUString sEventType; bool bScriptAssigned = aScriptDescriptor.get_ensureType( "EventType", sEventType ); @@ -218,7 +218,7 @@ namespace dbaccess DBG_UNHANDLED_EXCEPTION(); } } - + //-------------------------------------------------------------------- void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ ) throw (RuntimeException) { diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx index 5705c5304bd7..518c2c6c0d48 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index cfbf96433971..89c533bce839 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,8 +78,8 @@ namespace dbaccess bool m_bInitialized; bool m_bDisposed; ::rtl::Reference< ::comphelper::AsyncEventNotifier > m_pEventBroadcaster; - ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners; - ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners; + ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners; + ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners; public: DocumentEventNotifier_Impl( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex ) diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx index 870f5decf984..3beb9b3cf632 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 8d191c1d3503..8594fc607022 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ namespace dbaccess elementPos->second = aEventDescriptor; } - + //-------------------------------------------------------------------- Any SAL_CALL DocumentEvents::getByName( const ::rtl::OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -222,7 +222,7 @@ namespace dbaccess aReturn <<= rEventDesc; return aReturn; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) { @@ -237,7 +237,7 @@ namespace dbaccess ); return aNames; } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL DocumentEvents::hasByName( const ::rtl::OUString& _Name ) throw (RuntimeException) { @@ -245,13 +245,13 @@ namespace dbaccess return m_pData->rEventsData.find( _Name ) != m_pData->rEventsData.end(); } - + //-------------------------------------------------------------------- Type SAL_CALL DocumentEvents::getElementType( ) throw (RuntimeException) { return ::cppu::UnoType< Sequence< PropertyValue > >::get(); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL DocumentEvents::hasElements( ) throw (RuntimeException) { diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 6d761027e0ca..4951cefe5bb1 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 8a24bbcdf4a3..352cae82ba09 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,12 +56,12 @@ using namespace ::com::sun::star::container; using namespace ::comphelper; using namespace ::cppu; -#define DISPATCH_SAVEAS 0 -#define DISPATCH_SAVE 1 -#define DISPATCH_CLOSEDOC 2 -#define DISPATCH_CLOSEWIN 3 -#define DISPATCH_CLOSEFRAME 4 -#define DISPATCH_RELOAD 5 +#define DISPATCH_SAVEAS 0 +#define DISPATCH_SAVE 1 +#define DISPATCH_CLOSEDOC 2 +#define DISPATCH_CLOSEWIN 3 +#define DISPATCH_CLOSEFRAME 4 +#define DISPATCH_RELOAD 5 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines void SAL_CALL OInterceptor::dispose() @@ -97,12 +97,12 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllo OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size."); - m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); - m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); - m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); - m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); - m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); - m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); + m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); + m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); + m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); + m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); + m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); + m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); } @@ -182,7 +182,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal return; } - if ( _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEDOC ] + if ( _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEDOC ] || _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEWIN ] || _URL.Complete == m_aInterceptedURL[ DISPATCH_CLOSEFRAME ] ) @@ -236,7 +236,7 @@ void SAL_CALL OInterceptor::addStatusListener( if ( m_pContentHolder && _URL.Complete == m_aInterceptedURL[DISPATCH_SAVEAS] ) { // SaveAs - + if ( !m_pContentHolder->isNewReport() ) { FeatureStateEvent aStateEvent; @@ -246,7 +246,7 @@ void SAL_CALL OInterceptor::addStatusListener( aStateEvent.Requery = sal_False; aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)"))); Control->statusChanged(aStateEvent); - } + } { osl::MutexGuard aGuard(m_aMutex); @@ -325,7 +325,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) +Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) { // now implemented as update return m_aInterceptedURL; @@ -339,7 +339,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con { osl::MutexGuard aGuard(m_aMutex); const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( _URL.Complete == *pIter ) @@ -352,7 +352,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con return Reference<XDispatch>(); } -Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence<DispatchDescriptor >& Requests ) throw ( RuntimeException ) +Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence<DispatchDescriptor >& Requests ) throw ( RuntimeException ) { Sequence< Reference< XDispatch > > aRet; osl::MutexGuard aGuard(m_aMutex); @@ -364,7 +364,7 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons for(sal_Int32 i = 0; i < Requests.getLength(); ++i) { const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( Requests[i].FeatureURL.Complete == *pIter ) @@ -382,15 +382,15 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons //XDispatchProviderInterceptor -Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException ) +Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); return m_xSlaveDispatchProvider; } void SAL_CALL -OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) - throw ( RuntimeException ) +OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) + throw ( RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); m_xSlaveDispatchProvider = NewDispatchProvider; @@ -420,7 +420,7 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider( void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard _rGuard(m_aMutex); - if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) ) + if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) ) { OInterfaceContainerHelper* pListener = m_pStatCL->getContainer(m_aInterceptedURL[DISPATCH_SAVE]); if ( pListener ) @@ -442,6 +442,6 @@ void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 9c69ee0d59d7..e7bacfc63507 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,104 +69,104 @@ protected: public: OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllowEditDoc ); - + void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - + //XDispatch - virtual void SAL_CALL - dispatch( + virtual void SAL_CALL + dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL - addStatusListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XStatusListener >& Control, + addStatusListener( + const ::com::sun::star::uno::Reference< + ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) throw ( ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL - removeStatusListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XStatusListener >& Control, - const ::com::sun::star::util::URL& URL ) + removeStatusListener( + const ::com::sun::star::uno::Reference< + ::com::sun::star::frame::XStatusListener >& Control, + const ::com::sun::star::util::URL& URL ) throw ( ::com::sun::star::uno::RuntimeException ); - + //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException ); - + //XDispatchProvider ( inherited by XDispatchProviderInterceptor ) - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( + queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const ::rtl::OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException ); - - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< + + virtual ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL - queryDispatches( + queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw ( ::com::sun::star::uno::RuntimeException ); - - + + //XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider( ) + ::com::sun::star::frame::XDispatchProvider > SAL_CALL + getSlaveDispatchProvider( ) throw ( ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL - setSlaveDispatchProvider( - const ::com::sun::star::uno::Reference< + setSlaveDispatchProvider( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& NewDispatchProvider ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider( ) + getMasterDispatchProvider( ) throw ( ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL - setMasterDispatchProvider( - const ::com::sun::star::uno::Reference< + setMasterDispatchProvider( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& NewSupplier ) throw ( ::com::sun::star::uno::RuntimeException - ); + ); // XEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - - + + private: - + osl::Mutex m_aMutex; - + ODocumentDefinition* m_pContentHolder; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; @@ -176,12 +176,12 @@ private: cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; PropertyChangeListenerContainer* m_pStatCL; - sal_Bool m_bAllowEditDoc; + sal_Bool m_bAllowEditDoc; }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index 725c7c01e17a..e8602f483ddf 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,11 +79,11 @@ namespace dbaccess struct ResultListEntry { - rtl::OUString aId; - Reference< XContentIdentifier > xId; - ::rtl::Reference< OContentHelper > xContent; - Reference< XRow > xRow; - const ContentProperties& rData; + rtl::OUString aId; + Reference< XContentIdentifier > xId; + ::rtl::Reference< OContentHelper > xContent; + Reference< XRow > xRow; + const ContentProperties& rData; ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {} }; @@ -104,12 +104,12 @@ typedef std::vector< ResultListEntry* > ResultList; struct DataSupplier_Impl { - osl::Mutex m_aMutex; - ResultList m_aResults; - rtl::Reference< ODocumentContainer > m_xContent; - Reference< XMultiServiceFactory > m_xSMgr; - sal_Int32 m_nOpenMode; - sal_Bool m_bCountFinal; + osl::Mutex m_aMutex; + ResultList m_aResults; + rtl::Reference< ODocumentContainer > m_xContent; + Reference< XMultiServiceFactory > m_xSMgr; + sal_Int32 m_nOpenMode; + sal_Bool m_bCountFinal; DataSupplier_Impl( const Reference< XMultiServiceFactory >& rxSMgr, const rtl::Reference< ODocumentContainer >& rContent, @@ -196,7 +196,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) //========================================================================= // virtual -Reference< XContentIdentifier > +Reference< XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -223,7 +223,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) //========================================================================= // virtual -Reference< XContent > +Reference< XContent > DataSupplier::queryContent( sal_uInt32 _nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -249,7 +249,7 @@ DataSupplier::queryContent( sal_uInt32 _nIndex ) sName = sName.getToken(0,'/',nIndex); m_pImpl->m_aResults[ _nIndex ]->xContent = m_pImpl->m_xContent->getContent(sName); - + xContent = m_pImpl->m_aResults[ _nIndex ]->xContent.get(); return xContent; @@ -289,7 +289,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) ) { const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos) { m_pImpl->m_aResults.push_back( @@ -338,7 +338,7 @@ sal_uInt32 DataSupplier::totalCount() // @@@ Obtain data and put it into result list... Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) m_pImpl->m_aResults.push_back( new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) ); @@ -377,7 +377,7 @@ sal_Bool DataSupplier::isCountFinal() //========================================================================= // virtual -Reference< XRow > +Reference< XRow > DataSupplier::queryPropertyValues( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 7b1e5bd814df..3b4ceb8ef398 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx index 0543c7f35326..26c2d2dc9572 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ void DynamicResultSet::initStatic() m_xResultSet1 = new ::ucbhelper::ResultSet( m_xSMgr, m_aCommand.Properties, - new DataSupplier( m_xSMgr, + new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv ); @@ -97,7 +97,7 @@ void DynamicResultSet::initDynamic() m_xResultSet1 = new ::ucbhelper::ResultSet( m_xSMgr, m_aCommand.Properties, - new DataSupplier( m_xSMgr, + new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv ); diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx index a81658587003..24caf5c326fd 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |