summaryrefslogtreecommitdiff
path: root/dbaccess/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/core')
-rw-r--r--dbaccess/source/core/api/RowSetBase.hxx14
-rw-r--r--dbaccess/source/core/api/RowSetRow.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx12
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx18
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx6
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx10
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.hxx2
-rw-r--r--dbaccess/source/core/inc/ContentHelper.hxx2
-rw-r--r--dbaccess/source/core/inc/FilteredContainer.hxx8
-rw-r--r--dbaccess/source/core/inc/PropertyForward.hxx2
-rw-r--r--dbaccess/source/core/inc/SingleSelectQueryComposer.hxx6
-rw-r--r--dbaccess/source/core/inc/column.hxx6
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx20
15 files changed, 58 insertions, 58 deletions
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 385ef02aed57..1aa91ee218b5 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -332,16 +332,16 @@ namespace dbaccess
struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } };
// cancel the insertion, if necessary (means if we're on the insert row)
- inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); }
- inline bool isModification( const GrantNotifierAccess& ) { return isModification(); }
- inline bool isModified( const GrantNotifierAccess& ) { return isModified(); }
- inline bool isNew( const GrantNotifierAccess& ) { return isNew(); }
- inline bool isInsertRow() { return m_bIsInsertRow; } // isNew() || isModified(); }
- inline void fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld, const GrantNotifierAccess& )
+ void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); }
+ bool isModification( const GrantNotifierAccess& ) { return isModification(); }
+ bool isModified( const GrantNotifierAccess& ) { return isModified(); }
+ bool isNew( const GrantNotifierAccess& ) { return isNew(); }
+ bool isInsertRow() { return m_bIsInsertRow; } // isNew() || isModified(); }
+ void fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld, const GrantNotifierAccess& )
{
fireProperty( _nProperty, _bNew, _bOld );
}
- inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& )
+ void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& )
{
firePropertyChange(_nPos,_rNewValue);
}
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 2763fbf6aa6f..0c8b0385c010 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -43,8 +43,8 @@ namespace dbaccess
{}
const ORowSetRow& getRow() const { return m_aRow; }
- inline void clearRow() { m_aRow = nullptr; }
- inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
+ void clearRow() { m_aRow = nullptr; }
+ void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
};
typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 784d4e4e1880..3f9d5df425b3 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -61,16 +61,16 @@ namespace dbaccess
OComponentDefinition_Impl();
virtual ~OComponentDefinition_Impl() override;
- inline size_t size() const { return m_aColumns.size(); }
+ size_t size() const { return m_aColumns.size(); }
- inline const_iterator begin() const { return m_aColumns.begin(); }
- inline const_iterator end() const { return m_aColumns.end(); }
+ const_iterator begin() const { return m_aColumns.begin(); }
+ const_iterator end() const { return m_aColumns.end(); }
- inline const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); }
+ const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); }
- inline void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); }
+ void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); }
- inline void insert( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxColumn )
+ void insert( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxColumn )
{
OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element with this name!" );
m_aColumns.insert( Columns::value_type( _rName, _rxColumn ) );
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index bd56e902571b..62574861b490 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -247,7 +247,7 @@ public:
/** determines whether the database document has an embedded data storage
*/
- inline bool isEmbeddedDatabase() const { return ( m_sConnectURL.startsWith("sdbc:embedded:") ); }
+ bool isEmbeddedDatabase() const { return ( m_sConnectURL.startsWith("sdbc:embedded:") ); }
/** stores the embedded storage ("database")
@@ -330,8 +330,8 @@ public:
void clearConnections();
css::uno::Reference< css::embed::XStorage > getOrCreateRootStorage();
- inline css::uno::Reference< css::embed::XStorage > getRootStorage() const { return m_xDocumentStorage.getTyped(); }
- inline void resetRootStorage() { impl_switchToStorage_throw( nullptr ); }
+ css::uno::Reference< css::embed::XStorage > getRootStorage() const { return m_xDocumentStorage.getTyped(); }
+ void resetRootStorage() { impl_switchToStorage_throw( nullptr ); }
/** returns the data source. If it doesn't exist it will be created
*/
@@ -367,7 +367,7 @@ public:
css::uno::Reference< css::document::XDocumentSubStorageSupplier >
getDocumentSubStorageSupplier();
- inline const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; }
+ const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; }
void SAL_CALL acquire();
@@ -506,7 +506,7 @@ protected:
*/
virtual css::uno::Reference< css::uno::XInterface > getThis() const = 0;
- inline ::osl::Mutex& getMutex() const
+ ::osl::Mutex& getMutex() const
{
return m_aMutex;
}
@@ -520,24 +520,24 @@ public:
if m_pImpl is <NULL/>. Usually, you will set this member in your derived
component's <code>dispose</code> method to <NULL/>.
*/
- inline ::osl::Mutex& getMutex( GuardAccess ) const
+ ::osl::Mutex& getMutex( GuardAccess ) const
{
return getMutex();
}
/// checks whether the component is already disposed, throws a DisposedException if so
- inline void checkDisposed() const
+ void checkDisposed() const
{
if ( !m_pImpl.is() )
throw css::lang::DisposedException( "Component is already disposed.", getThis() );
}
- inline void lockModify()
+ void lockModify()
{
m_pImpl->lockModify();
}
- inline void unlockModify()
+ void unlockModify()
{
m_pImpl->unlockModify();
}
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 35985fb42d73..dddeb3ec10af 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -198,7 +198,7 @@ public:
protected:
/// @throws css::lang::DisposedException
- inline void checkDisposed()
+ void checkDisposed()
{
if ( rBHelper.bDisposed || !m_xConnection.is() )
throw css::lang::DisposedException();
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 52367d4ed01d..99e4668a7706 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -104,11 +104,11 @@ namespace dbaccess
public:
explicit DatabaseDocumentLoader( const Reference<XComponentContext> & rxContext);
- inline void append(const ODatabaseModelImpl& _rModelImpl )
+ void append(const ODatabaseModelImpl& _rModelImpl )
{
m_aDatabaseDocuments.push_back(&_rModelImpl);
}
- inline void remove(const ODatabaseModelImpl& _rModelImpl) { m_aDatabaseDocuments.remove(&_rModelImpl); }
+ void remove(const ODatabaseModelImpl& _rModelImpl) { m_aDatabaseDocuments.remove(&_rModelImpl); }
private:
// XTerminateListener
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 66a87e766d94..2051c73f43d4 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -437,7 +437,7 @@ public:
/** checks whether the component is already initialized, throws a NotInitializedException if not
*/
- inline void checkInitialized() const
+ void checkInitialized() const
{
if ( !impl_isInitialized() )
throw css::lang::NotInitializedException( OUString(), getThis() );
@@ -446,7 +446,7 @@ public:
/** checks the document is currently in the initialization phase, or already initialized.
Throws NotInitializedException if not so.
*/
- inline void checkNotUninitilized() const
+ void checkNotUninitilized() const
{
if ( impl_isInitialized() || impl_isInitializing() )
// fine
@@ -458,7 +458,7 @@ public:
/** checks whether the document is currently being initialized, or already initialized,
throws a DoubleInitializationException if so
*/
- inline void checkNotInitialized() const
+ void checkNotInitialized() const
{
if ( impl_isInitializing() || impl_isInitialized() )
throw css::frame::DoubleInitializationException( OUString(), getThis() );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 2a4372e9ec18..82a8869b6ad8 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -243,7 +243,7 @@ namespace dbaccess
virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) override
{
}
- inline void resetClient() { m_pClient = nullptr; }
+ void resetClient() { m_pClient = nullptr; }
};
// LockModifiable
@@ -298,13 +298,13 @@ namespace dbaccess
Reference< XInterface > m_xClient;
public:
- inline static void couple( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
+ static void couple( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
{
Reference< css::lang::XEventListener > xEnsureDelete( new LifetimeCoupler( _rxClient, _rxActor ) );
}
private:
- inline LifetimeCoupler( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
+ LifetimeCoupler( const Reference< XInterface >& _rxClient, const Reference< XComponent >& _rxActor )
:m_xClient( _rxClient )
{
OSL_ENSURE( _rxActor.is(), "LifetimeCoupler::LifetimeCoupler: this will crash!" );
@@ -646,7 +646,7 @@ namespace
}
}
- inline ~PreserveVisualAreaSize()
+ ~PreserveVisualAreaSize()
{
if ( m_xVisObject.is() && m_aOriginalSize.Width && m_aOriginalSize.Height )
{
@@ -690,7 +690,7 @@ namespace
}
}
- inline ~LayoutManagerLock()
+ ~LayoutManagerLock()
{
try
{
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index 8b8125535994..dcf2cfbb6847 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -143,7 +143,7 @@ public:
void saveAs();
void closeObject();
bool isModified();
- inline bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; }
+ bool isNewReport() const { return !m_bForm && !m_pImpl->m_aProps.bAsTemplate; }
static void fillReportData(
const css::uno::Reference< css::uno::XComponentContext > & _rxContext,
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 0ffd47de5cbc..14c68000ade8 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -174,7 +174,7 @@ namespace dbaccess
// XRename
virtual void SAL_CALL rename( const OUString& newName ) override;
- inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; }
+ const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; }
css::uno::Reference< css::sdbc::XRow >
getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties );
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index 132f12f0c6b5..5ba75652b80d 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -53,8 +53,8 @@ namespace dbaccess
*/
virtual OUString getTableTypeRestriction() const = 0;
- inline virtual void addMasterContainerListener(){}
- inline virtual void removeMasterContainerListener(){}
+ virtual void addMasterContainerListener(){}
+ virtual void removeMasterContainerListener(){}
// ::connectivity::sdbcx::OCollection
virtual void impl_refresh() override;
@@ -108,7 +108,7 @@ namespace dbaccess
oslInterlockedCount& _nInAppend
);
- inline void dispose() { disposing(); }
+ void dispose() { disposing(); }
/** late ctor. The container will fill itself with the data got by the connection meta data, considering the
filters given (the connection is the parent object you passed in the ctor).
@@ -127,7 +127,7 @@ namespace dbaccess
const css::uno::Sequence< OUString >& _rTableTypeFilter
);
- inline bool isInitialized() const { return m_bConstructed; }
+ bool isInitialized() const { return m_bConstructed; }
};
} // namespace
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index 68c4be4d6c26..5caa9bef5bb7 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -61,7 +61,7 @@ namespace dbaccess
// css::lang::XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;
- inline void setName( const OUString& _sName ) { m_sName = _sName; }
+ void setName( const OUString& _sName ) { m_sName = _sName; }
void setDefinition( const css::uno::Reference< css::beans::XPropertySet >& _xDest);
const css::uno::Reference< css::beans::XPropertySet >& getDefinition() const { return m_xDest; }
};
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 661f76e9a6f1..a10d84bfbc83 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -66,7 +66,7 @@ namespace dbaccess
SQLPartCount
};
- static inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); }
+ static void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); }
enum EColumnType
{
SelectColumns = 0,
@@ -149,8 +149,8 @@ namespace dbaccess
setCurrentColumns( EColumnType _eType, const ::rtl::Reference< ::connectivity::OSQLColumns >& _rCols );
//helper methods for mem_fun_t
- inline bool implSetFilter(const OUString& _sFilter) { setFilter(_sFilter); return true;}
- inline bool implSetHavingClause(const OUString& _sFilter) { setHavingClause(_sFilter); return true;}
+ bool implSetFilter(const OUString& _sFilter) { setFilter(_sFilter); return true;}
+ bool implSetHavingClause(const OUString& _sFilter) { setHavingClause(_sFilter); return true;}
/** returns the part of the select statement
@param _ePart
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 85305743e475..b9be7f0a2e5a 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -172,9 +172,9 @@ namespace dbaccess
}
/** flag which determines whether the container is filled or not
*/
- inline bool isInitialized() const { return m_bInitialized; }
- inline void setInitialized() {m_bInitialized = true;}
- inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; }
+ bool isInitialized() const { return m_bInitialized; }
+ void setInitialized() {m_bInitialized = true;}
+ void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; }
public:
/** constructs an empty container without configuration location.
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 472bc2f4a076..c50df7b18db0 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -58,18 +58,18 @@ private:
NamedDefinitions m_aDefinitions;
public:
- inline size_t size() const { return m_aDefinitions.size(); }
+ size_t size() const { return m_aDefinitions.size(); }
- inline const_iterator begin() const { return m_aDefinitions.begin(); }
- inline const_iterator end() const { return m_aDefinitions.end(); }
+ const_iterator begin() const { return m_aDefinitions.begin(); }
+ const_iterator end() const { return m_aDefinitions.end(); }
- inline const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); }
+ const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); }
const_iterator find( const TContentPtr& _pDefinition ) const;
- inline void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); }
+ void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); }
void erase( const TContentPtr& _pDefinition );
- inline void insert( const OUString& _rName, TContentPtr _pDefinition )
+ void insert( const OUString& _rName, TContentPtr _pDefinition )
{
m_aDefinitions.insert( NamedDefinitions::value_type( _rName, _pDefinition ) );
}
@@ -142,12 +142,12 @@ protected:
protected:
virtual ~ODefinitionContainer() override;
- inline const ODefinitionContainer_Impl& getDefinitions() const
+ const ODefinitionContainer_Impl& getDefinitions() const
{
return dynamic_cast< const ODefinitionContainer_Impl& >( *m_pImpl.get() );
}
- inline ODefinitionContainer_Impl& getDefinitions()
+ ODefinitionContainer_Impl& getDefinitions()
{
return dynamic_cast< ODefinitionContainer_Impl& >( *m_pImpl.get() );
}
@@ -292,7 +292,7 @@ protected:
ListenerType _eType
);
- inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
+ SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const
{
return const_cast< XContainer* >( static_cast< const XContainer* >( this ) );
}
@@ -318,7 +318,7 @@ private:
const css::uno::Reference< css::ucb::XContent >& _rxObject
) const;
- inline bool impl_haveAnyListeners_nothrow() const
+ bool impl_haveAnyListeners_nothrow() const
{
return ( m_aContainerListeners.getLength() > 0 ) || ( m_aApproveListeners.getLength() > 0 );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 17:05:16 +0000