summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/appmain.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-10-04 19:43:28 +0000
committerKurt Zenker <kz@openoffice.org>2004-10-04 19:43:28 +0000
commite845bfeb1aeeb64b854d92493a6f10e59276a053 (patch)
treea5c92c23ce2a635d36fd763badf8d3a270f7669b /sfx2/source/appl/appmain.cxx
parent4e84633be6fc7ad36be5340c2c5ed31beadd2991 (diff)
INTEGRATION: CWS mav09 (1.18.2); FILE MERGED
2004/09/16 23:46:20 mav 1.18.2.5: RESYNC: (1.21-1.22); FILE MERGED 2004/07/09 16:05:54 mav 1.18.2.4: RESYNC: (1.20-1.21); FILE MERGED 2004/07/07 17:10:05 mav 1.18.2.3: RESYNC: (1.19-1.20); FILE MERGED 2004/04/29 21:12:40 mav 1.18.2.2: RESYNC: (1.18-1.19); FILE MERGED 2004/04/14 11:20:20 mba 1.18.2.1: #i27773#: remove factories
Diffstat (limited to 'sfx2/source/appl/appmain.cxx')
-rw-r--r--sfx2/source/appl/appmain.cxx24
1 files changed, 3 insertions, 21 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 038d134037fc..bc543c7323f0 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: appmain.cxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: rt $ $Date: 2004-09-08 15:33:00 $
+ * last change: $Author: kz $ $Date: 2004-10-04 20:43:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -108,7 +108,7 @@
#include "arrdecl.hxx"
#include "dispatch.hxx"
#include "sfxresid.hxx"
-#include "interno.hxx"
+//#include "interno.hxx"
#include "fcontnr.hxx"
#include "viewsh.hxx"
#include "intro.hxx"
@@ -123,9 +123,6 @@
#include "app.hrc"
#include "docfile.hxx"
#include "workwin.hxx"
-#if SUPD<613//MUSTINI
-#include "inimgr.hxx"
-#endif
#ifdef WNT
#include <tools/svwin.h>
@@ -398,21 +395,6 @@ void SfxApplication::InsertLateInitHdl(const Link& rLink)
}
}
-void SfxApplication::ForcePendingInitFactories()
-{
- List& rList = Get_Impl()->aPendingInitFactories;
- USHORT nPos = (USHORT) rList.Count();
-#if LATEINIT
- DBG_ASSERT( !nPos, "Filter nicht im LateInit" );
-#endif
- // FIXME - This needs a comment, it is confusing see dev list 12-jan-2002
- while( (nPos = rList.Count()) )
- {
- SfxObjectFactory* pFac = (SfxObjectFactory*)rList.Remove( --nPos );
- pFac->DoInitFactory();
- }
-}
-
//-------------------------------------------------------------------------
IMPL_LINK( SfxApplication, LateInitTimerHdl_Impl, void*, pvoid)