diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-25 13:05:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-25 13:05:01 +0000 |
| commit | 89c8ec1b8e128115852ec9a504bdd0ee209677c6 (patch) | |
| tree | e1e8622f4e885c85b4a0091dc4c52bfb13a29107 | |
| parent | 8a10230d87ce7ea442e5a8415bb87074ce4c760b (diff) | |
#i10000#: partly undo changes from canvascrairo01 (build problems due to redifinition of HINSTANCE)
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 6944acaf2d..07b68c017a 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -101,12 +101,15 @@ #include <uielement/menubarmerger.hxx> #include <dispatch/uieventloghelper.hxx> -#ifdef WNT -#include <tools/prewin.h> -#include <windows.h> -#include <tools/postwin.h> -#endif -#include <vcl/sysdata.hxx> +// Be careful removing this "bad" construct. There are serious problems +// with #define STRICT and including windows.h. Changing this needs some +// redesign on other projects, too. Especially sal/main.h which defines +// HINSTANCE depending on STRCIT!!!!!!!!!!!!!!! +struct SystemMenuData +{ + unsigned long nSize; + long hMenu; +}; //_________________________________________________________________________________________________________________ // namespace |