summaryrefslogtreecommitdiff
path: root/dbaccess/source/core/dataaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/core/dataaccess')
-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
7 files changed, 27 insertions, 27 deletions
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,