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 /sw/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 'sw/inc')
| -rw-r--r-- | sw/inc/swmodule.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index eb5607e8d709..2d088022fe1e 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -23,7 +23,6 @@ #include <unotools/options.hxx> #include <sfx2/module.hxx> -#include <tools/shl.hxx> #include "swdllapi.h" #include "shellid.hxx" #include <fldupde.hxx> @@ -248,7 +247,7 @@ inline const css::uno::Reference< css::linguistic2::XLinguServiceEventListener > // Access to SwModule, the View and the shell. -#define SW_MOD() ( *reinterpret_cast<SwModule**>(GetAppData(SHL_WRITER))) +#define SW_MOD() ( static_cast<SwModule*>(SfxApplication::GetModule(SfxToolsModule::Writer))) SW_DLLPUBLIC SwView* GetActiveView(); SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); |