diff options
| -rw-r--r-- | sw/inc/ndgrf.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/graphic/grfatr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmlbrsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/config/modcfg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/utlui/attrdesc.cxx | 2 | ||||
| -rw-r--r-- | sw/util/makefile.mk | 2 |
10 files changed, 10 insertions, 12 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index fcef33fdba..b8450de23e 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -30,7 +30,7 @@ #ifndef _NDGRF_HXX #define _NDGRF_HXX #include <sfx2/lnkbase.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <ndnotxt.hxx> // --> OD, MAV 2005-08-17 #i53025# #include <com/sun/star/embed/XStorage.hpp> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index e8aadd472a..b029304b38 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -514,8 +514,8 @@ #include "framework/interaction.hxx" -#include "goodies/grfmgr.hxx" -#include "goodies/mailenum.hxx" +#include "svtools/grfmgr.hxx" +#include "svl/mailenum.hxx" #include "i18npool/lang.h" #include "i18npool/mslangid.hxx" diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 66c1fd5f64..f2674d0565 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/drawing/ColorMode.hpp> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <swtypes.hxx> #include <grfatr.hxx> #include <swunohelper.hxx> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 394303d743..b1b147f06f 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -108,7 +108,7 @@ /// include definition of class SvxBrushItem and GraphicObject /// in order to determine, if background is transparent. #include <svx/brshitem.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #ifndef _CMDID_H #include <cmdid.h> diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index fc2b637d0d..0342053314 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -42,7 +42,7 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/XMLBase64ImportContext.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svx/unomid.hxx> #include <svx/brshitem.hxx> #include <xmloff/xmluconv.hxx> diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index fa89402682..d2dec9a594 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -36,7 +36,7 @@ #include <sot/clsids.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> -#include <goodies/mailenum.hxx> +#include <svl/mailenum.hxx> #ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> #endif diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 6573946433..ad1377b9f2 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -77,7 +77,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/progress.hxx> #include <sfx2/dispatch.hxx> -#include <goodies/mailenum.hxx> +#include <svl/mailenum.hxx> #include <cmdid.h> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index f24625638c..be2e890a92 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -40,7 +40,7 @@ #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> -#include <goodies/mailenum.hxx> +#include <svl/mailenum.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <helpid.h> diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index a25d2c801d..9cc2c2ddbb 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -35,7 +35,7 @@ #include <svl/itemiter.hxx> #include <vcl/svapp.hxx> #include <svx/itemtype.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <unotools/intlwrapper.hxx> #include <comphelper/processfactory.hxx> #include <fmtanchr.hxx> diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index fc1ff731b4..52cae5a57a 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -107,7 +107,6 @@ SHL1STDLIBS+= \ $(SFXLIB) \ $(XMLOFFLIB) \ $(BASICLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(SVTOOLLIB) \ @@ -325,7 +324,6 @@ SHL4STDLIBS= \ $(SVXCORELIB) \ $(MSFILTERLIB) \ $(SFXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ |