New loplugin:externvar: connectivity

Change-Id: I7e62a92ee4b019163de797fd4448170a741879dc

6 files changed, 71 insertions, 75 deletions

diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx
index c2b931e38473..b188e8518d7c 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -43,12 +43,9 @@
 #include <iostream>
 #include <algorithm>
 
-std::string g_Empty = "";
+std::string const g_Empty = "";
 
-// Mork header of supported format version
-const char *MorkMagicHeader = "// <!-- <mdb:mork:z v=\"1.4\"/> -->";
-
-const char *MorkDictColumnMeta = "<(a=c)>";
+const char * const MorkDictColumnMeta = "<(a=c)>";
 
 static const int defaultScope_ = 0x80;
 
@@ -574,7 +571,7 @@ MorkRowMap *MorkParser::getRows( int RowScope, RowScopeMap *table )
     return &iter->second;
 }
 
-std::string &MorkParser::getValue( int oid )
+std::string const &MorkParser::getValue( int oid )
 {
     MorkDict::iterator foundIter = values_.find( oid );
 
@@ -586,7 +583,7 @@ std::string &MorkParser::getValue( int oid )
     return foundIter->second;
 }
 
-std::string &MorkParser::getColumn( int oid )
+std::string const &MorkParser::getColumn( int oid )
 {
     MorkDict::iterator foundIter = columns_.find( oid );
 
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index fcbdd6aa26c3..63cf97240cec 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -85,11 +85,11 @@ public:
 
     /// Return value of specified value oid
 
-    std::string &getValue( int oid );
+    std::string const &getValue( int oid );
 
     /// Return value of specified column oid
 
-    std::string &getColumn( int oid );
+    std::string const &getColumn( int oid );
 
     void retrieveLists(std::set<std::string>& lists);
     void getRecordKeysForListTable(std::string& listName, std::set<int>& records);
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 0178027e1d34..7c88c3260243 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -24,70 +24,6 @@
 
 namespace connectivity
 {
-    // extern declaration of the function pointer
-    extern T3SQLAllocHandle pODBC3SQLAllocHandle;
-    extern T3SQLConnect pODBC3SQLConnect;
-    extern T3SQLDriverConnect pODBC3SQLDriverConnect;
-    extern T3SQLBrowseConnect pODBC3SQLBrowseConnect;
-    extern T3SQLDataSources pODBC3SQLDataSources;
-    extern T3SQLDrivers pODBC3SQLDrivers;
-    extern T3SQLGetInfo pODBC3SQLGetInfo;
-    extern T3SQLGetFunctions pODBC3SQLGetFunctions;
-    extern T3SQLGetTypeInfo pODBC3SQLGetTypeInfo;
-    extern T3SQLSetConnectAttr pODBC3SQLSetConnectAttr;
-    extern T3SQLGetConnectAttr pODBC3SQLGetConnectAttr;
-    extern T3SQLSetEnvAttr pODBC3SQLSetEnvAttr;
-    extern T3SQLGetEnvAttr pODBC3SQLGetEnvAttr;
-    extern T3SQLSetStmtAttr pODBC3SQLSetStmtAttr;
-    extern T3SQLGetStmtAttr pODBC3SQLGetStmtAttr;
-    //extern T3SQLSetDescField pODBC3SQLSetDescField;
-    //extern T3SQLGetDescField pODBC3SQLGetDescField;
-    //extern T3SQLGetDescRec pODBC3SQLGetDescRec;
-    //extern T3SQLSetDescRec pODBC3SQLSetDescRec;
-    extern T3SQLPrepare pODBC3SQLPrepare;
-    extern T3SQLBindParameter pODBC3SQLBindParameter;
-    //extern T3SQLGetCursorName pODBC3SQLGetCursorName;
-    extern T3SQLSetCursorName pODBC3SQLSetCursorName;
-    extern T3SQLExecute pODBC3SQLExecute;
-    extern T3SQLExecDirect pODBC3SQLExecDirect;
-    //extern T3SQLNativeSql pODBC3SQLNativeSql;
-    extern T3SQLDescribeParam pODBC3SQLDescribeParam;
-    extern T3SQLNumParams pODBC3SQLNumParams;
-    extern T3SQLParamData pODBC3SQLParamData;
-    extern T3SQLPutData pODBC3SQLPutData;
-    extern T3SQLRowCount pODBC3SQLRowCount;
-    extern T3SQLNumResultCols pODBC3SQLNumResultCols;
-    extern T3SQLDescribeCol pODBC3SQLDescribeCol;
-    extern T3SQLColAttribute pODBC3SQLColAttribute;
-    extern T3SQLBindCol pODBC3SQLBindCol;
-    extern T3SQLFetch pODBC3SQLFetch;
-    extern T3SQLFetchScroll pODBC3SQLFetchScroll;
-    extern T3SQLGetData pODBC3SQLGetData;
-    extern T3SQLSetPos pODBC3SQLSetPos;
-    extern T3SQLBulkOperations pODBC3SQLBulkOperations;
-    extern T3SQLMoreResults pODBC3SQLMoreResults;
-    //extern T3SQLGetDiagField pODBC3SQLGetDiagField;
-    extern T3SQLGetDiagRec pODBC3SQLGetDiagRec;
-    extern T3SQLColumnPrivileges pODBC3SQLColumnPrivileges;
-    extern T3SQLColumns pODBC3SQLColumns;
-    extern T3SQLForeignKeys pODBC3SQLForeignKeys;
-    extern T3SQLPrimaryKeys pODBC3SQLPrimaryKeys;
-    extern T3SQLProcedureColumns pODBC3SQLProcedureColumns;
-    extern T3SQLProcedures pODBC3SQLProcedures;
-    extern T3SQLSpecialColumns pODBC3SQLSpecialColumns;
-    extern T3SQLStatistics pODBC3SQLStatistics;
-    extern T3SQLTablePrivileges pODBC3SQLTablePrivileges;
-    extern T3SQLTables pODBC3SQLTables;
-    extern T3SQLFreeStmt pODBC3SQLFreeStmt;
-    extern T3SQLCloseCursor pODBC3SQLCloseCursor;
-    extern T3SQLCancel pODBC3SQLCancel;
-    extern T3SQLEndTran pODBC3SQLEndTran;
-    extern T3SQLDisconnect pODBC3SQLDisconnect;
-    extern T3SQLFreeHandle pODBC3SQLFreeHandle;
-    extern T3SQLGetCursorName pODBC3SQLGetCursorName;
-    extern T3SQLNativeSql pODBC3SQLNativeSql;
-
-
     namespace odbc
     {
         class ORealObdcDriver : public ODBCDriver
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index ff9eacac0f8c..2ad9043541b1 100644
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
@@ -541,6 +541,69 @@ bool LoadLibrary_ODBC3(OUString &_rPath);
                                                     SQLINTEGER *            TextLength2Ptr);
 
     #define N3SQLNativeSql(a,b,c,d,e,f) (*reinterpret_cast<T3SQLNativeSql>(getOdbcFunction(ODBC3SQLFunctionId::NativeSql)))(a,b,c,d,e,f)
+
+    // extern declaration of the function pointer
+    extern T3SQLAllocHandle pODBC3SQLAllocHandle;
+    extern T3SQLConnect pODBC3SQLConnect;
+    extern T3SQLDriverConnect pODBC3SQLDriverConnect;
+    extern T3SQLBrowseConnect pODBC3SQLBrowseConnect;
+    extern T3SQLDataSources pODBC3SQLDataSources;
+    extern T3SQLDrivers pODBC3SQLDrivers;
+    extern T3SQLGetInfo pODBC3SQLGetInfo;
+    extern T3SQLGetFunctions pODBC3SQLGetFunctions;
+    extern T3SQLGetTypeInfo pODBC3SQLGetTypeInfo;
+    extern T3SQLSetConnectAttr pODBC3SQLSetConnectAttr;
+    extern T3SQLGetConnectAttr pODBC3SQLGetConnectAttr;
+    extern T3SQLSetEnvAttr pODBC3SQLSetEnvAttr;
+    extern T3SQLGetEnvAttr pODBC3SQLGetEnvAttr;
+    extern T3SQLSetStmtAttr pODBC3SQLSetStmtAttr;
+    extern T3SQLGetStmtAttr pODBC3SQLGetStmtAttr;
+    //extern T3SQLSetDescField pODBC3SQLSetDescField;
+    //extern T3SQLGetDescField pODBC3SQLGetDescField;
+    //extern T3SQLGetDescRec pODBC3SQLGetDescRec;
+    //extern T3SQLSetDescRec pODBC3SQLSetDescRec;
+    extern T3SQLPrepare pODBC3SQLPrepare;
+    extern T3SQLBindParameter pODBC3SQLBindParameter;
+    //extern T3SQLGetCursorName pODBC3SQLGetCursorName;
+    extern T3SQLSetCursorName pODBC3SQLSetCursorName;
+    extern T3SQLExecute pODBC3SQLExecute;
+    extern T3SQLExecDirect pODBC3SQLExecDirect;
+    //extern T3SQLNativeSql pODBC3SQLNativeSql;
+    extern T3SQLDescribeParam pODBC3SQLDescribeParam;
+    extern T3SQLNumParams pODBC3SQLNumParams;
+    extern T3SQLParamData pODBC3SQLParamData;
+    extern T3SQLPutData pODBC3SQLPutData;
+    extern T3SQLRowCount pODBC3SQLRowCount;
+    extern T3SQLNumResultCols pODBC3SQLNumResultCols;
+    extern T3SQLDescribeCol pODBC3SQLDescribeCol;
+    extern T3SQLColAttribute pODBC3SQLColAttribute;
+    extern T3SQLBindCol pODBC3SQLBindCol;
+    extern T3SQLFetch pODBC3SQLFetch;
+    extern T3SQLFetchScroll pODBC3SQLFetchScroll;
+    extern T3SQLGetData pODBC3SQLGetData;
+    extern T3SQLSetPos pODBC3SQLSetPos;
+    extern T3SQLBulkOperations pODBC3SQLBulkOperations;
+    extern T3SQLMoreResults pODBC3SQLMoreResults;
+    //extern T3SQLGetDiagField pODBC3SQLGetDiagField;
+    extern T3SQLGetDiagRec pODBC3SQLGetDiagRec;
+    extern T3SQLColumnPrivileges pODBC3SQLColumnPrivileges;
+    extern T3SQLColumns pODBC3SQLColumns;
+    extern T3SQLForeignKeys pODBC3SQLForeignKeys;
+    extern T3SQLPrimaryKeys pODBC3SQLPrimaryKeys;
+    extern T3SQLProcedureColumns pODBC3SQLProcedureColumns;
+    extern T3SQLProcedures pODBC3SQLProcedures;
+    extern T3SQLSpecialColumns pODBC3SQLSpecialColumns;
+    extern T3SQLStatistics pODBC3SQLStatistics;
+    extern T3SQLTablePrivileges pODBC3SQLTablePrivileges;
+    extern T3SQLTables pODBC3SQLTables;
+    extern T3SQLFreeStmt pODBC3SQLFreeStmt;
+    extern T3SQLCloseCursor pODBC3SQLCloseCursor;
+    extern T3SQLCancel pODBC3SQLCancel;
+    extern T3SQLEndTran pODBC3SQLEndTran;
+    extern T3SQLDisconnect pODBC3SQLDisconnect;
+    extern T3SQLFreeHandle pODBC3SQLFreeHandle;
+    extern T3SQLGetCursorName pODBC3SQLGetCursorName;
+    extern T3SQLNativeSql pODBC3SQLNativeSql;
 }
 
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONS_HXX
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 28c45f229403..e88d39452028 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4272,6 +4272,8 @@ using namespace ::com::sun::star::util;
 using namespace ::osl;
 using namespace ::dbtools;
 
+connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
+
 connectivity::OSQLInternalNode* newNode(const sal_Char* pNewValue,
         const connectivity::SQLNodeType eNodeType,
         const sal_uInt32 nNodeID)
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 52311a0ead09..c588e2d22ed1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -70,8 +70,6 @@ using namespace ::osl;
 using namespace ::dbtools;
 using namespace ::comphelper;
 
-connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
-
 namespace
 {