From 767a28682b660fac209240e46d67e05120092f8f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 15 Dec 2009 21:55:40 +0100 Subject: #i107706#: liquidate goodies module --- .../primitive2d/graphicprimitive2d.hxx | 2 +- drawinglayer/prj/build.lst | 2 +- .../source/primitive2d/mediaprimitive2d.cxx | 2 +- .../source/processor2d/vclhelperbitmaprender.cxx | 2 +- .../source/processor2d/vclmetafileprocessor2d.cxx | 4 +- drawinglayer/util/makefile.mk | 1 - sfx2/source/inc/speakerdlg.hxx | 70 ---------------------- svx/inc/bulitem.hxx | 2 +- svx/inc/galctrl.hxx | 2 +- svx/inc/svx/grfflt.hxx | 2 +- svx/inc/svx/outliner.hxx | 2 +- svx/inc/svx/scene3d.hxx | 2 +- svx/inc/svx/sdgmoitm.hxx | 2 +- svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx | 2 +- svx/inc/svx/svdograf.hxx | 2 +- svx/inc/svx/xbitmap.hxx | 2 +- svx/inc/unoapi.hxx | 2 +- svx/inc/xmlgrhlp.hxx | 2 +- svx/source/engine3d/obj3d.cxx | 2 +- svx/source/items/frmitems.cxx | 2 +- svx/source/outliner/outliner.cxx | 2 +- svx/source/svdraw/svdograf.cxx | 2 +- svx/source/svdraw/svdpntv.cxx | 2 +- svx/source/unodraw/unonrule.cxx | 2 +- svx/util/makefile.mk | 2 - svx/workben/makefile.mk | 1 - 26 files changed, 23 insertions(+), 97 deletions(-) delete mode 100644 sfx2/source/inc/speakerdlg.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx index ec18e98106..00c51da0f2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -38,7 +38,7 @@ #include #include -#include +#include ////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst index e3d36cc5cc..d685c262e3 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 198bc04c64..9a345ff8f5 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx index 75ec7e3898..7e69e73296 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx @@ -37,7 +37,7 @@ #include "precompiled_drawinglayer.hxx" #include -#include +#include #include #include #include diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 4ebd3aaab4..98d5d11b26 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 5356ee0cef..5a33c80289 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 e3af356b45..0000000000 --- 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SPEAKERDLG_HXX -#define _SPEAKERDLG_HXX - -#ifndef _GOODIES_RECOGNIZER_HXX_ -#include -#endif - -#ifndef _DIALOG_HXX -#include -#endif -#ifndef _BUTTON_HXX -#include -#endif -#ifndef _LSTBOX_HXX -#include -#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 050c92f6ee..dc65e37e51 100644 --- a/svx/inc/bulitem.hxx +++ b/svx/inc/bulitem.hxx @@ -68,7 +68,7 @@ #define VALID_FOLLOWTEXT 0x0100 #include #include -#include +#include // class SvxBulletItem --------------------------------------------------- diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx index 79eab3f4a1..a651a8af3d 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/galctrl.hxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "svx/galmisc.hxx" #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index 1df1daae34..c38132695c 100644 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx index b93f930529..8e2fcef8c2 100644 --- a/svx/inc/svx/outliner.hxx +++ b/svx/inc/svx/outliner.hxx @@ -45,7 +45,7 @@ #include #include "svx/svxdllapi.h" -#include +#include #include // wegen typedef TypeId #include diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index ccccf1ded4..247801ea75 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -32,7 +32,7 @@ #define _E3D_SCENE3D_HXX #include -#include +#include #include #include #include diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 680d828849..d849e54006 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDGMOITM_HXX #define _SDGMOITM_HXX -#include +#include #include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index b5fb28706d..75892479e4 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include ////////////////////////////////////////////////////////////////////////////// // predefines diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 8a81917dfe..b73c36f81f 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "svx/svxdllapi.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 96a1893d86..e2da7f3632 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -35,7 +35,7 @@ #ifndef _BITMAP_HXX //autogen #include #endif -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx index 5dead232d9..9ac6f8659e 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/unoapi.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx index 71d52a42c3..6005113a4a 100644 --- a/svx/inc/xmlgrhlp.hxx +++ b/svx/inc/xmlgrhlp.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index d7274e3cb0..77dd79673b 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index 1dd6c1f7e1..029f77f8ee 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx index 3f469a47f4..1b3871e9d4 100644 --- a/svx/source/outliner/outliner.cxx +++ b/svx/source/outliner/outliner.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 53022c99db..38cdbfcf12 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include "linkmgr.hxx" diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index f77dc8dc54..9c3b48a482 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #ifdef DBG_UTIL diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx index d6e2c0d1d0..b755691e2b 100644 --- a/svx/source/unodraw/unonrule.cxx +++ b/svx/source/unodraw/unonrule.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 1dffe3a953..63e8d5082d 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 a18c81ab5c..65ff4a3780 100644 --- a/svx/workben/makefile.mk +++ b/svx/workben/makefile.mk @@ -59,7 +59,6 @@ APP1STDLIBS=$(TOOLSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(GOODIESLIB) \ $(SFXLIB) \ $(SOTLIB) \ $(VCLLIB) -- cgit v1.2.3