Kaydet (Commit) d8c9f36e authored tarafından Takeshi Abe's avatar Takeshi Abe

disentangled sddll.hxx vs. sdmod.hxx

üst 0e79718a
......@@ -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: */
......@@ -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: */
......@@ -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
......
......@@ -51,6 +51,7 @@
#include "CustomAnimationPane.hxx"
#include "optsitem.hxx"
#include "sddll.hxx"
#include "sdmod.hxx"
#include "helpids.h"
......
......@@ -67,6 +67,7 @@
#include <svx/subtoolboxcontrol.hxx>
#include "sddll.hxx"
#include "sdmod.hxx"
#define _SD_DIACTRL_CXX
#include "diactrl.hxx"
#include "gluectrl.hxx"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -27,7 +27,7 @@
************************************************************************/
#include "sddll.hxx"
#include "sdmod.hxx"
#include "sdresid.hxx"
......
......@@ -40,7 +40,6 @@
#include <editeng/eeitem.hxx>
#include <editeng/editeng.hxx>
#define _SD_DLL // fuer SD_MOD()
#include "sdmod.hxx"
#include "fuformatpaintbrush.hxx"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment