Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-19 08:32:27+0000
Modified:
   dba/dbaccess/source/ui/uno/copytablewizard.cxx

Log:
 don't overwrite an externally-provided interaction handler with the one from 
the destination document

File Changes:

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

File [changed]: copytablewizard.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/copytablewizard.cxx?r1=1.1.2.10&r2=1.1.2.11
Delta lines:  +1 -1
-------------------
--- copytablewizard.cxx 2007-11-17 21:12:51+0000        1.1.2.10
+++ copytablewizard.cxx 2007-11-19 08:32:25+0000        1.1.2.11
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: copytablewizard.cxx,v $
  *
- *  $Revision: 1.1.2.10 $
+ *  $Revision: 1.1.2.11 $
  *
- *  last change: $Author: fs $ $Date: 2007/11/17 21:12:51 $
+ *  last change: $Author: fs $ $Date: 2007/11/19 08:32:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1334,7 +1334,7 @@
             InteractionHandler xDestDocHandler;
             impl_ensureDataAccessDescriptor_throw( _rArguments, 1, 
m_xDestConnection, xDestDocHandler );
 
-            if ( xDestDocHandler.is() )
+            if ( xDestDocHandler.is() && !m_xInteractionHandler.is() )
                 m_xInteractionHandler = xDestDocHandler;
         }
         catch( const RuntimeException& ) { throw; }




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

Reply via email to