Remove WNT define

Change-Id: Ia69141f58fad25797d7d7495a357dd18c7abf08d

Remove WNT define
Change-Id: Ia69141f58fad25797d7d7495a357dd18c7abf08d
6d33ab2c · David Ostrovsky · Michael Meeks · cbf2a0d9 · 6d33ab2c · 6d33ab2c
Kaydet (Commit) 6d33ab2c authored Kas 02, 2013 tarafından David Ostrovsky Kaydeden (comit) Michael Meeks Kas 19, 2013
10 changed files
--- a/winaccessibility/source/UAccCOM/AccActionBase.h
+++ b/winaccessibility/source/UAccCOM/AccActionBase.h
@@ -28,8 +28,6 @@
 #pragma once
 #endif // _MSC_VER > 1000

-#define WNT
-
 #include <com/sun/star/uno/reference.hxx>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include "UNOXWrapper.h"

--- a/winaccessibility/source/UAccCOM/AccComponentBase.h
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.h
@@ -28,8 +28,6 @@
 #pragma once
 #endif // _MSC_VER > 1000

-#define WNT
-
 #include <com/sun/star/uno/reference.hxx>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include "UNOXWrapper.h"

--- a/winaccessibility/source/UAccCOM/AccRelation.cxx
+++ b/winaccessibility/source/UAccCOM/AccRelation.cxx
@@ -202,13 +202,13 @@ BSTR CAccRelation::getRelationTypeBSTR(int type)
            {IA2_RELATION_LABELED_BY    ,   6},
            {IA2_RELATION_MEMBER_OF     ,   7},
            {IA2_RELATION_SUBWINDOW_OF  ,   8},
-            {IA2_RELATION_NODE_CHILD_OF,    9},
-            {IA2_RELATION_DESCRIBED_BY  ,   10},
+            {IA2_RELATION_NODE_CHILD_OF ,   9},
+            {IA2_RELATION_DESCRIBED_BY  ,  10},
        };

    USES_CONVERSION;

-    return (type >= 0 && type <= 10) ? T2BSTR(map[type].string) : _T("");
+    return (type >= 0 && type <= 10) ? map[type].string : _T("");
 }

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -22,7 +22,6 @@
 //////////////////////////////////////////////////////////////////////
 #include "stdafx.h"
 #include <string>
-#define WNT

 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include "AccTextBase.h"

--- a/winaccessibility/source/UAccCOM/AccTextBase.h
+++ b/winaccessibility/source/UAccCOM/AccTextBase.h
@@ -28,8 +28,6 @@
 #pragma once
 #endif // _MSC_VER > 1000

-#define WNT
-
 #include <com/sun/star/uno/reference.hxx>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include "UNOXWrapper.h"

--- a/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/CheckEnableAccessible.cxx
@@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#define WNT
 #define _USE_NAMESPACE

 #ifndef _SV_SVAPP_HXX

--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -20,8 +20,6 @@
 #ifndef __ENUMVARIANT_H_
 #define __ENUMVARIANT_H_

-#define WNT
-
 #include "resource.h"       // main symbols
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>

--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -36,9 +36,9 @@
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
+//#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+//#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>

--- a/winaccessibility/source/UAccCOM/Resource.h
+++ b/winaccessibility/source/UAccCOM/Resource.h
@@ -21,7 +21,6 @@
 // Microsoft Developer Studio generated include file.
 // Used by UAccCOM.rc
 //
-#define WNT

 #define IDS_PROJNAME                    100
 #define IDR_MACCESSIBLE                 101

--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -20,8 +20,6 @@
 #ifndef __UNOXWRAPPER_H_
 #define __UNOXWRAPPER_H_

-#define WNT
-
 #include "resource.h"       // main symbols