diff options
Diffstat (limited to 'dbaccess')
57 files changed, 172 insertions, 172 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 ); } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index ab16c655765d..def0bf7274f0 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -548,7 +548,7 @@ namespace dbmm /** determines whether the instance is valid, i.e. refers to a valid root storage for reading/storing scripts */ - inline bool isValid() const { return m_xScriptsStorage.is(); } + bool isValid() const { return m_xScriptsStorage.is(); } /** binds the instance to a new document. Only to be called when the instance is not yet bound (i.e. isValid returns <FALSE/>). @@ -780,8 +780,8 @@ namespace dbmm MigrationLog& _rLogger ); - inline size_t getFormCount() const { return m_nFormCount; } - inline size_t getReportCount()const { return m_nReportCount; } + size_t getFormCount() const { return m_nFormCount; } + size_t getReportCount()const { return m_nReportCount; } bool migrateAll(); private: diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index da60e351ea75..3360131e6286 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -48,7 +48,7 @@ namespace dbaxml @param _sTableFilterPattern The new filter pattern. */ - inline void pushTableFilterPattern(const OUString& _sTableFilterPattern) + void pushTableFilterPattern(const OUString& _sTableFilterPattern) { m_aPatterns.push_back(_sTableFilterPattern); } @@ -57,7 +57,7 @@ namespace dbaxml @param _sTypeFilter The new type filter. */ - inline void pushTableTypeFilter(const OUString& _sTypeFilter) + void pushTableTypeFilter(const OUString& _sTypeFilter) { m_aTypes.push_back(_sTypeFilter); } diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index ca92b750e99f..d2372d849d08 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -125,7 +125,7 @@ public: const Reference<XPropertySet>& getDataSource() const { return m_xDataSource; } - inline const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;} + const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;} const SvXMLTokenMap& GetDocElemTokenMap() const; const SvXMLTokenMap& GetDatabaseElemTokenMap() const; @@ -145,15 +145,15 @@ public: /** add a Info to the sequence which will be appended to the data source @param _rInfo The property to append. */ - inline void addInfo(const css::beans::PropertyValue& _rInfo) + void addInfo(const css::beans::PropertyValue& _rInfo) { m_aInfoSequence.push_back(_rInfo); } void setPropertyInfo(); - inline bool isNewFormat() const { return m_bNewFormat; } - inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; } + bool isNewFormat() const { return m_bNewFormat; } + void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; } }; } // namespace dbaxml diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index e8f30cdd156f..f8ff269f15dd 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -51,7 +51,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL release() throw() override; - inline operator css::uno::Reference< css::uno::XInterface > () const + operator css::uno::Reference< css::uno::XInterface > () const { return static_cast<css::uno::XWeak *>(const_cast<OSubComponent *>(this)); } }; diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx index 845a52c0669a..37fb95b16588 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx @@ -88,12 +88,12 @@ namespace sdbtools ::osl::Mutex& getMutex( GuardAccess ) const { return m_aMutex; } - inline bool acquireConnection( GuardAccess ) + bool acquireConnection( GuardAccess ) { m_xConnection.set(m_aConnection); return m_xConnection.is(); } - inline void releaseConnection( GuardAccess ) + void releaseConnection( GuardAccess ) { m_xConnection.clear(); } diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index d423cfc12382..7787f8e7df70 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -163,7 +163,7 @@ namespace sdbtools { } - static inline ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName ) + static ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName ) { if ( ( _rName.indexOf( (sal_Unicode)34 ) >= 0 ) // " || ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // ' diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index b94c4c77624b..09091df09989 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -159,7 +159,7 @@ namespace dbaui // click a TB slot DECL_LINK(OnDropdownClickHdl, ToolBox*, void); - inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } + OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } void ImplInitSettings(); public: @@ -187,7 +187,7 @@ namespace dbaui /** returns the current visible tree list box */ - inline DBTreeListBox* getCurrentView() const + DBTreeListBox* getCurrentView() const { ElementType eType = getElementType(); return (eType != E_NONE ) ? m_pLists[static_cast<sal_Int32>(eType)].get() : nullptr; diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 03cb81134b6a..31ab9c7bf89b 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -66,7 +66,7 @@ namespace dbaui virtual void GetFocus() override; virtual void LoseFocus() override; - inline void resetLastActive() { m_pLastActiveEntry = nullptr;} + void resetLastActive() { m_pLastActiveEntry = nullptr;} void updateHelpText(); @@ -134,7 +134,7 @@ namespace dbaui /// fills the Creation listbox with the necessary strings and images void fillTaskEntryList( const TaskEntryList& _rList ); - inline bool HandleKeyInput( const KeyEvent& _rKEvt ) + bool HandleKeyInput( const KeyEvent& _rKEvt ) { return m_aCreation->HandleKeyInput( _rKEvt ); } @@ -188,8 +188,8 @@ namespace dbaui */ bool interceptKeyInput( const KeyEvent& _rEvent ); - inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } - inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks->getChildWindow() ); } + OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } + OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks->getChildWindow() ); } bool isCutAllowed() override ; bool isCopyAllowed() override ; diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index a902bdae1df9..ac2b9f195909 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -55,9 +55,9 @@ namespace dbaui void cut() override { } void paste() override { } - inline sal_Int32 GetEntryCount() const { return m_aIconControl->GetEntryCount(); } - inline SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); } - inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); } + sal_Int32 GetEntryCount() const { return m_aIconControl->GetEntryCount(); } + SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); } + Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); } /** automatically creates mnemonics for the icon/texts in our left hand side panel */ diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 305b56fdab25..491ebfd56912 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -55,7 +55,7 @@ namespace dbaui @return The child window. */ - inline vcl::Window* getChildWindow() const { return m_pChild; } + vcl::Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource @param _nTitleId diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 136c25535962..289f8c59af38 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -117,7 +117,7 @@ namespace dbaui virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void GetFocus() override; - inline OApplicationController& getAppController() const { return m_rAppController; } + OApplicationController& getAppController() const { return m_rAppController; } // IClipboardTest virtual bool isCutAllowed() override; @@ -128,9 +128,9 @@ namespace dbaui virtual void paste() override; /// get the left panel - inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } + OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } /// get the detail page - inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } + OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } /** return the qualified name. @param _pEntry diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 900f6845441c..851c67cf79a1 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -117,7 +117,7 @@ namespace dbaui } } - inline bool is() const { return xFrame.is(); } + bool is() const { return xFrame.is(); } private: bool impl_constructFrom( const Reference< XComponent >& _rxComponent ) diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index e639e8026795..41832fcd5992 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1224,7 +1224,7 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) /// unary_function Functor object for class ZZ returntype is void struct SbaGridControlPrec : std::unary_function<DataFlavorExVector::value_type,bool> { - inline bool operator()(const DataFlavorExVector::value_type& _aType) + bool operator()(const DataFlavorExVector::value_type& _aType) { switch (_aType.mnSotId) { diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index fd2e66c68bd9..b276bbe61e5f 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -88,7 +88,7 @@ namespace dbaui @param _pItemSetHelper the itemset helper */ - inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) + void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) { OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!"); m_pAdminDialog = _pDialog; diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index a06a1aebcef4..02badb37143c 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -158,7 +158,7 @@ namespace dbaui void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); - inline void SetTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } + void SetTableName(const OUString &_sTableName){ m_sDefaultTableName = _sTableName ; } virtual void release() = 0; diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 84c821e801b5..495a1e6428c7 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -138,12 +138,12 @@ namespace dbaui void InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); protected: - inline void setRightAligned() { m_bRightAligned = true; } - inline bool isRightAligned() const { return m_bRightAligned; } + void setRightAligned() { m_bRightAligned = true; } + bool isRightAligned() const { return m_bRightAligned; } - inline void saveCurrentFieldDescData() { SaveData( pActFieldDescr ); } - inline OFieldDescription* getCurrentFieldDescData() { return pActFieldDescr; } - inline void setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; } + void saveCurrentFieldDescData() { SaveData( pActFieldDescr ); } + OFieldDescription* getCurrentFieldDescData() { return pActFieldDescr; } + void setCurrentFieldDescData( OFieldDescription* _pDesc ) { pActFieldDescr = _pDesc; } sal_uInt16 CountActiveAggregates() const; sal_Int32 GetMaxControlHeight() const; @@ -204,7 +204,7 @@ namespace dbaui OUString getControlDefault( const OFieldDescription* _pFieldDescr, bool _bCheck = true) const; - inline void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; } + void setEditWidth(sal_Int32 _nWidth) { m_nWidth = _nWidth; } }; } #endif diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 8718d884ae4c..ffe027d59f54 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -82,9 +82,9 @@ namespace dbaui OJoinController(const css::uno::Reference< css::uno::XComponentContext >& _rM); // attribute access - inline TTableWindowData& getTableWindowData() { return m_vTableData; } - inline TTableConnectionData& getTableConnectionData() { return m_vTableConnectionData;} - inline OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } + TTableWindowData& getTableWindowData() { return m_vTableData; } + TTableConnectionData& getTableConnectionData() { return m_vTableConnectionData;} + OAddTableDlg* getAddTableDialog()const { return m_pAddTableDialog; } // OSingleDocumentController overridables virtual void reconnect( bool _bUI ) override; diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index c90e987c44f9..51b8bed797f6 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -68,12 +68,12 @@ namespace dbaui virtual bool Update() override; void SetCardinality(); - inline void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } - inline void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } + void SetUpdateRules( sal_Int32 nAttr ){ m_nUpdateRules = nAttr; } + void SetDeleteRules( sal_Int32 nAttr ){ m_nDeleteRules = nAttr; } - inline sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } - inline sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } - inline Cardinality GetCardinality() const { return m_nCardinality; } + sal_Int32 GetUpdateRules() const { return m_nUpdateRules; } + sal_Int32 GetDeleteRules() const { return m_nDeleteRules; } + Cardinality GetCardinality() const { return m_nCardinality; } bool IsConnectionPossible(); void ChangeOrientation(); diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index 1ded72af4837..602f39d3a375 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -40,7 +40,7 @@ namespace dbaui @param _rUpScroll the method to set */ - inline void setUpScrollMethod( const Link<LinkParamNone*,void>& _rUpScroll ) + void setUpScrollMethod( const Link<LinkParamNone*,void>& _rUpScroll ) { m_aUpScroll = _rUpScroll; } @@ -49,7 +49,7 @@ namespace dbaui @param _rDownScroll the method to set */ - inline void setDownScrollMethod( const Link<LinkParamNone*,void>& _rDownScroll ) + void setDownScrollMethod( const Link<LinkParamNone*,void>& _rDownScroll ) { m_aDownScroll = _rDownScroll; } diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index e7cb02228dac..e5de1f31d0f0 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -90,7 +90,7 @@ namespace dbaui const TTableConnectionData::value_type& GetData() const { return m_pData; } const std::vector<OConnectionLine*>& GetConnLineList() const { return m_vConnLine; } - inline OJoinTableView* GetParent() const { return m_pParent; } + OJoinTableView* GetParent() const { return m_pParent; } virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect); using Window::Draw; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index af5e4abba866..9a4484c2222c 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -88,8 +88,8 @@ namespace dbaui const TTableWindowData::value_type& getReferencingTable() const { return m_pReferencingTable; } const TTableWindowData::value_type& getReferencedTable() const { return m_pReferencedTable; } - inline void setReferencingTable(const TTableWindowData::value_type& _pTable) { m_pReferencingTable = _pTable; } - inline void setReferencedTable(const TTableWindowData::value_type& _pTable) { m_pReferencedTable = _pTable; } + void setReferencingTable(const TTableWindowData::value_type& _pTable) { m_pReferencingTable = _pTable; } + void setReferencedTable(const TTableWindowData::value_type& _pTable) { m_pReferencedTable = _pTable; } /** Update create a new connection diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index a6a4b60a22e0..4629155ca21c 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -94,19 +94,19 @@ namespace dbaui bool isAlterAllowed() const; bool isAutoIncrementPrimaryKey() const; - inline bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } - inline const OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } + bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } + const OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } virtual void impl_onModifyChanged() override; - inline std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; } + std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; } /// returns the position of the first empty row sal_Int32 getFirstEmptyRowPosition(); - inline const OTypeInfoMap& getTypeInfo() const { return m_aTypeInfo; } + const OTypeInfoMap& getTypeInfo() const { return m_aTypeInfo; } - inline TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } + TOTypeInfoSP getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; } TOTypeInfoSP getTypeInfoByType(sal_Int32 _nDataType) const; const TOTypeInfoSP& getTypeInfoFallBack() const { return m_pTypeInfo; } diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 970a08603e36..187f2fcb46c7 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -41,7 +41,7 @@ namespace dbaui { } - inline bool operator()(const DataFlavorExVector::value_type& _aType) + bool operator()(const DataFlavorExVector::value_type& _aType) { switch (_aType.mnSotId) { @@ -154,9 +154,9 @@ namespace dbaui /// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>. static bool isTableFormat(const TransferableDataHelper& _rClipboard); - inline void SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } - inline void ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); } - inline const OUString& GetTableNameForAppend() const { return m_sTableNameForAppend ;} + void SetTableNameForAppend( const OUString& _rDefaultTableName ) { m_sTableNameForAppend = _rDefaultTableName; } + void ResetTableNameForAppend() { SetTableNameForAppend( OUString() ); } + const OUString& GetTableNameForAppend() const { return m_sTableNameForAppend ;} private: /** pastes a table into the data source diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index dc5700cae5d1..6c40ab18fd2e 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -109,12 +109,12 @@ namespace dbaui sal_Int32 GetFunctionType() const { return m_eFunctionType; } sal_uInt16 GetColumnId() const { return m_nColumnId;} - inline bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; } - inline bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } - inline bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; } - inline bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; } - inline bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } - inline bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); } + bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; } + bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } + bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; } + bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; } + bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } + bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); } bool HasCriteria() const { diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index a59c978fb8b7..c7bf3a783fe2 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -42,8 +42,8 @@ namespace dbaui OTableRow( const OTableRow& rRow, long nPosition = -1 ); ~OTableRow(); - inline OFieldDescription* GetActFieldDescr() const { return m_pActFieldDescr; } - inline bool isValid() const { return GetActFieldDescr() != nullptr; } + OFieldDescription* GetActFieldDescr() const { return m_pActFieldDescr; } + bool isValid() const { return GetActFieldDescr() != nullptr; } void SetFieldType( const TOTypeInfoSP& _pType, bool _bForce = false ); @@ -54,20 +54,20 @@ namespace dbaui @return the current position in the table */ - inline sal_Int32 GetPos() const { return m_nPos; } - inline void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; } + sal_Int32 GetPos() const { return m_nPos; } + void SetPos(sal_Int32 _nPos) { m_nPos = _nPos; } /** set the row readonly @param _bRead if <TRUE/> then the row is readonly, otherwise not */ - inline void SetReadOnly( bool _bRead=true ){ m_bReadOnly = _bRead; } + void SetReadOnly( bool _bRead=true ){ m_bReadOnly = _bRead; } /** returns if the row is readonly @return <TRUE/> if readonly, otherwise <FALSE/> */ - inline bool IsReadOnly() const { return m_bReadOnly; } + bool IsReadOnly() const { return m_bReadOnly; } friend SvStream& WriteOTableRow( SvStream& rStr,const OTableRow& _rRow ); friend SvStream& ReadOTableRow( SvStream& rStr, OTableRow& _rRow ); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 9ac631897b97..205c5f298ff3 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -161,8 +161,8 @@ namespace dbaui */ virtual OUString GetName() const = 0; - inline css::uno::Reference< css::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } - inline css::uno::Reference< css::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } + css::uno::Reference< css::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); } + css::uno::Reference< css::beans::XPropertySet > GetTable() const { return m_pData->getTable(); } /** set the sizing flag to the direction @param _rPos diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 968c4657790f..7d9caa32e7c1 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -71,20 +71,20 @@ namespace dbaui const OUString& GetWinName() const { return m_aWinName; } const Point& GetPosition() const { return m_aPosition; } const Size& GetSize() const { return m_aSize; } - inline bool IsShowAll() const { return m_bShowAll; } - inline bool isQuery() const { return m_bIsQuery; } - inline bool isValid() const { return m_bIsValid; } // it is either a table or query but it is known + bool IsShowAll() const { return m_bShowAll; } + bool isQuery() const { return m_bIsQuery; } + bool isValid() const { return m_bIsValid; } // it is either a table or query but it is known bool HasPosition() const; bool HasSize() const; - inline void SetWinName( const OUString& rWinName ) { m_aWinName = rWinName; } - inline void SetPosition( const Point& rPos ) { m_aPosition=rPos; } - inline void SetSize( const Size& rSize ) { m_aSize = rSize; } - inline void ShowAll( bool bAll ) { m_bShowAll = bAll; } + void SetWinName( const OUString& rWinName ) { m_aWinName = rWinName; } + void SetPosition( const Point& rPos ) { m_aPosition=rPos; } + void SetSize( const Size& rSize ) { m_aSize = rSize; } + void ShowAll( bool bAll ) { m_bShowAll = bAll; } - inline css::uno::Reference< css::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } - inline css::uno::Reference< css::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } - inline css::uno::Reference< css::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } + css::uno::Reference< css::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xTable; } + css::uno::Reference< css::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xKeys; } + css::uno::Reference< css::container::XNameAccess > getColumns() const { ::osl::MutexGuard aGuard( m_aMutex ); return m_xColumns; } // OEventListenerAdapter virtual void _disposing( const css::lang::EventObject& _rSource ) override; diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 5d029fd7977c..0ae8d9e15daa 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -62,7 +62,7 @@ class ODbDataSourceAdministrationHelper; void clearPassword(); OUString getConnectionURL() const; css::uno::Reference< css::beans::XPropertySet > getCurrentDataSource(); - inline void endExecution() { m_bStopExecution = true; } + void endExecution() { m_bStopExecution = true; } virtual const SfxItemSet* getOutputSet() const override; virtual SfxItemSet* getWriteOutputSet() override; diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index c2ee55adf374..dd1f0d40ca88 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -74,11 +74,11 @@ namespace dbaui OUString GetKeyName() const { return m_pEdKeyName->GetText(); } void setCreateStyleAction(); - inline void disallowViews() + void disallowViews() { m_pRB_View->Disable(); } - inline void disallowUseHeaderLine() + void disallowUseHeaderLine() { m_bUseHeaderAllowed = false; m_pCB_UseHeaderLine->Disable(); diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index bdfca8efdaa2..f9f9c6183ea7 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -122,8 +122,8 @@ namespace dbaui virtual ~OWizTypeSelect() override; virtual void dispose() override; - inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } - inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } + void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } + void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } }; typedef VclPtr<OWizTypeSelect> (*TypeSelectionPageFactory)( vcl::Window*, SvStream& ); diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index cb7353fbd704..900e6d5815be 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -62,9 +62,9 @@ public: /// set a new text, leave the current prefix unchanged void SetTextNoPrefix(const OUString& _rText); - inline void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } + void SaveValueNoPrefix() { m_sSaveValueNoPrefix = GetTextNoPrefix(); } const OUString& GetSavedValueNoPrefix() const { return m_sSaveValueNoPrefix; } - inline void SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; } + void SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; } }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 9f88e0f7eb1a..bbf4908ce195 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -77,16 +77,16 @@ namespace dbaui typedef std::set< ItemID >::const_iterator const_iterator; public: - inline FeatureSet() { } + FeatureSet() { } - inline void put( const ItemID _id ) { m_aContent.insert( _id ); } - inline bool has( const ItemID _id ) const { return m_aContent.find( _id ) != m_aContent.end(); } + void put( const ItemID _id ) { m_aContent.insert( _id ); } + bool has( const ItemID _id ) const { return m_aContent.find( _id ) != m_aContent.end(); } inline bool supportsAnySpecialSetting() const; inline bool supportsGeneratedValues() const; - inline const_iterator begin() const { return m_aContent.begin(); } - inline const_iterator end() const { return m_aContent.end(); } + const_iterator begin() const { return m_aContent.begin(); } + const_iterator end() const { return m_aContent.end(); } private: std::set< ItemID > m_aContent; diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index b95418ed3911..1890fcd0e55f 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -61,7 +61,7 @@ namespace dbaui void SelectNoHandlerCall( SvTreeListEntry* pEntry ); - inline void setConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection) + void setConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection) { m_xConnection = _rxConnection; } diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index b935ca78283a..d1dd97d3f704 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -64,7 +64,7 @@ namespace dbaui ); ~OLinkedDocumentsAccess(); - inline bool isConnected() const { return m_xConnection.is(); } + bool isConnected() const { return m_xConnection.is(); } css::uno::Reference< css::lang::XComponent> open( diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index b150b4bac473..e0c6b452b81c 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -94,9 +94,9 @@ namespace dbaui css::uno::Reference< css::container::XNameAccess > getObjectContainer() const; - inline bool editingView() const { return m_nCommandType == css::sdb::CommandType::TABLE; } - inline bool editingQuery() const { return m_nCommandType == css::sdb::CommandType::QUERY; } - inline bool editingCommand() const { return m_nCommandType == css::sdb::CommandType::COMMAND; } + bool editingView() const { return m_nCommandType == css::sdb::CommandType::TABLE; } + bool editingQuery() const { return m_nCommandType == css::sdb::CommandType::QUERY; } + bool editingCommand() const { return m_nCommandType == css::sdb::CommandType::COMMAND; } bool askForNewName( const css::uno::Reference< css::container::XNameAccess>& _xElements, bool _bSaveAs); diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index 33f492fcc03b..ddf15b1a6074 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -36,10 +36,10 @@ namespace dbaui OQueryTableConnection& operator=(const OQueryTableConnection& rConn); bool operator==(const OQueryTableConnection& rCompare); - inline OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } + OUString GetAliasName(EConnectionSide nWhich) const { return static_cast<OQueryTableConnectionData*>(GetData().get())->GetAliasName(nWhich); } - inline bool IsVisited() const { return m_bVisited; } - inline void SetVisited(bool bVisited) { m_bVisited = bVisited; } + bool IsVisited() const { return m_bVisited; } + void SetVisited(bool bVisited) { m_bVisited = bVisited; } }; } diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index 8f46c5459663..6d590cfccbb4 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -69,8 +69,8 @@ namespace dbaui EJoinType GetJoinType() const { return m_eJoinType; }; void SetJoinType(const EJoinType& eJT) { m_eJoinType = eJT; }; - inline void setNatural(bool _bNatural) { m_bNatural = _bNatural; } - inline bool isNatural() const { return m_bNatural; } + void setNatural(bool _bNatural) { m_bNatural = _bNatural; } + bool isNatural() const { return m_bNatural; } }; } diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index b5de8518dd59..cfcbb7950bba 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -40,7 +40,7 @@ namespace dbaui OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID); virtual ~OQueryDesignFieldUndoAct() override; - inline void SetColumnPosition(sal_uInt16 _nColumnPosition) + void SetColumnPosition(sal_uInt16 _nColumnPosition) { m_nColumnPosition = _nColumnPosition; OSL_ENSURE(m_nColumnPosition != BROWSER_INVALIDID,"Column position was not set add the undo action!"); @@ -78,7 +78,7 @@ namespace dbaui public: explicit OTabFieldSizedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OQueryDesignFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_SIZE_COLUMN), m_nNextWidth(0) { } - inline void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; } + void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; } virtual void Undo() override; virtual void Redo() override { Undo(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 6c66c83fce8b..8fa74e9b6c49 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -139,10 +139,10 @@ namespace dbaui /** Disables the generation of undo actions */ - inline void EnterUndoMode() { m_bInUndoMode = true; } + void EnterUndoMode() { m_bInUndoMode = true; } /** Enables the generation of undo actions */ - inline void LeaveUndoMode() { m_bInUndoMode = false; } + void LeaveUndoMode() { m_bInUndoMode = false; } /** GetCellText returns the text at the given position @param _nRow diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx index 9c4e2421270a..25dc9123cf23 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx @@ -34,10 +34,10 @@ namespace dbaui OTableFieldInfo(); ~OTableFieldInfo(); - inline ETableFieldType GetKeyType() const { return m_eFieldType; } - inline void SetKey(ETableFieldType bKey) { m_eFieldType = bKey; } - inline sal_Int32 GetDataType() const { return m_eDataType; } - inline void SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; } + ETableFieldType GetKeyType() const { return m_eFieldType; } + void SetKey(ETableFieldType bKey) { m_eFieldType = bKey; } + sal_Int32 GetDataType() const { return m_eDataType; } + void SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index 41c518388944..c026b3461022 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -66,7 +66,7 @@ namespace dbaui virtual void cut() override; virtual void paste() override; - inline OTableFieldControl* getFieldControl() const { return m_pFieldControl; } + OTableFieldControl* getFieldControl() const { return m_pFieldControl; } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index 2d2b0da73006..c2878e947fc7 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -86,7 +86,7 @@ namespace dbaui virtual void cut() override; virtual void paste() override; - inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; } + OFieldDescGenWin* getGenPage() const { return m_pGenPage; } }; } |