diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:21:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:21:28 +0000 |
| commit | 9df742595167111b4630ad850dc58f4ccac715ff (patch) | |
| tree | 0207dde80645977a87dcaea6f6e2989ae39f0b22 /connectivity | |
| parent | cbf610b5583698ae3229ac18344c3f1425e08aa2 (diff) | |
INTEGRATION: CWS dba22ui (1.38.20); FILE MERGED
2006/12/05 15:02:47 fs 1.38.20.2: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former
2006/10/25 10:47:30 fs 1.38.20.1: Resource.hrc is unused
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OConnection.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index a9438ae2b784..00e2b88e398f 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: OConnection.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2006-12-01 16:50:25 $ + * last change: $Author: kz $ $Date: 2006-12-13 16:21:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,9 +44,6 @@ #ifndef _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_ #include "odbc/ODatabaseMetaData.hxx" #endif -#ifndef _CONNECTIVITY_RESOURCE_HRC_ -#include "Resource.hrc" -#endif #ifndef _CONNECTIVITY_ODBC_OFUNCTIONS_HXX_ #include "odbc/OFunctions.hxx" #endif @@ -416,7 +413,6 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - Reference< XDatabaseMetaData > xMetaData = m_xMetaData; if(!xMetaData.is()) { |