diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-08 01:49:36 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-08 01:52:29 +0900 |
commit | d8c9f36ecff6eb88a853fbdff6b240c856598b2b (patch) | |
tree | b0a64b480862e928f383526c50c0b6b160a713db /sd | |
parent | 0e79718a1002d673cf8ef508e5963900ce84be1d (diff) |
disentangled sddll.hxx vs. sdmod.hxx
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/app.hxx | 1 | ||||
-rw-r--r-- | sd/inc/sddll.hxx | 6 | ||||
-rw-r--r-- | sd/inc/sdmod.hxx | 10 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/app/sddll2.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/app/sdresid.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuformatpaintbrush.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unodoc.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodule.cxx | 1 |
14 files changed, 6 insertions, 29 deletions
diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx index e44485a9c2c5..29cb200875ac 100644 --- a/sd/inc/app.hxx +++ b/sd/inc/app.hxx @@ -25,7 +25,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 70b6b2ce56ff..642d655418db 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -29,7 +29,6 @@ #ifndef _SDDLL_HXX #define _SDDLL_HXX -#include "sdmod.hxx" #include <sfx2/module.hxx> #include <sfx2/sfxdefs.hxx> @@ -70,11 +69,6 @@ public: }; - -#ifndef _SD_DLL // Das define muss im Draw gesetzt werden -#define SD_MOD() ( *(SdModule**) GetAppData(SHL_DRAW) ) -#endif - #endif // _SDDLL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index f133e9320317..4483a19d65b6 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -29,11 +29,6 @@ #ifndef _SDMOD_HXX #define _SDMOD_HXX - -#ifndef _SDDLL_HXX -#define _SD_DLL // fuer SD_MOD() -#include "sddll.hxx" // fuer SdModuleDummy -#endif #include "glob.hxx" #include "pres.hxx" @@ -206,12 +201,7 @@ private: }; - - - -#ifndef SD_MOD #define SD_MOD() ( *(SdModule**) GetAppData(SHL_DRAW) ) -#endif #endif // _SDMOD_HXX diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 86d53b73fe25..5ba91acf6b54 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -51,6 +51,7 @@ #include "CustomAnimationPane.hxx" #include "optsitem.hxx" #include "sddll.hxx" +#include "sdmod.hxx" #include "helpids.h" diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 469599e472e2..e4c8c4d2bdf3 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -67,6 +67,7 @@ #include <svx/subtoolboxcontrol.hxx> #include "sddll.hxx" +#include "sdmod.hxx" #define _SD_DIACTRL_CXX #include "diactrl.hxx" #include "gluectrl.hxx" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index f58975cc83a8..1b212ac0899c 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -50,11 +50,8 @@ #include <svx/xmlsecctrl.hxx> - -#define _SD_DLL // fuer SD_MOD() #include "sderror.hxx" #include "sdmod.hxx" -#include "sddll.hxx" #include "sdresid.hxx" #include "optsitem.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 026ef862001d..61b2e3d14291 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -53,9 +53,7 @@ #include "strings.hrc" #include "res_bmp.hrc" -#define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" -#include "sddll.hxx" #include "pres.hxx" #include "optsitem.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index ceeaf6635cf2..2c7f85c15797 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -53,9 +53,7 @@ #include <svx/sdr/contact/displayinfo.hxx> -#define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" -#include "sddll.hxx" #include "app.hrc" #include "glob.hrc" #include "strings.hrc" diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx index fa13e07b4280..269f38425fe9 100644 --- a/sd/source/ui/app/sdresid.cxx +++ b/sd/source/ui/app/sdresid.cxx @@ -27,7 +27,7 @@ ************************************************************************/ -#include "sddll.hxx" +#include "sdmod.hxx" #include "sdresid.hxx" diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 24c33d2bcd4a..897bf0bb79df 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -40,7 +40,6 @@ #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> -#define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" #include "fuformatpaintbrush.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index e07d77da3f97..f7f792200eaf 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -64,7 +64,6 @@ #include "sdresid.hxx" #include "sdxfer.hxx" #include "sdmod.hxx" -#include "sddll.hxx" #include "ins_paste.hxx" #include "drawdoc.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index 23f98ac513b5..e70dda8e9134 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -43,7 +43,7 @@ #include "controller/SlsAnimationFunction.hxx" #include "app.hrc" #include "drawdoc.hxx" -#include "sddll.hxx" +#include "sdmod.hxx" #include "optsitem.hxx" #include <svx/svxids.hrc> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 09ef57ee136d..12e81ae6011d 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -34,7 +34,7 @@ #include <sfx2/sfxmodelfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include "sdmod.hxx" +#include "sddll.hxx" #include "DrawDocShell.hxx" #include "GraphicDocShell.hxx" #include <osl/mutex.hxx> diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 65ffab37c702..d572b17b5f2b 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> +#include "sddll.hxx" #include "sdmod.hxx" #include "unomodule.hxx" #include <sfx2/objface.hxx> |