loplugin:staticmethods

Change-Id: I200fdb2e193127f0c9e8cec4859845d3ec19cea0

24 files changed, 45 insertions, 46 deletions

diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index aaa4f6b798d6..8d3602bf5766 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -146,7 +146,8 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
         || aParentName == "svtools::ExtendedColorConfig" || aParentName == "SvtMiscOptions"
         || aParentName == "SvtAccessibilityOptions" || aParentName == "svtools::ColorConfig"
         || aParentName == "SvtOptionsDrawinglayer" || aParentName == "SvtMenuOptions"
-        || aParentName == "SvtToolPanelOptions" || aParentName == "SvtSlideSorterBarOptions")
+        || aParentName == "SvtToolPanelOptions" || aParentName == "SvtSlideSorterBarOptions"
+        || aParentName == "connectivity::SharedResources" )
     {
         return true;
     }
@@ -178,7 +179,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
     return true;
 }
 
-loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false);
+loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true);
 
 }
 
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 991baf2618bc..0104e7ff04fa 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -107,7 +107,7 @@ namespace dbtools
     }
 
 
-    void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const
+    void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component )
     {
         if ( !io_appendTo.isEmpty() )
         {
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 8639743f3b55..df677dc6de5e 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -326,7 +326,7 @@ Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString
 }
 
 Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
-                            const OUString& _rPath) const
+                            const OUString& _rPath)
 {
     OSL_ASSERT(_rxConfProvider.is());
     Sequence< Any > args(1);
@@ -344,7 +344,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
     return xInterface;
 }
 
-Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw()
+Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) throw()
 {
     Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY);
     Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY);
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index a8c55c0b17d6..22521c977559 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -86,10 +86,10 @@ namespace connectivity
         // some configuration helper methods
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const;
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot();
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider(   const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider,
-                                                                                                    const OUString& _rPath) const;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath,
-                                                                                        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) const throw();
+        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider(   const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider,
+                                                                                                    const OUString& _rPath);
+        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath,
+                                                                                        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) throw();
         bool isPoolingEnabled();
         bool isDriverPoolingEnabled(const OUString& _sDriverImplName,
                                         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
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();
 }
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index f443a545626c..d89d9700f176 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -132,7 +132,7 @@ namespace connectivity
             bool                                m_bShowDeleted;
             bool                                m_bIsCount;
 
-            void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount);
+            static void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount);
             void construct();
             //sal_Bool evaluate();
 
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index f9ab04891ffb..2e626f79ee52 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -33,7 +33,7 @@ namespace connectivity
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
 
-            OUString getPrivilegeString(sal_Int32 nRights) const;
+            static OUString getPrivilegeString(sal_Int32 nRights);
             // return the privileges and additional the grant rights
             void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         public:
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index 848da1f28493..f274f7e17597 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -33,7 +33,7 @@ namespace connectivity
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
 
-            OUString getPrivilegeString(sal_Int32 nRights) const;
+            static OUString getPrivilegeString(sal_Int32 nRights);
             // return the privileges and additional the grant rights
             void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         public:
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 15fac9a39440..08f307ec8c93 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -86,8 +86,8 @@ namespace connectivity
             static sal_Int32 getResultSetConcurrency() { return css::sdbc::ResultSetConcurrency::READ_ONLY; }
             static sal_Int32 getResultSetType()        { return css::sdbc::ResultSetType::FORWARD_ONLY; }
             static sal_Int32 getFetchDirection()       { return css::sdbc::FetchDirection::FORWARD; }
-            sal_Int32 getFetchSize()            const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            OUString getCursorName()     const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            static sal_Int32 getFetchSize()     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            static OUString getCursorName()     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             SWORD                               impl_getColumnType_nothrow(sal_Int32 columnIndex);
 
             sal_Int32 mapColumn (sal_Int32  column);
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index cab5ca8d2ea3..4e5b8b473574 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1976,7 +1976,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const
     return pHavingClause;
 }
 
-bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const
+bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode)
 {
     return _pTableNode && (SQL_ISRULE(_pTableNode,catalog_name) ||
                            SQL_ISRULE(_pTableNode,schema_name)  ||
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index a2eab485d658..a45671361930 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -225,7 +225,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter()
 //= OSQLParseNode
 
 
-OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const
+OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString)
 {
     Date aDate = DBTypeConversion::toDate(rString);
     Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier());
@@ -237,7 +237,7 @@ OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, c
 }
 
 
-OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const
+OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString)
 {
     DateTime aDate = DBTypeConversion::toDateTime(rString);
     Reference< XNumberFormatsSupplier >  xSupplier(rParam.xFormatter->getNumberFormatsSupplier());
@@ -249,7 +249,7 @@ OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rPara
 }
 
 
-OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const
+OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString)
 {
     css::util::Time aTime = DBTypeConversion::toTime(rString);
     Reference< XNumberFormatsSupplier >  xSupplier(rParam.xFormatter->getNumberFormatsSupplier());
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index ce0ddbe9d669..4f5e5f9fe33e 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -175,10 +175,8 @@ namespace XSLT
         Sequence<sal_Int8> m_readBuf;
         Sequence<sal_Int8> m_writeBuf;
 
-        virtual void
-        execute() SAL_OVERRIDE;
-        void SAL_CALL
-        registerExtensionModule();
+        virtual void execute() SAL_OVERRIDE;
+        static void SAL_CALL registerExtensionModule();
     };
 
 }
diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx
index 11101c347d2e..6008b535107f 100644
--- a/include/connectivity/filtermanager.hxx
+++ b/include/connectivity/filtermanager.hxx
@@ -97,7 +97,7 @@ namespace dbtools
 
         /** appends one filter component to the statement in our composer
         */
-        void    appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const;
+        static void      appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component );
 
         /// checks whether there is only one (or even no) non-empty filter component
         bool    isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const;
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 0ea58d989c20..be8274a8e607 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -274,7 +274,7 @@ namespace connectivity
         bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const;
 
         // return true when the tableNode is a rule like catalog_name, schema_name or table_name
-        bool isTableNode(const OSQLParseNode* _pTableNode) const;
+        static bool isTableNode(const OSQLParseNode* _pTableNode);
 
         // tries to find the correct type of the function
         sal_Int32 getFunctionReturnType(const OSQLParseNode* _pNode );
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 4efd2ffdbf41..ad6ede75355d 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -437,9 +437,9 @@ namespace connectivity
         bool impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
 
         bool addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
-        OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
-        OUString convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
-        OUString convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
+        static OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString);
+        static OUString convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString);
+        static OUString convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString);
         void parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
     };
 
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index aa59a03e3795..a02d884f6ef4 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -221,7 +221,7 @@ namespace connectivity
         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
 
         void error(const sal_Char *fmt);
-        int SQLlex();
+        static int SQLlex();
 #ifdef YYBISON
         void setParseTree(OSQLParseNode * pNewParseTree);
 
@@ -230,7 +230,7 @@ namespace connectivity
         bool inPredicateCheck() const {return m_xField.is();}
         const OUString& getFieldName() const {return m_sFieldName;}
 
-        void reduceLiteral(OSQLParseNode*& pLiteral, bool bAppendBlank);
+        static void reduceLiteral(OSQLParseNode*& pLiteral, bool bAppendBlank);
          // does not change the pLiteral argument
         sal_Int16 buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2);
 
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 3e79e2141874..009a2d640355 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -55,8 +55,8 @@ namespace connectivity
 
         sal_Int32 SQLyygetc();
         void SQLyyerror(char const *fmt);
-        void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); }
-        void ECHO() { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); }
+        static void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); }
+        static void ECHO() { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); }
         IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const;
 
         // setting the new information before scanning