INTEGRATION: CWS dba202a (1.5.36); FILE MERGED

2005/11/25 07:51:17 oj 1.5.36.1: #127363# new public method for late ctor

1 files changed, 27 insertions, 24 deletions

diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index b6ee7bf5e86d..f0e1f00df50f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ADatabaseMetaDataImpl.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 05:27:31 $
+ *  last change: $Author: obo $ $Date: 2005-12-21 13:15:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -98,30 +98,33 @@ void ODatabaseMetaData::fillLiterals()
 
     ADOS::ThrowException(*m_pADOConnection,*this);
 
-    OSL_ENSURE(pRecordset,"getMaxSize no resultset!");
-    WpADORecordset aRecordset(pRecordset);
-
-    aRecordset.MoveFirst();
-    OLEVariant  aValue;
-    sal_Int32 nRet = 0;
-    LiteralInfo aInfo;
-    while(!aRecordset.IsAtEOF())
+    OSL_ENSURE(pRecordset,"fillLiterals: no resultset!");
+    if ( pRecordset )
     {
-        WpOLEAppendCollection<ADOFields, ADOField, WpADOField>  aFields(aRecordset.GetFields());
-        WpADOField aField(aFields.GetItem(1));
-        aInfo.pwszLiteralValue = aField.get_Value();
-        aField = aFields.GetItem(5);
-        aInfo.fSupported = aField.get_Value();
-        aField = aFields.GetItem(6);
-        aInfo.cchMaxLen = aField.get_Value().getUInt32();
-
-        aField = aFields.GetItem(4);
-        sal_uInt32 nId = aField.get_Value().getUInt32();
-        m_aLiteralInfo[nId] = aInfo;
-
-        aRecordset.MoveNext();
+        WpADORecordset aRecordset(pRecordset);
+
+        aRecordset.MoveFirst();
+        OLEVariant  aValue;
+        sal_Int32 nRet = 0;
+        LiteralInfo aInfo;
+        while(!aRecordset.IsAtEOF())
+        {
+            WpOLEAppendCollection<ADOFields, ADOField, WpADOField>  aFields(aRecordset.GetFields());
+            WpADOField aField(aFields.GetItem(1));
+            aInfo.pwszLiteralValue = aField.get_Value();
+            aField = aFields.GetItem(5);
+            aInfo.fSupported = aField.get_Value();
+            aField = aFields.GetItem(6);
+            aInfo.cchMaxLen = aField.get_Value().getUInt32();
+
+            aField = aFields.GetItem(4);
+            sal_uInt32 nId = aField.get_Value().getUInt32();
+            m_aLiteralInfo[nId] = aInfo;
+
+            aRecordset.MoveNext();
+        }
+        aRecordset.Close();
     }
-    aRecordset.Close();
 }
 // -------------------------------------------------------------------------
 sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)