disentangled sddll.hxx vs. sdmod.hxx

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: */

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: */

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
 

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"
 

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"

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"

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"

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"

sd/source/ui/app/sdresid.cxx

@@ -27,7 +27,7 @@
  ************************************************************************/
 
 
-#include "sddll.hxx"
+#include "sdmod.hxx"
 #include "sdresid.hxx"
 
 

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"

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"

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>

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>

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>