[Libreoffice-commits] core.git: 2 commits - vcl/win winaccessibility/source

[Michael Weghorn (via logerrit)]

 vcl/win/window/salframe.cxx                   |    3 ---
 winaccessibility/source/UAccCOM/MAccessible.h |   15 ---------------
 2 files changed, 18 deletions(-)

New commits:
commit 6a36d9b341f647d5547027c33bf4dc7c3df12cf8
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Sep 16 09:47:55 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Sep 17 07:05:14 2021 +0200

    Drop conditional WM_GETOBJECT define from vcl/win/window/salframe.cxx
    
    WM_GETOBJECT is already defined in WinUser.h.
    
    Change-Id: I7594560698dd2a17412f5075f8b689decbd4ca49
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122202
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index ae19b4a5c5c7..259a1395a3b2 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -86,9 +86,6 @@
 
 #include <oleacc.h>
 #include <com/sun/star/accessibility/XMSAAService.hpp>
-#ifndef WM_GETOBJECT // TESTME does this ever happen ?
-#  define WM_GETOBJECT  0x003D
-#endif
 
 #include <time.h>
 
commit f1c902af040eb358cc141a7a926272a25a2afba7
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Sep 16 09:43:28 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Sep 17 07:04:59 2021 +0200

    wina11y: Drop OBJID_* defines from MAccessible.h
    
    They are defined in WinUser.h, so there's no
    need to duplicate that.
    
    Change-Id: I1ab4255a8964d7822eface027d3cef7dcd6d29eb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122201
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index 5384e6a5c665..71296cfc2fda 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -34,21 +34,6 @@ namespace {
 enum class XInterfaceType;
 }
 
-#define     OBJID_WINDOW        ((LONG)0x00000000)
-#define     OBJID_SYSMENU       ((LONG)0xFFFFFFFF)
-#define     OBJID_TITLEBAR      ((LONG)0xFFFFFFFE)
-#define     OBJID_MENU          ((LONG)0xFFFFFFFD)
-#define     OBJID_CLIENT        ((LONG)0xFFFFFFFC)
-#define     OBJID_VSCROLL       ((LONG)0xFFFFFFFB)
-#define     OBJID_HSCROLL       ((LONG)0xFFFFFFFA)
-#define     OBJID_SIZEGRIP      ((LONG)0xFFFFFFF9)
-#define     OBJID_CARET         ((LONG)0xFFFFFFF8)
-#define     OBJID_CURSOR        ((LONG)0xFFFFFFF7)
-#define     OBJID_ALERT         ((LONG)0xFFFFFFF6)
-#define     OBJID_SOUND         ((LONG)0xFFFFFFF5)
-#define     OBJID_QUERYCLASSNAMEIDX ((LONG)0xFFFFFFF4)
-#define     OBJID_NATIVEOM      ((LONG)0xFFFFFFF0)
-
 /**
  *This class implements IMAccessible interface, which inherits from IAccessible2, and
  *in turn inherits from IAccessible. So its methods include the methods defined only in