#89176# Use AsynchronLink from svtools

10 files changed, 69 insertions, 55 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 4bb364eca920..fc035f6316ff 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: mba $ $Date: 2001-07-02 16:25:44 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:04:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,10 @@
 #ifndef _SYSTEM_HXX //autogen
 #include <vcl/system.hxx>
 #endif
+
+#ifndef SVTOOLS_ASYNCLINK_HXX
+#include <svtools/asynclink.hxx>
+#endif
 #ifndef _SFXSTRITEM_HXX //autogen
 #include <svtools/stritem.hxx>
 #endif
@@ -653,7 +657,7 @@ long SfxAppFocusChanged_Impl( void* pObj, void* pArg )
 
 void SfxApplication::FocusChanged()
 {
-    static AsynchronLink *pFocusCallback = new AsynchronLink( Link( 0, SfxAppFocusChanged_Impl ) );
+    static svtools::AsynchronLink *pFocusCallback = new svtools::AsynchronLink( Link( 0, SfxAppFocusChanged_Impl ) );
     pFocusCallback->Call( this, sal_True );
 }
 
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index e0a4dd3c5e5c..a3ca2af78012 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmhtml.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: as $ $Date: 2000-11-08 14:25:44 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:06:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,14 +62,13 @@
 #include <tools/list.hxx>
 #include <tools/table.hxx>
 
-#if SUPD<613//MUSTINI
-    #ifndef _SFXINIMGR_HXX //autogen
-    #include <svtools/iniman.hxx>
-    #endif
-#endif
 #ifndef _HTMLTOKN_H
 #include <svtools/htmltokn.h>
 #endif
+#ifndef   SVTOOLS_ASYNCLINK_HXX
+#include <svtools/asynclink.hxx>
+#endif
+
 #pragma hdrstop
 
 #include "docinf.hxx"
@@ -89,9 +88,7 @@
 #include "request.hxx"
 #include "fcontnr.hxx"
 #include "sfxtypes.hxx"
-#if SUPD<613//MUSTINI
-#include "inimgr.hxx"
-#endif
+
 #define SFX_HTMLFRMSIZE_REL 0x0001
 #define SFX_HTMLFRMSIZE_PERCENT 0x0002
 
@@ -115,7 +112,7 @@ SV_IMPL_PTRARR( _SfxFrameHTMLContexts, _SfxFrameHTMLContext* )
 long SfxParserDelete_Impl( void* pObj, void* pArg )
 {
     ((SfxFrameHTMLParser*)pArg )->ReleaseRef();
-    delete (AsynchronLink*)pObj;
+    delete (svtools::AsynchronLink*)pObj;
     return 0;
 }
 
@@ -875,7 +872,7 @@ SfxDocumentInfo* SfxFrameHTMLParser::GetDocInfo()
 void SfxFrameHTMLParser::EndParser()
 {
     AddRef();
-    AsynchronLink* pLink = new AsynchronLink;
+    svtools::AsynchronLink* pLink = new svtools::AsynchronLink;
     *pLink = Link( pLink, SfxParserDelete_Impl );
     pLink->Call( this );
 }
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index a3d45f0983b9..9a924a2242db 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shell.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mba $ $Date: 2000-10-04 17:35:08 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:07:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,9 @@
 #include <svtools/itemdel.hxx>
 #endif
 
+#ifndef   SVTOOLS_ASYNCLINK_HXX
+#include <svtools/asynclink.hxx>
+#endif
 #ifndef _SBXCLASS_HXX //autogen
 #include <svtools/sbx.hxx>
 #endif
@@ -129,8 +132,8 @@ struct SfxShell_Impl: public SfxBroadcaster
     BOOL                        bActive;
     ULONG                       nDisableFlags;
     ULONG                       nHelpId;
-    AsynchronLink*              pExecuter;
-    AsynchronLink*              pUpdater;
+    svtools::AsynchronLink*     pExecuter;
+    svtools::AsynchronLink*     pUpdater;
     SfxShell_Impl()  : pExecuter( 0 ), pUpdater( 0 ) {}
     ~SfxShell_Impl() { delete pExecuter; delete pUpdater;}
 };
