User: hr      
Date: 2006/08/15 03:28:22

Modified:
   dba/connectivity/source/drivers/flat/EConnection.cxx

Log:
 INTEGRATION: CWS dba30 (1.10.16); FILE MERGED
 2006/07/19 10:11:35 fs 1.10.16.4: RESYNC: (1.12-1.13); FILE MERGED
 2006/04/18 13:09:16 oj 1.10.16.3: RESYNC: (1.11-1.12); FILE MERGED
 2005/09/28 11:42:37 fs 1.10.16.2: RESYNC: (1.10-1.11); FILE MERGED
 2005/04/06 07:10:23 fs 1.10.16.1: #i46768# some assertions on the type of 
connection properties

File Changes:

Directory: /dba/connectivity/source/drivers/flat/
=================================================

File [changed]: EConnection.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/flat/EConnection.cxx?r1=1.13&r2=1.14
Delta lines:  +9 -5
-------------------
--- EConnection.cxx     20 Jun 2006 01:28:00 -0000      1.13
+++ EConnection.cxx     15 Aug 2006 10:28:20 -0000      1.14
@@ -108,26 +108,30 @@
        for(;pBegin != pEnd;++pBegin)
        {
         if(!pBegin->Name.compareToAscii("HeaderLine"))
-                       m_bHeaderLine = cppu::any2bool(pBegin->Value);
+            OSL_VERIFY( pBegin->Value >>= m_bHeaderLine );
                else if(!pBegin->Name.compareToAscii("FieldDelimiter"))
                {
                        ::rtl::OUString aVal;
-                       pBegin->Value >>= aVal; m_cFieldDelimiter = 
aVal.toChar();
+                       OSL_VERIFY( pBegin->Value >>= aVal );
+            m_cFieldDelimiter = aVal.toChar();
                }
                else if(!pBegin->Name.compareToAscii("StringDelimiter"))
                {
                        ::rtl::OUString aVal;
-                       pBegin->Value >>= aVal; m_cStringDelimiter = 
aVal.toChar();
+                       OSL_VERIFY( pBegin->Value >>= aVal );
+            m_cStringDelimiter = aVal.toChar();
                }
                else if(!pBegin->Name.compareToAscii("DecimalDelimiter"))
                {
                        ::rtl::OUString aVal;
-                       pBegin->Value >>= aVal; m_cDecimalDelimiter = 
aVal.toChar();
+                       OSL_VERIFY( pBegin->Value >>= aVal );
+            m_cDecimalDelimiter = aVal.toChar();
                }
                else if(!pBegin->Name.compareToAscii("ThousandDelimiter"))
                {
                        ::rtl::OUString aVal;
-                       pBegin->Value >>= aVal; m_cThousandDelimiter = 
aVal.toChar();
+                       OSL_VERIFY( pBegin->Value >>= aVal );
+            m_cThousandDelimiter = aVal.toChar();
                }
        }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to