From 9b4c137cfe59e33891c9b6f06a901b95dff9786a Mon Sep 17 00:00:00 2001 From: Thomas Benisch Date: Wed, 25 Jul 2001 06:51:32 +0000 Subject: [PATCH] #88563# BasicIDE load on demand --- sw/source/ui/fldui/fldmgr.cxx | 10 +++++----- sw/util/makefile.mk | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 3b1347374b4d..1ba47c734272 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldmgr.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: tbe $ $Date: 2001-07-17 08:48:51 $ + * last change: $Author: tbe $ $Date: 2001-07-25 07:42:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,8 +149,8 @@ #ifndef _SBXCLASS_HXX //autogen #include #endif -#ifndef _BASOBJ_HXX //autogen -#include +#ifndef _OFF_APP_HXX //autogen +#include #endif #ifndef _ZFORLIST_HXX //autogen #include @@ -1900,7 +1900,7 @@ BOOL SwFldMgr::ChooseMacro(const String &rSelMacro) } } - String aMacroURL = BasicIDE::SelectMacro(FALSE, TRUE, sSelMacro); + String aMacroURL = OfficeApplication::ChooseMacro(FALSE, TRUE, sSelMacro); BOOL bRet = FALSE; // aMacroURL has the following format: diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 3040ec15aef7..9220012d3358 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: svesik $ $Date: 2001-05-02 00:28:55 $ +# last change: $Author: tbe $ $Date: 2001-07-25 07:43:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -199,7 +199,6 @@ SHL2STDLIBS= \ $(SCLIB) \ $(UCBHELPERLIB) \ $(XMLOFFLIB) \ - $(BASCTLLIB) \ $(COMPHELPERLIB)