User: obo     
Date: 2006/07/10 08:17:34

Modified:
   dba/dbaccess/source/core/misc/warnings.cxx

Log:
 INTEGRATION: CWS qiq (1.2.4); FILE MERGED
 2006/06/30 13:28:53 fs 1.2.4.3: warning-free code
 2006/05/19 10:52:28 fs 1.2.4.2: signature of SQLExceptionIteratorHelper ctor 
changed during #i51143#
 2006/05/10 14:24:38 fs 1.2.4.1: #i51143# convenience version of appendWarning

File Changes:

Directory: /dba/dbaccess/source/core/misc/
==========================================

File [changed]: warnings.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/warnings.cxx?r1=1.2&r2=1.3
Delta lines:  +15 -4
--------------------
--- warnings.cxx        4 May 2006 08:39:24 -0000       1.2
+++ warnings.cxx        10 Jul 2006 15:17:32 -0000      1.3
@@ -72,7 +72,7 @@
                 "lcl_concatWarnings: invalid warnings chain (this will 
crash)!" );
 
                    const SQLException* pChainTravel = static_cast< const 
SQLException* >( _rChainLeft.getValue() );
-                   SQLExceptionIteratorHelper aReferenceIterHelper( 
pChainTravel );
+                   SQLExceptionIteratorHelper aReferenceIterHelper( 
*pChainTravel );
                    while ( aReferenceIterHelper.hasMoreElements() )
                            pChainTravel = aReferenceIterHelper.next();
 
@@ -82,6 +82,11 @@
     }
 
     //--------------------------------------------------------------------
+    WarningsContainer::~WarningsContainer()
+    {
+    }
+
+    //--------------------------------------------------------------------
     void WarningsContainer::appendWarning(const SQLException& _rWarning)
     {
            lcl_concatWarnings( m_aOwnWarnings, makeAny( _rWarning ) );
@@ -118,6 +123,12 @@
         if ( m_xExternalWarnings.is() )
             m_xExternalWarnings->clearWarnings();
         m_aOwnWarnings.clear();
+    }
+
+    //--------------------------------------------------------------------
+    void WarningsContainer::appendWarning( const ::rtl::OUString& _rWarning, 
const sal_Char* _pAsciiSQLState, const Reference< XInterface >& _rxContext )
+    {
+        appendWarning( SQLWarning( _rWarning, _rxContext, 
::rtl::OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) );
     }
 
 //........................................................................




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

Reply via email to