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/inc | |
| parent | 0e79718a1002d673cf8ef508e5963900ce84be1d (diff) | |
disentangled sddll.hxx vs. sdmod.hxx
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/app.hxx | 1 | ||||
| -rw-r--r-- | sd/inc/sddll.hxx | 6 | ||||
| -rw-r--r-- | sd/inc/sdmod.hxx | 10 |
3 files changed, 0 insertions, 17 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 |