diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-30 23:05:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-31 09:04:14 +0200 |
commit | 886a3640e2a5ff3ebd12b4034f6c245946dd8e95 (patch) | |
tree | 1dabbc97439e439015632a9635906ba0b3d230c4 /connectivity | |
parent | 5466323a8b895df011463c3bc1f243cce8695315 (diff) |
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I55d99ff74de5825e239772160735a8b0d87cb122
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/mysql/YDriver.cxx | 8 | ||||
-rw-r--r-- | connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/inc/mysql/YDriver.hxx | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 2bf56d0a277a..941f47c1ec58 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -55,7 +55,6 @@ namespace connectivity ODriverDelegator::ODriverDelegator(const Reference< XMultiServiceFactory >& _rxFactory) : ODriverDelegator_BASE(m_aMutex) ,m_xFactory(_rxFactory) - ,m_eDriverType(D_ODBC) { } @@ -95,6 +94,13 @@ namespace connectivity namespace { + typedef enum + { + D_ODBC, + D_JDBC, + D_NATIVE + } T_DRIVERTYPE; + sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl) { return _sUrl.copy(0,16) == "sdbc:mysql:odbc:"; diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index c6066f553370..2244e7ad8d13 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -43,14 +43,12 @@ namespace connectivity ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - sal_Int32 m_nColCount; protected: virtual ~ODatabaseMetaDataResultSetMetaData(); public: // a Constructor, that is needed for when Returning the Object is needed: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ) - : m_nColCount(0) { } /// Avoid ambigous cast error from the compiler. diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 1e314d9dc46b..32b6b21bd52b 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -48,13 +48,6 @@ namespace connectivity typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >,TJDBCDrivers); - typedef enum - { - D_ODBC, - D_JDBC, - D_NATIVE - } T_DRIVERTYPE; - /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. @@ -70,7 +63,6 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::rtl::OUString m_sOldDriverClass; - T_DRIVERTYPE m_eDriverType; /** load the driver we want to delegate. The <member>m_xODBCDriver</member> or <member>m_xDBCDriver</member> may be <NULL/> if the driver could not be loaded. |