diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-07-04 17:30:42 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-13 06:32:46 +0000 |
| commit | f7b1cd66167050afecf487e3d89ea12de74200b5 (patch) | |
| tree | 75381b63bb5dca7ed1fa2ff5602064750f46f042 /sd/inc | |
| parent | 633413a37ee7442cd899db1269fd3ef404efe58a (diff) | |
Moved SfxModule owner to SfxApplication
::GetAppData replaced with SfxApplication::GetModule
that now returns SfxModule*
SfxModule no longer registers self for ownership
instead it is now registered using SfxApplication::SetModule
Change-Id: Ifbbe1b2b4c5122da8e643b7926d47878d116c6c8
Reviewed-on: https://gerrit.libreoffice.org/26914
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/sddll.hxx | 6 | ||||
| -rw-r--r-- | sd/inc/sdmod.hxx | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 6f8a04957f4f..8b05dc5270c4 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -23,6 +23,8 @@ #include <sfx2/module.hxx> #include "sddllapi.h" +class SdModule; + /************************************************************************* |* |* This class is a wrapper for a Load-On-Demand-DLL. One instance @@ -40,8 +42,8 @@ protected: static void RegisterRemotes(); #endif static void RegisterFactorys(); - static void RegisterInterfaces(); - static void RegisterControllers(); + static void RegisterInterfaces(SdModule* pMod); + static void RegisterControllers(SdModule* pMod); public: // Ctor/Dtor must be linked to the application diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 7293b65f3061..cb5f2c3adbaa 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -24,7 +24,6 @@ #include "pres.hxx" #include <sot/storage.hxx> -#include <tools/shl.hxx> #include "sddllapi.h" #include <svl/itemprop.hxx> #include <svl/lstner.hxx> @@ -192,7 +191,7 @@ private: }; -#define SD_MOD() ( *reinterpret_cast<SdModule**>(GetAppData(SHL_DRAW)) ) +#define SD_MOD() ( static_cast<SdModule*>(SfxApplication::GetModule(SfxToolsModule::Draw)) ) #endif // INCLUDED_SD_INC_SDMOD_HXX |