Tag: cws_src680_hsqlcsv
User: fs      
Date: 2006/10/11 01:50:40

Modified:
   dba/dbaccess/source/ui/app/AppControllerDnD.cxx

Log:
 RESYNC: (1.16-1.19); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/ui/app/
=======================================

File [changed]: AppControllerDnD.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerDnD.cxx?r1=1.16.22.2&r2=1.16.22.3
Delta lines:  +11 -7
--------------------
--- AppControllerDnD.cxx        18 Sep 2006 12:17:04 -0000      1.16.22.2
+++ AppControllerDnD.cxx        11 Oct 2006 08:50:36 -0000      1.16.22.3
@@ -33,6 +33,9 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_dbaccess.hxx"
+
 #ifndef DBAUI_APPCONTROLLER_HXX
 #include "AppController.hxx"
 #endif
@@ -656,9 +659,10 @@
                        case E_TABLE:
                        case E_QUERY:
                        {
+                SharedConnection xConnection( ensureConnection() );
                                Reference< XDatabaseMetaData> xMetaData;
-                               if ( m_xDataSourceConnection.is() )
-                                       xMetaData = 
m_xDataSourceConnection->getMetaData();
+                               if ( xConnection.is() )
+                                       xMetaData = xConnection->getMetaData();
 
                                ::rtl::OUString sName = 
getContainer()->getQualifiedName( NULL );
                 if ( sName.getLength() )
@@ -667,11 +671,11 @@
 
                                    if ( eType == E_TABLE )
                                    {
-                                           pData = new 
ODataClipboard(sDataSource, CommandType::TABLE, sName, m_xDataSourceConnection, 
getNumberFormatter(m_xDataSourceConnection,getORB()), getORB());
+                                           pData = new 
ODataClipboard(sDataSource, CommandType::TABLE, sName, xConnection, 
getNumberFormatter(xConnection,getORB()), getORB());
                                    }
                                    else
                                    {
-                                           pData = new 
ODataClipboard(sDataSource, CommandType::QUERY, sName, 
getNumberFormatter(m_xDataSourceConnection,getORB()), getORB());
+                                           pData = new 
ODataClipboard(sDataSource, CommandType::QUERY, sName, 
getNumberFormatter(xConnection,getORB()), getORB());
                                    }
                 }
                        }




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

Reply via email to