[Libreoffice-commits] core.git: framework/source

[Stephan Bergmann]

 framework/source/uielement/menubarmanager.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit f53615de094a7ae3edf429a97a9fa562014ec480
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 18 16:43:29 2015 +0100

    Don't wrongly redefine SystemMenuData
    
    ...with a long instead of a HMENU on WNT, so with a wrong size for 64-bit WNT.
    (And just ignore the comment that TRIES TO SHOUT AT ME!!!!!!!!!!!!!!!)
    
    Change-Id: Id02ef4d8a3818b58def067e8b52f29bac8676fe9
    Reviewed-on: https://gerrit.libreoffice.org/20043
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0c4553b..346757a 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -66,6 +66,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/sysdata.hxx>
 #include <vcl/window.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
@@ -80,16 +81,6 @@
 #include <boost/noncopyable.hpp>
 #include <tools/urlobj.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 STRICT!!!!!!!!!!!!!!!
-struct SystemMenuData
-{
-    unsigned long nSize;
-    long          hMenu;
-};
-
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;