diff options
Diffstat (limited to 'connectivity/source')
42 files changed, 117 insertions, 125 deletions
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index d1c72e01a921..db67c5752683 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -33,7 +33,7 @@ struct TKeyValueFunc : std::binary_function<OSortIndex::TIntValuePairVector::val { } // return false if compared values are equal otherwise true - inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const + bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const { const std::vector<OKeyType>& aKeyType = pIndex->getKeyType(); std::vector<OKeyType>::const_iterator aIter = aKeyType.begin(); diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 3f851a6afd1f..928164308839 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -89,7 +89,7 @@ public: { } void clear() { m_pComponent = nullptr; } - inline void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); } + void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); } }; } namespace connectivity diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index 83be72e0cbde..2d56355be1d9 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -51,7 +51,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index ee729173d056..3028eec3b6aa 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -51,7 +51,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 87c819cb265f..43856f78110b 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -54,7 +54,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index bb5db84064fd..04919d6f402c 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -51,7 +51,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 54003dba9330..fcbd064cebc3 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -52,7 +52,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 7e0dd97adbbb..0712ff682e19 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -51,7 +51,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index cf79a19ea889..ef6088a991a8 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -35,7 +35,7 @@ namespace connectivity public: explicit MacabCatalog(MacabConnection* _pCon); - inline MacabConnection* getConnection() const { return m_pConnection; } + MacabConnection* getConnection() const { return m_pConnection; } static const OUString& getDot(); diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 93d395a28d0f..01bcae6b91df 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -111,7 +111,7 @@ namespace connectivity css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); // accessors - inline MacabDriver* getDriver() const { return m_pDriver;} + MacabDriver* getDriver() const { return m_pDriver;} MacabAddressBook* getAddressBook() const; }; } diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 3ba29cca3fc3..540db16e9d37 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -41,7 +41,7 @@ namespace connectivity public: - inline MacabConnection* getOwnConnection() const { return m_xConnection.get(); } + MacabConnection* getOwnConnection() const { return m_xConnection.get(); } explicit MacabDatabaseMetaData(MacabConnection* _pCon); virtual ~MacabDatabaseMetaData() override; diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index 08af06976852..d1b846e89388 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -50,13 +50,13 @@ namespace connectivity MacabResultSetMetaData(MacabConnection* _pConnection, OUString const & _sTableName); // avoid ambigous cast error from the compiler - inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() + operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } /// @throws css::sdbc::SQLException void setMacabFields( const ::rtl::Reference<connectivity::OSQLColumns> &xColumns); - inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const + sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aMacabFields[columnIndex - 1]; } virtual sal_Int32 SAL_CALL getColumnCount( ) override; diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index 54688136fa3a..469e342912c6 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.cxx @@ -52,7 +52,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 9d956f6a8d98..1319ca72c0ea 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -150,7 +150,7 @@ namespace connectivity ) override; // other methods - inline MacabConnection* getOwnConnection() const { return m_pConnection; } + MacabConnection* getOwnConnection() const { return m_pConnection; } }; diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index c97149cd4bfe..8dd54baac84b 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -60,8 +60,8 @@ namespace connectivity OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const; - inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } - inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); } + AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); } + AliasMap::const_iterator end() const { return m_aAliasMap.end(); } private: diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx index c84c9b72d5d9..6c1e6596de29 100644 --- a/connectivity/source/drivers/mork/MErrorResource.hxx +++ b/connectivity/source/drivers/mork/MErrorResource.hxx @@ -39,21 +39,21 @@ namespace connectivity { } - inline void setResId( const sal_uInt16 _nErrorResourceId ) + void setResId( const sal_uInt16 _nErrorResourceId ) { m_nErrorResourceId = _nErrorResourceId; } - inline void reset() + void reset() { m_nErrorResourceId = 0; m_nErrorCondition = 0; } - inline sal_uInt16 getResId() const { return m_nErrorResourceId; } - inline sal_Int32 getErrorCondition() const { return m_nErrorCondition; } - inline const OUString& getParameter() const { return m_sParameter; } + sal_uInt16 getResId() const { return m_nErrorResourceId; } + sal_Int32 getErrorCondition() const { return m_nErrorCondition; } + const OUString& getParameter() const { return m_sParameter; } - inline bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); } + bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); } }; } } diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 8e8d1aac00bb..f9795c075cc3 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -184,7 +184,7 @@ namespace connectivity sal_Int32 executeQuery(OConnection* xConnection, MQueryExpression & expr); const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; } bool hadError() const { return m_aError.is(); } - inline ErrorDescriptor& getError() { return m_aError; } + ErrorDescriptor& getError() { return m_aError; } void setAddressbook( OUString&); }; diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 6c18cd6dbf33..eb87579bfe9d 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -231,7 +231,7 @@ protected: ::rtl::Reference<OKeySet> m_pKeySet; sal_Int32 m_nUpdatedRow; //updated row TriState m_bIsReadOnly; - inline void resetParameters() { m_nParamIndex = 0; } + void resetParameters() { m_nParamIndex = 0; } ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; @@ -318,7 +318,7 @@ public: void methodEntry(); private: - inline void impl_ensureKeySet() + void impl_ensureKeySet() { if ( !m_pKeySet.is() ) m_pKeySet = new OKeySet(); diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index dcf4f97e594b..6895a9b3ea69 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -52,7 +52,6 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index 74be60cb88a2..f24d94f7932a 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -32,10 +32,10 @@ namespace connectivity OAutoRetrievingBase() : m_bAutoRetrievingEnabled(false) {} virtual ~OAutoRetrievingBase(){} - inline void enableAutoRetrievingEnabled(bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } - inline void setAutoRetrievingStatement(const OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } + void enableAutoRetrievingEnabled(bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } + void setAutoRetrievingStatement(const OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } public: - inline bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } + bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } /** transform the statement to query for auto generated values @param _sInsertStatement diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index 948d6f8f3731..fb087a859853 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -102,13 +102,13 @@ namespace connectivity m_ColumnLabel = _aColumnName; } - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t ,void* _pHint ) + static void * SAL_CALL operator new( size_t ,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } bool isAutoIncrement() const { return m_AutoIncrement; } diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 2ad3d353e9f1..1b7f24b046e1 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -63,13 +63,13 @@ namespace connectivity ,bUnsigned(false) {} - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) + static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) + static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) { } bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index 5c5448011f8f..cc9ad49b1544 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -59,14 +59,14 @@ namespace connectivity OMetaConnection(); - inline rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; } + rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; } const OUString& getURL() const { return m_sURL; } - inline void setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; } + void setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; } void throwGenericSQLException( sal_uInt16 _nErrorResourceId,const css::uno::Reference< css::uno::XInterface>& _xContext ); const SharedResources& getResources() const { return m_aResources;} - inline void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; } - inline const css::uno::Sequence< css::beans::PropertyValue >& + void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; } + const css::uno::Sequence< css::beans::PropertyValue >& getConnectionInfo() const { return m_aConnectionInfo; } // OComponentHelper diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index 6d7f1b336d5f..0a9d833c6f5e 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -36,19 +36,19 @@ namespace connectivity ~OKeyValue(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } static OKeyValue* createKeyValue(sal_Int32 nVal); // static OKeyValue* createEmptyKeyValue(); - inline void pushKey(const ORowSetValueDecoratorRef& _aValueRef) + void pushKey(const ORowSetValueDecoratorRef& _aValueRef) { m_aKeys.push_back(_aValueRef); } @@ -64,7 +64,7 @@ namespace connectivity return m_aKeys[i]->getValue(); } - inline sal_Int32 getValue() const { return m_nValue; } + sal_Int32 getValue() const { return m_nValue; } }; } diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 6b8231a5d48b..2a24588b6592 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -41,13 +41,13 @@ namespace connectivity OSkipDeletedSet(IResultSetHelper* _pHelper); ~OSkipDeletedSet(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } /** @@ -85,7 +85,7 @@ namespace connectivity sal_Int32 _nPos the logical position */ void deletePosition(sal_Int32 _nPos); - inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } + void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } }; } #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_TSKIPDELETEDSET_HXX diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index be1a04dd6026..075d37108602 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -63,13 +63,13 @@ namespace connectivity ~OSortIndex(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t,void* _pHint ) + static void * SAL_CALL operator new( size_t,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void *,void* ) + static void SAL_CALL operator delete( void *,void* ) { } @@ -92,8 +92,8 @@ namespace connectivity */ ::rtl::Reference<OKeySet> CreateKeySet(); - inline const std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } - inline TAscendingOrder getAscending(std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } + const std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } + TAscendingOrder getAscending(std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } }; diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index c9a18d1100b6..09fca405ed27 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -125,12 +125,12 @@ namespace connectivity bool matchesExtension( const OUString& _rExt ) const; - inline const OUString& getExtension() const { return m_aFilenameExtension; } - inline bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } - inline OFileDriver* getDriver() const { return m_pDriver; } - inline bool showDeleted() const { return m_bShowDeleted; } - inline bool isCheckEnabled() const { return m_bCheckSQL92; } - inline bool isTextEncodingDefaulted() const { return m_bDefaultTextEncoding; } + const OUString& getExtension() const { return m_aFilenameExtension; } + bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } + OFileDriver* getDriver() const { return m_pDriver; } + bool showDeleted() const { return m_bShowDeleted; } + bool isCheckEnabled() const { return m_bCheckSQL92; } + bool isTextEncodingDefaulted() const { return m_bDefaultTextEncoding; } public: struct GrantAccess diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 7044200286fe..912bcc21b334 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -135,7 +135,7 @@ namespace connectivity bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] >= 0;} // return true when the select statement is "select count(*) from table" - inline bool isCount() const { return m_bIsCount; } + bool isCount() const { return m_bIsCount; } /// @throws css::sdbc::SQLException void checkIndex(sal_Int32 columnIndex ); @@ -263,23 +263,23 @@ namespace connectivity bool OpenImpl(); void doTableSpecials(const OSQLTable& _xTable); - inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; } - inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } - inline void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } - inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } - inline void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } - inline void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } - inline void setSelectRow(const OValueRefRow& _rRow) + sal_Int32 getRowCountResult() const { return m_nRowCountResult; } + void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } + void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } + void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } + void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } + void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } + void setSelectRow(const OValueRefRow& _rRow) { m_aSelectRow = _rRow; m_nColumnCount = m_aSelectRow->get().size(); } - inline void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } - inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } + void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } + void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } - inline void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } - inline void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } - inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} + void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } + void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } + void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} static void setBoundedColumns(const OValueRefRow& _rRow, const OValueRefRow& _rSelectRow, diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 919f31df66bd..d92b3cf8991a 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -45,13 +45,13 @@ namespace connectivity public: OSQLAnalyzer(OConnection* _pConnection); ~OSQLAnalyzer(); - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) + static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) + static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) { } OConnection* getConnection() const { return m_pConnection; } @@ -72,7 +72,7 @@ namespace connectivity void start(OSQLParseNode* pSQLParseNode); bool hasRestriction() const; bool hasFunctions() const; - inline bool evaluateRestriction() { return m_aInterpreter->start(); } + bool evaluateRestriction() { return m_aInterpreter->start(); } void setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols); static OOperandAttr* createOperandAttr(sal_Int32 _nPos, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 14d66831bd93..d3a3b8ac72f7 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -55,13 +55,13 @@ namespace connectivity OCode& operator=(OCode&&) = default; #endif - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) + static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) + static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) { } }; @@ -269,7 +269,7 @@ namespace connectivity OOp_COMPARE(sal_Int32 aPType) :aPredicateType(aPType) {} - inline sal_Int32 getPredicateType() const { return aPredicateType; } + sal_Int32 getPredicateType() const { return aPredicateType; } virtual bool operate(const OOperand*, const OOperand*) const override; }; diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index aa04fb54e1bd..97c58a1184be 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -49,13 +49,13 @@ namespace connectivity virtual ~OPredicateCompiler() override; - inline static void * SAL_CALL operator new( size_t nSize ) + static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) + static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) + static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) + static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) { } void dispose(); @@ -105,12 +105,12 @@ namespace connectivity bool evaluate(OCodeList& rCodeList); void evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal); - inline bool start() + bool start() { return evaluate(m_rCompiler->m_aCodeList); } - inline void startSelection(ORowSetValueDecoratorRef& _rVal) + void startSelection(ORowSetValueDecoratorRef& _rVal) { evaluateSelection(m_rCompiler->m_aCodeList,_rVal); } diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx index 832fa1d96c1f..f5c9268fee99 100644 --- a/connectivity/source/inc/file/quotedstring.hxx +++ b/connectivity/source/inc/file/quotedstring.hxx @@ -37,10 +37,10 @@ namespace connectivity sal_Int32 GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const; OUString GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok, sal_Unicode cStrDel = '\0') const; - inline OUString& GetString() { return m_sString; } - inline void SetString(const OUString& aStr) { m_sString = aStr;} - inline sal_Int32 Len() const { return m_sString.getLength(); } - inline operator OUString&() { return m_sString; } + OUString& GetString() { return m_sString; } + void SetString(const OUString& aStr) { m_sString = aStr;} + sal_Int32 Len() const { return m_sString.getLength(); } + operator OUString&() { return m_sString; } }; } diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx index 57e36fc8f9c9..ef181a0a71b6 100644 --- a/connectivity/source/inc/flat/EConnection.hxx +++ b/connectivity/source/inc/flat/EConnection.hxx @@ -43,12 +43,12 @@ namespace connectivity virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) override; // own methods - inline bool isHeaderLine() const { return m_bHeaderLine; } - inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } - inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } - inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } - inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} - inline sal_Int32 getMaxRowsToScan() const { return m_nMaxRowsToScan;} + bool isHeaderLine() const { return m_bHeaderLine; } + sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } + sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } + sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } + sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} + sal_Int32 getMaxRowsToScan() const { return m_nMaxRowsToScan;} // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index 68071ad4eeee..777bcc89e27e 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.hxx @@ -50,8 +50,8 @@ namespace connectivity public: OHCatalog(const css::uno::Reference< css::sdbc::XConnection >& _xConnection); - inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + sdbcx::OCollection* getPrivateViews() const { return m_pViews; } const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; } virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index b7fae0f296fe..8aa2abd82aed 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -94,10 +94,10 @@ namespace connectivity const css::uno::Sequence< css::beans::PropertyValue >& getConnectionInfo() const { return m_aConnectionInfo; } - inline bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} - inline bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } - inline const css::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; } - inline const css::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; } + bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} + bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } + const css::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; } + const css::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; } /** returns the instance used for logging events related to this connection */ diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx index 8fa7def05271..28fc468454d0 100644 --- a/connectivity/source/inc/mysql/YCatalog.hxx +++ b/connectivity/source/inc/mysql/YCatalog.hxx @@ -50,8 +50,8 @@ namespace connectivity public: OMySQLCatalog(const css::uno::Reference< css::sdbc::XConnection >& _xConnection); - inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + sdbcx::OCollection* getPrivateViews() const { return m_pViews; } const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; } virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 1c33aca85cd5..f93e1e42e691 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -120,12 +120,12 @@ namespace connectivity SQLHANDLE getConnection() { return m_aConnectionHandle; } // should we use the catalog on filebased databases - inline bool isCatalogUsed() const { return m_bUseCatalog; } - inline bool isParameterSubstitutionEnabled() const { return m_bParameterSubstitution; } - inline bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } - inline bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; } - inline bool useOldDateFormat() const { return m_bUseOldDateFormat; } - inline ODBCDriver* getDriver() const { return m_pDriver;} + bool isCatalogUsed() const { return m_bUseCatalog; } + bool isParameterSubstitutionEnabled() const { return m_bParameterSubstitution; } + bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } + bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; } + bool useOldDateFormat() const { return m_bUseOldDateFormat; } + ODBCDriver* getDriver() const { return m_pDriver;} SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 6f83876e8ae8..56e3b5062bbf 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -116,7 +116,7 @@ namespace connectivity ODatabaseMetaDataResultSet(OConnection* _pConnection); - inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const + oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const { return m_pConnection->getOdbcFunction(_nIndex); } diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 9b79a07b84a2..7bdbfa0caf88 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -69,7 +69,7 @@ namespace connectivity /// unary_function Functor object for class ZZ returntype is void struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool > { - inline bool operator()( const css::uno::Sequence<sal_Int8>& _rLH, + bool operator()( const css::uno::Sequence<sal_Int8>& _rLH, const css::uno::Sequence<sal_Int8>& _rRH) const { if(_rLH.getLength() == _rRH.getLength()) @@ -234,7 +234,7 @@ namespace connectivity void construct(); - inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const + oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const { return m_pStatement->getOdbcFunction(_nIndex); } @@ -244,7 +244,7 @@ namespace connectivity return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); } - inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} + void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index e9357c9015c0..864b1be57058 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -87,7 +87,7 @@ namespace connectivity ,const css::uno::Reference< css::uno::XInterface >& _xInterface ,sal_Int32 column); - inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const + oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const { return m_pConnection->getOdbcFunction(_nIndex); } diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 5f130f948756..64e22afa3721 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -161,7 +161,7 @@ namespace connectivity OStatement_Base(OConnection* _pConnection ); using OStatement_BASE::operator css::uno::Reference< css::uno::XInterface >; - inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const + oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const { return m_pConnection->getOdbcFunction(_nIndex); } diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 1b2e9575035a..ed206b47fe00 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -98,7 +98,7 @@ namespace connectivity } public: - inline bool isQueryAllowed( const OUString& _rQueryName ) + bool isQueryAllowed( const OUString& _rQueryName ) { if ( !m_pForbiddenQueryNames.get() ) return true; |