diff options
| -rw-r--r-- | chart2/prj/build.lst | 2 | ||||
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/controller/makefile.mk | 1 | ||||
| -rw-r--r-- | chart2/source/model/main/ChartModel.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/makefile.mk | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 13 | ||||
| -rw-r--r-- | sc/source/ui/inc/ui_pch.hxx | 1 | ||||
| -rw-r--r-- | sc/util/makefile.mk | 1 |
8 files changed, 3 insertions, 20 deletions
diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst index 2fc7889b3122..8a76f4a0513b 100644 --- a/chart2/prj/build.lst +++ b/chart2/prj/build.lst @@ -1,4 +1,4 @@ -ch chart2 : l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 goodies NULL +ch chart2 : l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 NULL ch chart2 usr1 - all ch_mkout NULL ch chart2\inc nmake - all ch_inc NULL ch chart2\source\inc get - all ch_source_inc NULL diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 59bba9b5973d..ecd3bffeb5d9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -51,7 +51,7 @@ // for Graphic #include <vcl/graph.hxx> // for GraphicObject -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <vcl/outdev.hxx> #include <comphelper/processfactory.hxx> diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk index 45060a60d297..cdc84b2224b2 100644 --- a/chart2/source/controller/makefile.mk +++ b/chart2/source/controller/makefile.mk @@ -85,7 +85,6 @@ SHL1STDLIBS= $(CHARTTOOLS) \ $(COMPHELPERLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SALLIB) \ $(SVLLIB) \ diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index bee4332a857c..18221cdf471a 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/chart2/source/model/main/ChartModel.hxx @@ -70,7 +70,7 @@ #endif #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> // for auto_ptr #include <memory> diff --git a/chart2/source/model/makefile.mk b/chart2/source/model/makefile.mk index 8fb1e9dc3bed..25f472eb123a 100644 --- a/chart2/source/model/makefile.mk +++ b/chart2/source/model/makefile.mk @@ -82,7 +82,6 @@ SHL1STDLIBS= $(CHARTTOOLS) \ $(VCLLIB) \ $(SVLLIB) \ $(SVTOOLLIB) \ - $(GOODIESLIB) \ $(SALLIB) \ $(UCBHELPERLIB) diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 2880d7708b10..8fe96c0447f2 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3491,19 +3491,6 @@ int main() SetError( errIllegalParameter ); } break; - case SC_GAME_STARWARS : - { - oslModule m_tfu = osl_loadModuleRelative(&thisModule, rtl::OUString::createFromAscii( SVLIBRARY( "tfu" ) ).pData, SAL_LOADMODULE_NOW); - typedef void StartInvader_Type (Window*, ResMgr*); - - StartInvader_Type *StartInvader = (StartInvader_Type *) osl_getFunctionSymbol( m_tfu, rtl::OUString::createFromAscii("StartInvader").pData ); - if ( StartInvader ) - StartInvader( Application::GetDefDialogParent(), ResMgr::CreateResMgr( "tfu" )); - } - break; - case SC_GAME_FROGGER : - //Game(); - break; default: { // added to avoid warnings diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index d12d8d9936f9..6fb16bea4d68 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -304,7 +304,6 @@ #include <drawview.hxx> #include <svx/view3d.hxx> #include <svx/def3d.hxx> -#include <goodies/vector3d.hxx> #include <vcl/floatwin.hxx> #include <basic/sbxobj.hxx> #include <svx/svxenum.hxx> diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 11a5150d2784..4cf9a078cc0e 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -85,7 +85,6 @@ SHL1STDLIBS= \ $(SVLLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(VCLLIB) \ |