@@ -1139,7 +1142,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, BOOL bAsync )
     else
     {
         if( !pImp->pExecuter )
-            pImp->pExecuter = new AsynchronLink(
+            pImp->pExecuter = new svtools::AsynchronLink(
                 Link( this, ShellCall_Impl ) );
         pImp->pExecuter->Call( new SfxRequest( rReq ) );
         return 0;
@@ -1490,7 +1493,7 @@ void SfxShell::UIFeatureChanged()
         // sonst bleibt evtl. irgendwas in den gebunkerten Tools stecken.
         // Asynchron aufrufen, um Rekursionen zu vermeiden
         if ( !pImp->pUpdater )
-            pImp->pUpdater = new AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
+            pImp->pUpdater = new svtools::AsynchronLink( Link( this, DispatcherUpdate_Impl ) );
 
         // Mehrfachaufrufe gestattet
         pImp->pUpdater->Call( pFrame->GetDispatcher(), TRUE );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index dbdfb4f48ec4..a38704a15039 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfile.cxx,v $
  *
- *  $Revision: 1.64 $
+ *  $Revision: 1.65 $
  *
- *  last change: $Author: mba $ $Date: 2001-07-02 08:19:15 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:10:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -167,6 +167,7 @@ using namespace ::com::sun::star::io;
 #include <tools/urlobj.hxx>
 #include <unotools/ucblockbytes.hxx>
 #include <svtools/pathoptions.hxx>
+#include <svtools/asynclink.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -180,7 +181,6 @@ using namespace ::com::sun::star::io;
 #include "app.hxx"          // GetFilterMatcher
 #include "frame.hxx"        // LoadTargetFrame
 #include "fltfnc.hxx"       // SfxFilterMatcher
-#include "sfxtypes.hxx"     // AsynchronLink
 #include "docfilt.hxx"      // SfxFilter
 #include "objsh.hxx"        // CheckOpenMode
 #include "docfac.hxx"       // GetFilterContainer
@@ -574,8 +574,8 @@ public:
     LoadEnvironment_Impl* pLoadEnv;
     SvKeyValueIteratorRef xAttributes;
 
-    AsynchronLink       aDoneLink;
-    AsynchronLink       aAvailableLink;
+    svtools::AsynchronLink  aDoneLink;
+    svtools::AsynchronLink  aAvailableLink;
     SfxLockBytesHandler_ImplRef  aHandler;
 
     SfxVersionTableDtor*    pVersions;
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index c00cb1c11a3a..e5db201ab8ac 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objserv.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-27 12:46:19 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:11:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,6 +96,7 @@
 #include <svtools/sbx.hxx>
 #include <svtools/pathoptions.hxx>
 #include <svtools/useroptions.hxx>
+#include <svtools/asynclink.hxx>
 
 #pragma hdrstop
 
@@ -128,7 +129,7 @@ BOOL ShallSetBaseURL_Impl( SfxMedium &rMed );
 #define SfxObjectShell
 #include "sfxslots.hxx"
 
-AsynchronLink* pPendingCloser = 0;
+svtools::AsynchronLink* pPendingCloser = 0;
 
 //=========================================================================
 
@@ -622,7 +623,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 
                     if ( pPendingCloser )
                         pPendingCloser->ForcePendingCall();
-                    pImp->pCloser = new AsynchronLink(
+                    pImp->pCloser = new svtools::AsynchronLink(
                         Link( 0, SfxObjectShellClose_Impl ) );
                     pImp->pCloser->Call( this );
                     pPendingCloser = pImp->pCloser;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 4380d717f617..c1cb5648414d 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objxtor.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: ab $ $Date: 2001-06-28 15:56:34 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,6 +113,7 @@
 
 #include <svtools/urihelper.hxx>
 #include <svtools/pathoptions.hxx>
+#include <svtools/asynclink.hxx>
 
 #include "picklist.hxx"
 #include "docfac.hxx"
@@ -156,7 +157,7 @@ DBG_NAME(SfxObjectShell);
 #define DocumentInfo
 #include "sfxslots.hxx"
 
-extern AsynchronLink* pPendingCloser;
+extern svtools::AsynchronLink* pPendingCloser;
 
 //=========================================================================
 
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index a7cdb9d7fca9..5f1d422ac0db 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objshimp.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-14 11:28:11 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:15:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 #include "objsh.hxx"
 #include "bitset.hxx"
 
-class AsynchronLink;
+namespace svtools { class AsynchronLink; }
 
 //====================================================================
 
@@ -149,16 +149,16 @@ struct SfxObjectShell_Impl
     sal_Bool                bModalMode;
     sal_Bool                bReloadAvailable;
     sal_uInt16              nAutoLoadLocks;
-    SfxModule*          pModule;
-    SfxFrame* pFrame;
-    SfxImageManager* pImageManager;
-    SfxToolBoxConfig*   pTbxConfig;
+    SfxModule*              pModule;
+    SfxFrame*               pFrame;
+    SfxImageManager*        pImageManager;
+    SfxToolBoxConfig*       pTbxConfig;
     SfxEventConfigItem_Impl* pEventConfig;
-    SfxObjectShellFlags eFlags;
-    AsynchronLink*      pCloser;
-    String              aBaseURL;
+    SfxObjectShellFlags     eFlags;
+    svtools::AsynchronLink* pCloser;
+    String                  aBaseURL;
     sal_Bool                bReadOnlyUI;
-    SvRefBaseRef        xHeaderAttributes;
+    SvRefBaseRef            xHeaderAttributes;
     sal_Bool                bHiddenLockedByAPI;
     sal_Bool                bInCloseEvent;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >             xModel;
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index 7f65ed096b48..5f39bd422927 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prnmon.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:36 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:18:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,11 @@
 #ifndef _SV_MSGBOX_HXX
 #include <vcl/msgbox.hxx>
 #endif
+
+#ifndef   SVTOOLS_ASYNCLINK_HXX
+#include <svtools/asynclink.hxx>
+#endif
+
 #pragma hdrstop
 
 #include "prnmon.hxx"
@@ -112,7 +117,7 @@ struct SfxPrintProgress_Impl
     BOOL                    bShow;
     BOOL                    bCallbacks;
     BOOL                    bOldEnablePrintFile;
-    AsynchronLink           aDeleteLink;
+    svtools::AsynchronLink  aDeleteLink;
 
 private:
     DECL_LINK( CancelHdl, Button * );
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index 3198a2d41f57..a2983408aac1 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: topfrm.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-29 11:29:48 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:21:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,6 +97,9 @@
 #ifndef _SFXSTRITEM_HXX //autogen
 #include <svtools/stritem.hxx>
 #endif
+#ifndef   SVTOOLS_ASYNCLINK_HXX
+#include <svtools/asynclink.hxx>
+#endif
 #ifndef _IPENV_HXX //autogen
 #include <so3/ipenv.hxx>
 #endif
@@ -308,7 +311,7 @@ public:
                         {}
 };
 
-static AsynchronLink* pPendingCloser = 0;
+static svtools::AsynchronLink* pPendingCloser = 0;
 
 SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHidden, const SfxItemSet* pSet )
 {
@@ -1032,7 +1035,7 @@ void SfxTopViewFrame::Exec_Impl(SfxRequest &rReq )
                         {
                             if ( pPendingCloser )
                                 pPendingCloser->ForcePendingCall();
-                            pCloser = new AsynchronLink(
+                            pCloser = new svtools::AsynchronLink(
                                 Link( 0, SfxViewFrameClose_Impl ) );
                             pCloser->Call( this );
                             pPendingCloser = pCloser;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 7dc065281ab9..e4a816b3b75e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewfrm.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: mba $ $Date: 2001-06-29 11:31:12 $
+ *  last change: $Author: dv $ $Date: 2001-07-03 12:22:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,7 +213,7 @@ struct SfxViewFrame_Impl
     String              aActualPresentationURL;
     SfxFrame*           pFrame;
     SfxCancelManager*   pCancelMgr;
-    AsynchronLink*      pReloader;
+    svtools::AsynchronLink* pReloader;
     SfxInPlaceFrame*    pIPFrame;
     Window*             pWindow;
     SfxViewFrame*       pActiveChild;
@@ -328,7 +328,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq, sal_Bool bAsync )
     if( bAsync )
     {
         if( !pImp->pReloader )
-            pImp->pReloader = new AsynchronLink(
+            pImp->pReloader = new svtools::AsynchronLink(
                 Link( this, ReloadDecouple_Impl ) );
         pImp->pReloader->Call( new SfxRequest( rReq ) );
     }