From e9435fbc19d74bcd803ee78f533f0342f79131a6 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 22 Nov 2006 09:44:52 +0000
Subject: [PATCH] INTEGRATION: CWS asyncdialogs (1.8.124); FILE MERGED
 2006/03/22 07:44:44 pb 1.8.124.1: fix: #i57125# now LinkedDlg derived from
 AbstractDialog2

---
 sc/source/ui/attrdlg/scdlgfact.hxx | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index a3e232230d91..52166fb6cbd6 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: scdlgfact.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 20:27:56 $
+ *  last change: $Author: vg $ $Date: 2006-11-22 10:44:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -79,6 +79,16 @@ public:                                             \
     virtual USHORT  Execute() ;
 //  virtual void    Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
 
+#define DECL_ABSTDLG2_BASE(Class,DialogClass)        \
+    DialogClass*        pDlg;                       \
+public:                                             \
+                    Class( DialogClass* p)          \
+                     : pDlg(p)                      \
+                     {}                             \
+    virtual         ~Class();                       \
+    virtual void    StartExecuteModal( const Link& rEndDialogHdl ); \
+    long            GetResult();
+
 #define IMPL_ABSTDLG_BASE(Class)                    \
 Class::~Class()                                     \
 {                                                   \
@@ -89,6 +99,19 @@ USHORT Class::Execute()                             \
     return pDlg->Execute();                         \
 }
 
+#define IMPL_ABSTDLG2_BASE(Class)                   \
+Class::~Class()                                     \
+{                                                   \
+    delete pDlg;                                    \
+}                                                   \
+void Class::StartExecuteModal( const Link& rEndDialogHdl ) \
+{                                                   \
+    pDlg->StartExecuteModal( rEndDialogHdl ) ;      \
+}                                                   \
+long Class::GetResult()                             \
+{                                                   \
+    return pDlg->GetResult();                       \
+}
 
 class VclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg
 {
@@ -212,7 +235,8 @@ class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg  //add for ScSel
 
 class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg  //add for ScLinkedAreaDlg
 {
-    DECL_ABSTDLG_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg);
+    DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg);
+
     virtual void            InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
                                         ULONG nRefresh );