#i107706#: liquidate goodies module

26 files changed, 23 insertions, 97 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
index 6d3826e7ee22..4d020a3ab1c5 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
@@ -38,7 +38,7 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst
index e3d36cc5cc28..d685c262e337 100644
--- a/drawinglayer/prj/build.lst
+++ b/drawinglayer/prj/build.lst
@@ -1,4 +1,4 @@
-dl	drawinglayer	:	goodies sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL
+dl	drawinglayer	:	sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL
 dl	drawinglayer						usr1	-	all	dl_mkout NULL
 dl	drawinglayer\inc					nmake	-	all	dl_inc NULL
 dl	drawinglayer\prj					get		-	all	dl_prj NULL
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index 7799b8e66d0e..e8b6b6fbd5e6 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -41,7 +41,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
index 1488cd4fd054..d517b603eea3 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
@@ -37,7 +37,7 @@
 #include "precompiled_drawinglayer.hxx"
 
 #include <vclhelperbitmaprender.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index d1190c2d9179..8293fc048f5b 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -610,7 +610,7 @@ namespace drawinglayer
                     if(mpPDFExtOutDevData && !bSuppressPDFExtOutDevDataSupport)
                     {
                         // emulate data handling from UnoControlPDFExportContact, original see
-                        // goodies/source/graphic/grfmgr.cxx
+                        // svtools/source/graphic/grfmgr.cxx
                         const Graphic& rGraphic = rGraphicPrimitive.getGraphicObject().GetGraphic();
 
                         if(rGraphic.IsLink())
@@ -638,7 +638,7 @@ namespace drawinglayer
                     if(bUsingPDFExtOutDevData)
                     {
                         // emulate data handling from UnoControlPDFExportContact, original see
-                        // goodies/source/graphic/grfmgr.cxx
+                        // svtools/source/graphic/grfmgr.cxx
                         const basegfx::B2DRange aCurrentRange(
                             aTranslate.getX(), aTranslate.getY(),
                             aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY());
diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk
index 5356ee0cef54..5a33c80289f8 100644
--- a/drawinglayer/util/makefile.mk
+++ b/drawinglayer/util/makefile.mk
@@ -59,7 +59,6 @@ SHL1TARGET= drawinglayer$(DLLPOSTFIX)
 SHL1IMPLIB= idrawinglayer
 
 SHL1STDLIBS=\
-        $(GOODIESLIB)		\
         $(VCLLIB)			\
         $(BASEGFXLIB)		\
         $(TOOLSLIB)			\
diff --git a/sfx2/source/inc/speakerdlg.hxx b/sfx2/source/inc/speakerdlg.hxx
deleted file mode 100644
index b3d16cd578cf..000000000000
--- a/sfx2/source/inc/speakerdlg.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: speakerdlg.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SPEAKERDLG_HXX
-#define _SPEAKERDLG_HXX
-
-#ifndef _GOODIES_RECOGNIZER_HXX_
-#include <goodies/recognizer.hxx>
-#endif
-
-#ifndef _DIALOG_HXX
-#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX
-#include <vcl/lstbox.hxx>
-#endif
-
-// ---------------
-// - SfxSpeakerDlg -
-// ---------------
-
-class SfxSpeakerDlg: public ModalDialog
-{
-    OKButton        aBtnOK;
-    CancelButton    aBtnCancel;
-    ListBox         aListBox;
-    CharSet         aCharSet;
-
-    OSpeakerManagerRef m_aSpeakerMgr;
-
-public:
-
-    SfxSpeakerDlg(Window *pParent, OSpeakerManagerRef& aSpeakerMgr);
-    ~SfxSpeakerDlg();
-
-    virtual short Execute();
-};
-
-
-#endif // _SPEAKER_HXX
diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx
index cae4fbcc24ef..6291e20caccc 100644
--- a/svx/inc/bulitem.hxx
+++ b/svx/inc/bulitem.hxx
@@ -68,7 +68,7 @@
 #define VALID_FOLLOWTEXT    0x0100
 #include <svl/poolitem.hxx>
 #include <vcl/font.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 // class SvxBulletItem ---------------------------------------------------
 
diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx
index 2a986ea60ba8..e7edc216bc68 100644
--- a/svx/inc/galctrl.hxx
+++ b/svx/inc/galctrl.hxx
@@ -45,7 +45,7 @@
 #include <svtools/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include "svx/galmisc.hxx"
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index 608a6561e97c..eb47ce0efbc1 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -40,7 +40,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
 #include <vcl/salbtype.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/graphctl.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/rectenum.hxx>
diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx
index e87ed9bd6114..3e8023572633 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/svx/inc/svx/outliner.hxx
@@ -45,7 +45,7 @@
 #include <rsc/rscsfx.hxx>
 #include "svx/svxdllapi.h"
 
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 #include <tools/rtti.hxx>   // wegen typedef TypeId
 #include <vector>
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index 718225aa990b..5b4e7233fbb6 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -32,7 +32,7 @@
 #define _E3D_SCENE3D_HXX
 
 #include <svx/camera3d.hxx>
-#include <goodies/b3dtrans.hxx>
+#include <tools/b3dtrans.hxx>
 #include <tools/time.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/obj3d.hxx>
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index 0f27c6ef8ba4..dff49415e379 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -31,7 +31,7 @@
 #ifndef _SDGMOITM_HXX
 #define _SDGMOITM_HXX
 
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index df2114437015..c8d68b8307e3 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -36,7 +36,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/attribute/sdrattribute.hxx>
 #include <svx/sdr/attribute/sdrallattribute.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 4f00da997361..0b9280f55d53 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <vcl/graph.hxx>
 #include <svx/svdorect.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include "svx/svxdllapi.h"
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index 4e0f16d21b20..8c9cd83d3571 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -35,7 +35,7 @@
 #ifndef _BITMAP_HXX //autogen
 #include <vcl/bitmap.hxx>
 #endif
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/xenum.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx
index 28df48afa2c2..37cd6daf4c78 100644
--- a/svx/inc/unoapi.hxx
+++ b/svx/inc/unoapi.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <sal/types.h>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx
index 77e6eb0be322..e1c286c74e39 100644
--- a/svx/inc/xmlgrhlp.hxx
+++ b/svx/inc/xmlgrhlp.hxx
@@ -33,7 +33,7 @@
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <vector>
 #include <set>
 #include <utility>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 905bd7706a1f..25c2d1af6748 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -58,7 +58,7 @@
 #include <svx/xlnwtit.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/poly.hxx>
-#include <goodies/b3dtrans.hxx>
+#include <tools/b3dtrans.hxx>
 #include <svx/svxids.hrc>
 #include <svx/colritem.hxx>
 #include <svx/e3ditem.hxx>
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 9c4608f6fc5f..dc5006ff0dcf 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -60,7 +60,7 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <limits.h>
 #include <comphelper/processfactory.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/types.hxx>
 #include <svl/memberid.hrc>
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx
index ab93e04b8461..961884a8c886 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/svx/source/outliner/outliner.cxx
@@ -54,7 +54,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/svxfont.hxx>
 #include <svx/brshitem.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 84e571736328..8e17e8ab9bc4 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -44,7 +44,7 @@
 #include <svl/style.hxx>
 #include <svtools/filter.hxx>
 #include <svl/urihelper.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <vcl/svapp.hxx>
 
 #include "linkmgr.hxx"
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 8c46e1d06bb6..b2bd8b33778b 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -34,7 +34,7 @@
 #include <svx/svdpntv.hxx>
 #include <vcl/msgbox.hxx>
 #include <sdrpaintwindow.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <svx/svdmodel.hxx>
 
 #ifdef DBG_UTIL
diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx
index f999eab88b97..72631bbce573 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/svx/source/unodraw/unonrule.cxx
@@ -39,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/graph.hxx>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <toolkit/unohlp.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 1dffe3a953c8..63e8d5082dd8 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -132,7 +132,6 @@ SHL1STDLIBS= \
              $(AVMEDIALIB) \
              $(SFX2LIB) \
              $(XMLOFFLIB) \
-             $(GOODIESLIB) \
              $(BASEGFXLIB) \
              $(DRAWINGLAYERLIB) \
              $(LNGLIB) \
@@ -169,7 +168,6 @@ SHL2STDLIBS= \
             $(SVXCORELIB) \
             $(SFX2LIB) \
             $(XMLOFFLIB) \
-            $(GOODIESLIB) \
             $(BASEGFXLIB) \
             $(DRAWINGLAYERLIB) \
             $(BASICLIB) \
diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk
index a18c81ab5c37..65ff4a3780f1 100644
--- a/svx/workben/makefile.mk
+++ b/svx/workben/makefile.mk
@@ -59,7 +59,6 @@ APP1STDLIBS=$(TOOLSLIB) 		\
             $(CPPULIB)		\
             $(CPPUHELPERLIB)		\
             $(SALLIB)		\
-            $(GOODIESLIB)		\
             $(SFXLIB)			\
             $(SOTLIB)			\
             $(VCLLIB)