User: vg      
Date: 2008-06-30 15:09:52+0000
Modified:
   dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx

Log:
 INTEGRATION: CWS dba30e (1.27.46); FILE MERGED
 2008/06/19 07:44:12 oj 1.27.46.1: merge mysql changes in

File Changes:

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

File [changed]: SingleSelectQueryComposer.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.27&r2=1.28
Delta lines:  +3 -2
-------------------
--- SingleSelectQueryComposer.cxx       2008-04-10 12:28:25+0000        1.27
+++ SingleSelectQueryComposer.cxx       2008-06-30 15:09:50+0000        1.28
@@ -721,13 +721,14 @@
                 break;
 
                Reference< XResultSetMetaData > xResultSetMeta;
+        Reference< XResultSetMetaDataSupplier > xResMetaDataSup;
         try
         {
             xStatement.reset( Reference< XStatement >( 
m_xConnection->createStatement(), UNO_QUERY_THROW ) );
             Reference< XPropertySet > xStatementProps( xStatement, 
UNO_QUERY_THROW );
             try { xStatementProps->setPropertyValue( 
PROPERTY_ESCAPE_PROCESSING, makeAny( sal_False ) ); }
             catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
-                   Reference< XResultSetMetaDataSupplier > xResMetaDataSup( 
xStatement->executeQuery( sSql ), UNO_QUERY_THROW );
+                   xResMetaDataSup.set( xStatement->executeQuery( sSql ), 
UNO_QUERY_THROW );
             xResultSetMeta.set( xResMetaDataSup->getMetaData(), 
UNO_QUERY_THROW );
         }
         catch( const Exception& ) { }
@@ -735,7 +736,7 @@
         if ( !xResultSetMeta.is() )
         {
             xPreparedStatement.set( m_xConnection->prepareStatement( sSql ), 
UNO_QUERY_THROW );
-                   Reference< XResultSetMetaDataSupplier > xResMetaDataSup( 
xPreparedStatement, UNO_QUERY_THROW );
+                   xResMetaDataSup.set( xPreparedStatement, UNO_QUERY_THROW );
             xResultSetMeta.set( xResMetaDataSup->getMetaData(), 
UNO_QUERY_THROW );
         }
 




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

Reply via email to