diff options
Diffstat (limited to 'connectivity/source/drivers')
8 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index 124ab58ff641..25e0ccd8ee6b 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -288,7 +288,7 @@ void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const } } -OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const +OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) { OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 4a2c3eaec862..39eb87d34597 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -73,7 +73,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > tables; - if (!m_pMetaDataHelper->getTableStrings(m_pConnection, tables)) + if (!connectivity::mork::MDatabaseMetaDataHelper::getTableStrings(m_pConnection, tables)) { ::connectivity::SharedResources aResources; // TODO: @@ -943,7 +943,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( // aRows = m_pDbMetaDataHelper->getTables( m_pConnection, tableNamePattern ); // pResultSet->setRows( aRows ); ODatabaseMetaDataResultSet::ORows _rRows; - if ( !m_pMetaDataHelper->getTables( m_pConnection, tableNamePattern, _rRows ) ) { + if ( !connectivity::mork::MDatabaseMetaDataHelper::getTables( m_pConnection, tableNamePattern, _rRows ) ) { ::connectivity::SharedResources aResources; // TODO: // get better message here? @@ -963,7 +963,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > xRef = pResult; ::std::vector< OUString > tables; - if ( !m_pMetaDataHelper->getTableStrings( m_pConnection, tables) ) + if ( !connectivity::mork::MDatabaseMetaDataHelper::getTableStrings( m_pConnection, tables) ) { ::connectivity::SharedResources aResources; // TODO: diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index dce1375d12bb..001221100dac 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -31,10 +31,10 @@ namespace connectivity ~MDatabaseMetaDataHelper(); - bool getTableStrings( OConnection* _pCon, - ::std::vector< OUString >& _rStrings); + static bool getTableStrings( OConnection* _pCon, + ::std::vector< OUString >& _rStrings); - bool getTables( OConnection* _pCon, + static bool getTables( OConnection* _pCon, const OUString& tableNamePattern, ODatabaseMetaDataResultSet::ORows& _rRows); }; diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 865a7b562044..fdfcd9162fc4 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -223,7 +223,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression for ( tableIter = Tables->map.begin(); tableIter != Tables->map.end(); ++tableIter ) { if (tableIter->first != 1) break; - Rows = xMork->getRows( 0x80, &tableIter->second ); + Rows = MorkParser::getRows( 0x80, &tableIter->second ); if ( Rows ) { // Iterate all rows diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index b130610badd2..d4c930baf1b4 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -276,7 +276,7 @@ protected: throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void checkPendingUpdate() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + static void checkPendingUpdate() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getCurrentCardNumber(); public: diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index c430508286cf..d73acc85d338 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -99,7 +99,7 @@ public: /// Returns all rows under specified scope - MorkRowMap *getRows( int rowScope, RowScopeMap *table ); + static MorkRowMap *getRows( int rowScope, RowScopeMap *table ); /// Return value of specified value oid @@ -121,10 +121,10 @@ protected: // Members void initVars(); - bool isWhiteSpace( char c ); + static bool isWhiteSpace( char c ); char nextChar(); - void parseScopeId( const std::string &TextId, int *Id, int *Scope ); + static void parseScopeId( const std::string &TextId, int *Id, int *Scope ); void setCurrentRow( int TableScope, int TableId, int RowScope, int RowId ); // Parse methods diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index 709e98445c82..6c9a4660720a 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -281,7 +281,7 @@ void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const } } -OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const +OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) { OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index e9e9a3e4462a..0672d7e9081a 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -695,13 +695,13 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, Run return Any(); } -sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, RuntimeException) +sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() throw(SQLException, RuntimeException) { sal_Int32 nValue=1; return nValue; } -OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, RuntimeException) +OUString ODatabaseMetaDataResultSet::getCursorName() throw(SQLException, RuntimeException) { return OUString(); } |