INTEGRATION: CWS asyncdialogs (1.5.306); FILE MERGED

2006/09/20 14:12:41 pb 1.5.306.6: RESYNC: (1.10-1.11); FILE MERGED
2006/08/30 11:51:40 pb 1.5.306.5: RESYNC: (1.9-1.10); FILE MERGED
2006/05/31 10:49:23 pb 1.5.306.4: RESYNC: (1.8-1.9); FILE MERGED
2006/02/14 07:19:00 pb 1.5.306.3: RESYNC: (1.6-1.8); FILE MERGED
2005/12/06 20:44:32 kso 1.5.306.2: RESYNC: (1.5-1.6); FILE MERGED
2005/11/17 15:37:25 kso 1.5.306.1: #i57125# - MailMergeWizard is now asynchronous (adaption for Threading Framework).

sw/source/ui/dbui/mailmergewizard.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: mailmergewizard.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 22:45:15 $
+ *  last change: $Author: vg $ $Date: 2006-11-22 10:25:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -88,6 +88,13 @@
 #ifndef _WRTSH_HXX
 #include <wrtsh.hxx>
 #endif
+#ifndef _SFXVIEWFRM_HXX
+#include <sfx2/viewfrm.hxx>
+#endif
+#ifndef _SV_MSGBOX_HXX
+#include "vcl/msgbox.hxx" // RET_CANCEL
+#endif
+
 #include <helpid.h>
 #include <dbui.hrc>
 #include <mailmergewizard.hrc>
@@ -344,3 +351,21 @@ void SwMailMergeWizard::updateRoadmapItemLabel( WizardState _nState )
 {
     svt::RoadmapWizard::updateRoadmapItemLabel( _nState );
 }
+
+// ------------------------------------------------------------------------
+
+short SwMailMergeWizard::Execute()
+{
+    DBG_ERROR( "SwMailMergeWizard cannot be executed via Dialog::Execute!\n"
+               "It creates a thread (MailDispatcher instance) that will call"
+               "back to VCL apartment => deadlock!\n"
+               "Use Dialog::StartExecuteModal to execute the dialog!" );
+    return RET_CANCEL;
+}
+
+// ------------------------------------------------------------------------
+
+void SwMailMergeWizard::StartExecuteModal( const Link& rEndDialogHdl )
+{
+    ::svt::RoadmapWizard::StartExecuteModal( rEndDialogHdl );
+}