From e05f0919fa4a0e8073b7af9cf8380a8da1b03ada Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Tue, 15 Dec 2009 21:55:40 +0100
Subject: #i107706#: liquidate goodies module

---
 sd/inc/pch/precompiled_sd.hxx                    | 2 +-
 sd/source/ui/view/bmcache.cxx                    | 2 +-
 sd/util/makefile.mk                              | 2 --
 slideshow/prj/build.lst                          | 2 +-
 slideshow/source/engine/shapes/shapeimporter.cxx | 2 +-
 slideshow/util/makefile.mk                       | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 360f32e880bf..23e5864ee374 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -411,7 +411,7 @@
 #include "cppuhelper/weakref.hxx"
 
 
-#include "goodies/grfmgr.hxx"
+#include "svtools/grfmgr.hxx"
 
 #include "helper/simplereferencecomponent.hxx"
 
diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx
index 252777904934..cfa705319dd3 100644
--- a/sd/source/ui/view/bmcache.cxx
+++ b/sd/source/ui/view/bmcache.cxx
@@ -34,7 +34,7 @@
 
 #include <limits.h>     // LONG_MAX
 #include <tools/solar.h>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include "bmcache.hxx"
 
 // eine Struktur fuer die Cache-Eintraege
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 6b1e6ebf1676..ee283700da1a 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -73,7 +73,6 @@ SHL1STDLIBS+= \
     $(CPPCANVASLIB) \
     $(BASEGFXLIB) \
     $(DRAWINGLAYERLIB) \
-    $(GOODIESLIB) \
     $(BASEGFXLIB) \
     $(SVTOOLLIB) \
     $(TKLIB) \
@@ -254,7 +253,6 @@ SHL5STDLIBS = $(ISDLIB) \
               $(SFX2LIB)          \
               $(SVTOOLLIB)        \
               $(SOTLIB)           \
-              $(GOODIESLIB)       \
               $(VCLLIB)           \
               $(SVLLIB)           \
               $(SOTLIB)           \
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index ec0cf8c739de..14de0c1793e2 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -1,4 +1,4 @@
-pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx goodies unotools toolkit animations avmedia NULL
+pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia NULL
 pe	slideshow								usr1	-	all	pe_mkout NULL
 pe	slideshow\inc							nmake	-	all	pe_inc NULL
 pe	slideshow\source\engine					nmake	-	all	pe_engine pe_inc NULL
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 61f4d30fe2fc..71542c6d98b5 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -36,7 +36,7 @@
 #include <vcl/cvtgrf.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk
index aba4094b242f..f3182708cd38 100644
--- a/slideshow/util/makefile.mk
+++ b/slideshow/util/makefile.mk
@@ -67,7 +67,7 @@ SHL1STDLIBS= $(TOOLSLIB) \
              $(CANVASTOOLSLIB) \
              $(CPPCANVASLIB) \
              $(UNOTOOLSLIB) \
-             $(GOODIESLIB) \
+             $(SVTOOLLIB) \
              $(AVMEDIALIB)
 
 SHL1IMPLIB=i$(TARGET)
-- 
cgit