commit a5a17d0df59780d7aad25d8de026e943f00e8957
author Michael Meeks <michael.meeks@collabora.com> Thu Apr 23 14:44:03 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 23 14:44:03 2015 +0100
tree 980067e6b669728d345fba3bf8fb4d4d66d6f33b
parent 799b0f0e6fb224b7adc8059ca275ad0c63654e8a

winaccessibility: rename unhelpful string defines.

Change-Id: Ib73ddecb9fd49a2e1a5bb690a0f4bbbc77d9047a

winaccessibility/source/UAccCOM/AccActionBase.cxx

diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx
index b01e9c8..fabdc40 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx
@@ -68,12 +68,12 @@ void GetDfActionByUNORole(XAccessibleContext* pRContext, BSTR* pRet)
    switch(Role)
    {
    case PUSH_BUTTON:
        *pRet = ::SysAllocString(PRESS);
        *pRet = ::SysAllocString(PRESS_STR);
        break;
    case RADIO_BUTTON:
    case MENU_ITEM:
    case LIST_ITEM:
        *pRet = ::SysAllocString(SELECT);
        *pRet = ::SysAllocString(SELECT_STR);
        break;
    case CHECK_BOX:
        {
@@ -85,13 +85,13 @@ void GetDfActionByUNORole(XAccessibleContext* pRContext, BSTR* pRet)

            Sequence<short> pStates = pRState->getStates();
            int count = pStates.getLength();
            *pRet = ::SysAllocString(CHECK);
            *pRet = ::SysAllocString(CHECK_STR);
            for( int iIndex = 0;iIndex < count;iIndex++ )
            {
                if( pStates[iIndex] == AccessibleStateType::CHECKED )
                {
                    SAFE_SYSFREESTRING(*pRet);
                    *pRet = ::SysAllocString(UNCHECK);
                    *pRet = ::SysAllocString(UNCHECK_STR);
                    break;
                }
            }

winaccessibility/source/UAccCOM/acccommon.h

diff --git a/winaccessibility/source/UAccCOM/acccommon.h b/winaccessibility/source/UAccCOM/acccommon.h
index b3458d0..869816c 100644
--- a/winaccessibility/source/UAccCOM/acccommon.h
+++ b/winaccessibility/source/UAccCOM/acccommon.h
@@ -53,10 +53,10 @@ enum DM_NIR {
};


#define SELECT       L"Select"
#define PRESS        L"Press"
#define UNCHECK      L"UnCheck"
#define CHECK        L"Check"
#define SELECT_STR       L"Select"
#define PRESS_STR        L"Press"
#define UNCHECK_STR      L"UnCheck"
#define CHECK_STR        L"Check"
//End

static DWORD GetMSAAStateFromUNO(short xState);