diff options
Diffstat (limited to 'ucb/source/cacher')
-rw-r--r-- | ucb/source/cacher/cachedcontentresultset.cxx | 54 | ||||
-rw-r--r-- | ucb/source/cacher/cachedcontentresultset.hxx | 42 | ||||
-rw-r--r-- | ucb/source/cacher/cachedcontentresultsetstub.cxx | 6 | ||||
-rw-r--r-- | ucb/source/cacher/cachedcontentresultsetstub.hxx | 6 | ||||
-rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.cxx | 24 | ||||
-rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.hxx | 24 | ||||
-rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.cxx | 10 | ||||
-rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.hxx | 10 |
8 files changed, 88 insertions, 88 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index bdedd08e1b94..50f56afd8b31 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -132,21 +132,21 @@ CachedContentResultSet::CCRS_Cache::~CCRS_Cache() { } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::clear() { m_pResult.reset(); clearMappedReminder(); } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::loadData( const FetchResult& rResult ) { clear(); m_pResult.reset( new FetchResult( rResult ) ); } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::hasRow( sal_Int32 row ) { if( !m_pResult ) @@ -161,7 +161,7 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache return nStart <= row && row <= nEnd; } -sal_Int32 SAL_CALL CachedContentResultSet::CCRS_Cache +sal_Int32 CachedContentResultSet::CCRS_Cache ::getMaxRow() { if( !m_pResult ) @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL CachedContentResultSet::CCRS_Cache return nEnd; } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::hasKnownLast() { if( !m_pResult ) @@ -184,7 +184,7 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache && m_pResult->Rows.getLength(); } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::hasCausedException( sal_Int32 nRow ) { if( !m_pResult ) @@ -199,7 +199,7 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache return nRow == nEnd+1; } -Any& SAL_CALL CachedContentResultSet::CCRS_Cache +Any& CachedContentResultSet::CCRS_Cache ::getRowAny( sal_Int32 nRow ) { if( !nRow ) @@ -216,7 +216,7 @@ Any& SAL_CALL CachedContentResultSet::CCRS_Cache return (m_pResult->Rows)[nDiff]; } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::remindMapped( sal_Int32 nRow ) { //remind that this row was mapped @@ -230,7 +230,7 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache (*pMappedReminder)[nDiff] = true; } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::isRowMapped( sal_Int32 nRow ) { if( !m_pMappedReminder || !m_pResult ) @@ -243,14 +243,14 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache return false; } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::clearMappedReminder() { delete m_pMappedReminder; m_pMappedReminder = nullptr; } -Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache +Sequence< sal_Bool >* CachedContentResultSet::CCRS_Cache ::getMappedReminder() { if( !m_pMappedReminder ) @@ -263,7 +263,7 @@ Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache return m_pMappedReminder; } -const Any& SAL_CALL CachedContentResultSet::CCRS_Cache +const Any& CachedContentResultSet::CCRS_Cache ::getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ) { if( !nColumnIndex ) @@ -289,7 +289,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache return (*rRow)[nColumnIndex-1]; } -OUString SAL_CALL CachedContentResultSet::CCRS_Cache +OUString CachedContentResultSet::CCRS_Cache ::getContentIdentifierString( sal_Int32 nRow ) { try @@ -310,7 +310,7 @@ OUString SAL_CALL CachedContentResultSet::CCRS_Cache } } -Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache +Reference< XContentIdentifier > CachedContentResultSet::CCRS_Cache ::getContentIdentifier( sal_Int32 nRow ) { try @@ -331,7 +331,7 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache } } -Reference< XContent > SAL_CALL CachedContentResultSet::CCRS_Cache +Reference< XContent > CachedContentResultSet::CCRS_Cache ::getContent( sal_Int32 nRow ) { try @@ -371,14 +371,14 @@ class CCRS_PropertySetInfo : long m_nFetchDirectionPropertyHandle; private: - sal_Int32 SAL_CALL + sal_Int32 impl_getRemainedHandle() const; - bool SAL_CALL + bool impl_queryProperty( const OUString& rName , css::beans::Property& rProp ) const; - sal_Int32 SAL_CALL + sal_Int32 impl_getPos( const OUString& rName ) const; static bool SAL_CALL @@ -553,7 +553,7 @@ sal_Bool SAL_CALL CCRS_PropertySetInfo // impl_ methods. -sal_Int32 SAL_CALL CCRS_PropertySetInfo +sal_Int32 CCRS_PropertySetInfo ::impl_getPos( const OUString& rName ) const { for( sal_Int32 nN = m_pProperties->getLength(); nN--; ) @@ -565,7 +565,7 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo return -1; } -bool SAL_CALL CCRS_PropertySetInfo +bool CCRS_PropertySetInfo ::impl_queryProperty( const OUString& rName, Property& rProp ) const { for( sal_Int32 nN = m_pProperties->getLength(); nN--; ) @@ -594,7 +594,7 @@ bool SAL_CALL CCRS_PropertySetInfo || rPropertyName == g_sPropertyNameForFetchDirection ); } -sal_Int32 SAL_CALL CCRS_PropertySetInfo +sal_Int32 CCRS_PropertySetInfo ::impl_getRemainedHandle( ) const { sal_Int32 nHandle = 1; @@ -676,7 +676,7 @@ CachedContentResultSet::~CachedContentResultSet() // impl_ methods. -bool SAL_CALL CachedContentResultSet +bool CachedContentResultSet ::applyPositionToOrigin( sal_Int32 nRow ) { impl_EnsureNotDisposed(); @@ -802,14 +802,14 @@ if( nMax > nCurCount ) \ if( bIsFinalCount && !bCurIsFinalCount ) \ impl_changeIsRowCountFinal( bCurIsFinalCount, bIsFinalCount ); -void SAL_CALL CachedContentResultSet +void CachedContentResultSet ::impl_fetchData( sal_Int32 nRow , sal_Int32 nFetchSize, sal_Int32 nFetchDirection ) { FETCH_XXX( m_aCache, m_xFetchProvider, fetch ); } -void SAL_CALL CachedContentResultSet +void CachedContentResultSet ::impl_changeRowCount( sal_Int32 nOld, sal_Int32 nNew ) { OSL_ENSURE( nNew > nOld, "RowCount only can grow" ); @@ -832,7 +832,7 @@ void SAL_CALL CachedContentResultSet impl_notifyPropertyChangeListeners( aEvt ); } -void SAL_CALL CachedContentResultSet +void CachedContentResultSet ::impl_changeIsRowCountFinal( bool bOld, bool bNew ) { OSL_ENSURE( !bOld && bNew, "This change is not allowed for IsRowCountFinal" ); @@ -855,14 +855,14 @@ void SAL_CALL CachedContentResultSet impl_notifyPropertyChangeListeners( aEvt ); } -bool SAL_CALL CachedContentResultSet +bool CachedContentResultSet ::impl_isKnownValidPosition( sal_Int32 nRow ) { return m_nKnownCount && nRow && nRow <= m_nKnownCount; } -bool SAL_CALL CachedContentResultSet +bool CachedContentResultSet ::impl_isKnownInvalidPosition( sal_Int32 nRow ) { if( !nRow ) diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 973b18d0aa24..0299f67c51bb 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -61,52 +61,52 @@ class CachedContentResultSet private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Any& SAL_CALL + css::uno::Any& getRowAny( sal_Int32 nRow ); - void SAL_CALL clear(); + void clear(); - void SAL_CALL remindMapped( sal_Int32 nRow ); - bool SAL_CALL isRowMapped( sal_Int32 nRow ); - void SAL_CALL clearMappedReminder(); - css::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder(); + void remindMapped( sal_Int32 nRow ); + bool isRowMapped( sal_Int32 nRow ); + void clearMappedReminder(); + css::uno::Sequence< sal_Bool >* getMappedReminder(); public: CCRS_Cache( const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping ); ~CCRS_Cache(); - void SAL_CALL loadData( + void loadData( const css::ucb::FetchResult& rResult ); - bool SAL_CALL + bool hasRow( sal_Int32 nRow ); - bool SAL_CALL + bool hasCausedException( sal_Int32 nRow ); - sal_Int32 SAL_CALL + sal_Int32 getMaxRow(); - bool SAL_CALL + bool hasKnownLast(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - const css::uno::Any& SAL_CALL + const css::uno::Any& getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ); /// @throws css::uno::RuntimeException - OUString SAL_CALL + OUString getContentIdentifierString( sal_Int32 nRow ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL + css::uno::Reference< css::ucb::XContentIdentifier > getContentIdentifier( sal_Int32 nRow ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::ucb::XContent > SAL_CALL + css::uno::Reference< css::ucb::XContent > getContent( sal_Int32 nRow ); }; @@ -159,24 +159,24 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool SAL_CALL + bool applyPositionToOrigin( sal_Int32 nRow ); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_fetchData( sal_Int32 nRow, sal_Int32 nCount , sal_Int32 nFetchDirection ); - bool SAL_CALL + bool impl_isKnownValidPosition( sal_Int32 nRow ); - bool SAL_CALL + bool impl_isKnownInvalidPosition( sal_Int32 nRow ); - void SAL_CALL + void impl_changeRowCount( sal_Int32 nOld, sal_Int32 nNew ); - void SAL_CALL + void impl_changeIsRowCountFinal( bool bOld, bool bNew ); public: diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 4e129f536132..e1cc01584d08 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -299,7 +299,7 @@ FetchResult SAL_CALL CachedContentResultSetStub FETCH_XXX( impl_getCurrentRowContent, m_xRowOrigin ); } -sal_Int32 SAL_CALL CachedContentResultSetStub +sal_Int32 CachedContentResultSetStub ::impl_getColumnCount() { sal_Int32 nCount; @@ -329,7 +329,7 @@ sal_Int32 SAL_CALL CachedContentResultSetStub return m_nColumnCount; } -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_getCurrentRowContent( Any& rRowContent , const Reference< XRow >& xRow ) { @@ -344,7 +344,7 @@ void SAL_CALL CachedContentResultSetStub rRowContent <<= aContent; } -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ) { //this is done only for the case, that there is another CachedContentResultSet in the chain of underlying ResultSets diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 11c7996d5006..45d904f65df0 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -52,12 +52,12 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_getCurrentRowContent( css::uno::Any& rRowContent, const css::uno::Reference< css::sdbc::XRow >& xRow ); - sal_Int32 SAL_CALL + sal_Int32 impl_getColumnCount(); /// @throws css::uno::RuntimeException @@ -79,7 +79,7 @@ private: , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ); public: diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 6b8335fbf064..1c84d56b46fa 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -63,7 +63,7 @@ ContentResultSetWrapper::ContentResultSetWrapper( }; -void SAL_CALL ContentResultSetWrapper::impl_init_xRowOrigin() +void ContentResultSetWrapper::impl_init_xRowOrigin() { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -81,7 +81,7 @@ void SAL_CALL ContentResultSetWrapper::impl_init_xRowOrigin() } } -void SAL_CALL ContentResultSetWrapper::impl_init_xContentAccessOrigin() +void ContentResultSetWrapper::impl_init_xContentAccessOrigin() { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -100,7 +100,7 @@ void SAL_CALL ContentResultSetWrapper::impl_init_xContentAccessOrigin() } -void SAL_CALL ContentResultSetWrapper::impl_init_xPropertySetOrigin() +void ContentResultSetWrapper::impl_init_xPropertySetOrigin() { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -118,7 +118,7 @@ void SAL_CALL ContentResultSetWrapper::impl_init_xPropertySetOrigin() } } -void SAL_CALL ContentResultSetWrapper::impl_init() +void ContentResultSetWrapper::impl_init() { //call this at the end of constructor of derived class @@ -138,7 +138,7 @@ ContentResultSetWrapper::~ContentResultSetWrapper() delete m_pVetoableChangeListeners; }; -void SAL_CALL ContentResultSetWrapper::impl_deinit() +void ContentResultSetWrapper::impl_deinit() { //call this at start of destructor of derived class @@ -167,14 +167,14 @@ void SAL_CALL ContentResultSetWrapper::impl_initPropertySetInfo() } } -void SAL_CALL ContentResultSetWrapper::impl_EnsureNotDisposed() +void ContentResultSetWrapper::impl_EnsureNotDisposed() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( m_bDisposed ) throw DisposedException(); } -void SAL_CALL ContentResultSetWrapper::impl_getPropertyChangeListenerContainer() +void ContentResultSetWrapper::impl_getPropertyChangeListenerContainer() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( !m_pPropertyChangeListeners ) @@ -182,7 +182,7 @@ void SAL_CALL ContentResultSetWrapper::impl_getPropertyChangeListenerContainer() new PropertyChangeListenerContainer_Impl( m_aContainerMutex ); } -void SAL_CALL ContentResultSetWrapper::impl_getVetoableChangeListenerContainer() +void ContentResultSetWrapper::impl_getVetoableChangeListenerContainer() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( !m_pVetoableChangeListeners ) @@ -190,7 +190,7 @@ void SAL_CALL ContentResultSetWrapper::impl_getVetoableChangeListenerContainer() new PropertyChangeListenerContainer_Impl( m_aContainerMutex ); } -void SAL_CALL ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const PropertyChangeEvent& rEvt ) +void ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const PropertyChangeEvent& rEvt ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const } } -void SAL_CALL ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const PropertyChangeEvent& rEvt ) +void ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const PropertyChangeEvent& rEvt ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -266,7 +266,7 @@ void SAL_CALL ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const } } -bool SAL_CALL ContentResultSetWrapper::impl_isForwardOnly() +bool ContentResultSetWrapper::impl_isForwardOnly() { //m_nForwardOnly == 2 -> don't know //m_nForwardOnly == 1 -> YES @@ -1284,7 +1284,7 @@ void SAL_CALL ContentResultSetWrapperListener::vetoableChange( const PropertyCha m_pOwner->impl_vetoableChange( rEvt ); } -void SAL_CALL ContentResultSetWrapperListener::impl_OwnerDies() +void ContentResultSetWrapperListener::impl_OwnerDies() { m_pOwner = nullptr; } diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 7823f9f93041..475c3d2d9b65 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -97,10 +97,10 @@ private: //methods: private: - void SAL_CALL + void impl_getPropertyChangeListenerContainer(); - void SAL_CALL + void impl_getVetoableChangeListenerContainer(); protected: @@ -110,14 +110,14 @@ protected: virtual ~ContentResultSetWrapper() override; - void SAL_CALL impl_init(); - void SAL_CALL impl_deinit(); + void impl_init(); + void impl_deinit(); //-- - void SAL_CALL impl_init_xRowOrigin(); - void SAL_CALL impl_init_xContentAccessOrigin(); - void SAL_CALL impl_init_xPropertySetOrigin(); + void impl_init_xRowOrigin(); + void impl_init_xContentAccessOrigin(); + void impl_init_xPropertySetOrigin(); //-- @@ -125,20 +125,20 @@ protected: /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_EnsureNotDisposed(); - void SAL_CALL + void impl_notifyPropertyChangeListeners( const css::beans::PropertyChangeEvent& rEvt ); /// @throws css::beans::PropertyVetoException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notifyVetoableChangeListeners( const css::beans::PropertyChangeEvent& rEvt ); - bool SAL_CALL impl_isForwardOnly(); + bool impl_isForwardOnly(); public: @@ -376,7 +376,7 @@ public: // own methods: - void SAL_CALL impl_OwnerDies(); + void impl_OwnerDies(); }; #endif diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 3079a9cee5bd..a0e71b7be81c 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -62,7 +62,7 @@ DynamicResultSetWrapper::DynamicResultSetWrapper( //call impl_init() at the end of constructor of derived class }; -void SAL_CALL DynamicResultSetWrapper::impl_init() +void DynamicResultSetWrapper::impl_init() { //call this at the end of constructor of derived class @@ -82,14 +82,14 @@ DynamicResultSetWrapper::~DynamicResultSetWrapper() //call impl_deinit() at start of destructor of derived class }; -void SAL_CALL DynamicResultSetWrapper::impl_deinit() +void DynamicResultSetWrapper::impl_deinit() { //call this at start of destructor of derived class m_xMyListenerImpl->impl_OwnerDies(); } -void SAL_CALL DynamicResultSetWrapper::impl_EnsureNotDisposed() +void DynamicResultSetWrapper::impl_EnsureNotDisposed() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( m_bDisposed ) @@ -210,7 +210,7 @@ void SAL_CALL DynamicResultSetWrapper::impl_disposing( const EventObject& ) } //virtual -void SAL_CALL DynamicResultSetWrapper::impl_notify( const ListEvent& Changes ) +void DynamicResultSetWrapper::impl_notify( const ListEvent& Changes ) { impl_EnsureNotDisposed(); //@todo @@ -485,7 +485,7 @@ void SAL_CALL DynamicResultSetWrapperListener::notify( const ListEvent& Changes // own methods: -void SAL_CALL DynamicResultSetWrapperListener::impl_OwnerDies() +void DynamicResultSetWrapperListener::impl_OwnerDies() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index b588b9db0aa6..34a0e60870fa 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -81,11 +81,11 @@ protected: osl::Condition m_aListenerSet; protected: - void SAL_CALL impl_init(); - void SAL_CALL impl_deinit(); + void impl_init(); + void impl_deinit(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_EnsureNotDisposed(); virtual void SAL_CALL @@ -146,7 +146,7 @@ public: impl_disposing( const css::lang::EventObject& Source ); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notify( const css::ucb::ListEvent& Changes ); }; @@ -183,7 +183,7 @@ public: // own methods: - void SAL_CALL impl_OwnerDies(); + void impl_OwnerDies(); }; |