basctl/source/basicide/basicmod.hxx | 4 ++-- basctl/source/basicide/iderdll.cxx | 2 ++ tools/inc/tools/shl.hxx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 8dba30fcf6eb7e7dcd7b13436cb92f828109d933 Author: Tor Lillqvist <[email protected]> Date: Fri Apr 12 21:02:36 2013 +0300 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 diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx index 8cb6613..9d6962f 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 82a311d..07351ca 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 35caa27..c7072bf 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
