diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-12 21:02:36 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-12 22:42:08 +0300 |
| commit | 8dba30fcf6eb7e7dcd7b13436cb92f828109d933 (patch) | |
| tree | 194e2f542d666f1d594bfc35e4ecb3399a4cd77c | |
| parent | a666862deffa33013d3df3bb62e87c67f9a89948 (diff) | |
Get rid of GetAppData(SHL_IDE)
It seems to be used only locally in basctl so there is really no reason for
it.
Change-Id: I9ad0a67621e190257e028fd3689f692e639eaf56
| -rw-r--r-- | basctl/source/basicide/basicmod.hxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/iderdll.cxx | 2 | ||||
| -rw-r--r-- | tools/inc/tools/shl.hxx | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx index 8cb661304468..9d6962f08252 100644 --- a/basctl/source/basicide/basicmod.hxx +++ b/basctl/source/basicide/basicmod.hxx @@ -22,19 +22,19 @@ #define BASCTL_BASICMOD_HXX #include <sfx2/module.hxx> -#include <tools/shl.hxx> namespace basctl { class Module : public SfxModule { + static Module* mpModule; public: Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) : SfxModule( pMgr, false, pObjFact, NULL ) { } public: - static Module*& Get () { return *reinterpret_cast<Module**>(GetAppData(SHL_IDE)); } + static Module*& Get () { return mpModule; } }; } // namespace basctl diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 82a311d7eb8a..07351ca0cbe7 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -50,6 +50,8 @@ namespace basctl using namespace ::com::sun::star; using namespace ::com::sun::star::uno; +Module* Module::mpModule; + namespace { diff --git a/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx index 35caa27fd998..c7072bfc460d 100644 --- a/tools/inc/tools/shl.hxx +++ b/tools/inc/tools/shl.hxx @@ -45,7 +45,7 @@ //17 (SHL_SFX) removed //18 (SHL_SO2) removed #define SHL_IDL 19 -#define SHL_IDE 20 +//20 (SHL_IDE) removed //21 (SHL_EDIT) removed //22 (SHL_VCED) removed #define SHL_BASIC 23 |