winaccessibility: remove "using" from headers

Change-Id: I212c1f3449416ff3629a677112fc5a4702e89eb0

6 files changed, 33 insertions, 34 deletions

diff --git a/winaccessibility/source/UAccCOM/AccComponent.h b/winaccessibility/source/UAccCOM/AccComponent.h
index 6f6f989d8aff..0982d62d1c77 100644
--- a/winaccessibility/source/UAccCOM/AccComponent.h
+++ b/winaccessibility/source/UAccCOM/AccComponent.h
@@ -32,8 +32,6 @@
 #include "UNOXWrapper.h"
 #include "AccComponentBase.h"
 
-using namespace com::sun::star::accessibility;
-using namespace com::sun::star::uno;
 
 /**
  * CAccComponent implements IAccessibleComponent interface.
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx
index 17e53b6e9494..626305487448 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.cxx
+++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx
@@ -24,6 +24,10 @@
 
 #include "act.hxx"
 
+
+using namespace com::sun::star::uno;
+using namespace com::sun::star::accessibility;
+
 /////////////////////////////////////////////////////////////////////////////
 // CEnumVariant
 
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index ea6d68dadae1..67ab1001ac5a 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -26,12 +26,6 @@
 #include "UAccCOM2.h"
 #include <AccObjectManagerAgent.hxx>
 
-using namespace com::sun::star::accessibility;
-using namespace com::sun::star::uno;
-
-#include <vector>
-#include <algorithm>
-using namespace std;
 
 /**
  * CEnumVariant implements IEnumVARIANT interface.
@@ -95,8 +89,9 @@ private:
 
     long m_lCurrent;
     long m_lLBound;
-    XAccessible* pUNOInterface;                     // XAccessible.
-    Reference<XAccessibleSelection> m_pXAccessibleSelection;    // Selection.
+    css::accessibility::XAccessible* pUNOInterface;
+    css::uno::Reference<css::accessibility::XAccessibleSelection>
+        m_pXAccessibleSelection;
 };
 
 #endif //__ENUMVARIANT_H_
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index d4a31a8d35e5..6e81e9e3e3df 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -45,6 +45,8 @@
 
 #include "act.hxx"
 
+using namespace com::sun::star::uno;
+using namespace com::sun::star::accessibility;
 using namespace com::sun::star::accessibility::AccessibleStateType;
 
 // IA2 states mapping, and name
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index 22ee1b0e6992..a1ccd683baad 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -22,7 +22,6 @@
 
 #include <Windows.h>
 #include "resource.h"       // main symbols
-#include <vector>
 #include <map>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -52,7 +51,6 @@
 #define     OBJID_QUERYCLASSNAMEIDX ((LONG)0xFFFFFFF4)
 #define     OBJID_NATIVEOM      ((LONG)0xFFFFFFF0)
 
-using namespace rtl;
 /**
  *This class implements IMAccessible interface, which inherits from IAccessible2, and
  *in turn inherits from IAccessible. So its methods include the methods defined only in
@@ -66,7 +64,7 @@ class ATL_NO_VTABLE CMAccessible :
             public IServiceProvider,
             public IAccessibleApplication
 {
-    typedef map< const GUID, CComPtr<IUnknown> ,ltComp > XGUIDToComObjHash;
+    typedef ::std::map<const GUID, CComPtr<IUnknown>, ltComp> XGUIDToComObjHash;
 
     typedef HRESULT (WINAPI _UNO_AGGCREATORFUNC)(void*, REFIID, LPVOID*);
 
@@ -231,12 +229,12 @@ private:
     // specify if the XAccessible is invalid
     BOOL m_isDestroy;
 
-    XAccessible*  pUNOInterface;
-    Reference< XAccessible > pRef;
-    XAccessible*  pAchorUNOInterface;
-    XAccessibleAction*    m_pXAction;
-    XAccessibleContext*  pRContextInterface;
-    Reference<XAccessibleContext> pRContext;
+    css::accessibility::XAccessible * pUNOInterface;
+    css::uno::Reference<css::accessibility::XAccessible> pRef;
+    css::accessibility::XAccessible * pAchorUNOInterface;
+    css::accessibility::XAccessibleAction *  m_pXAction;
+    css::accessibility::XAccessibleContext * pRContextInterface;
+    css::uno::Reference<css::accessibility::XAccessibleContext> pRContext;
 
 private:
 
@@ -250,14 +248,18 @@ private:
     BOOL IsDecendantManage();//identify whether the current COM belongs to manage_decendant roles
 
     // the following private methods are used to implement accSelect method
-    HRESULT SelectChild(XAccessible* pItem);
-    HRESULT DeSelectChild(XAccessible* pItem);
-    HRESULT SelectMutipleChidren( XAccessible** pItem,int size );
-    HRESULT DeSelectMutipleChildren( XAccessible** pItem,int size );
-    XAccessibleContext* GetContextByXAcc( XAccessible* pXAcc );
-    Reference< XAccessibleSelection > GetSelection();
+    HRESULT SelectChild(css::accessibility::XAccessible* pItem);
+    HRESULT DeSelectChild(css::accessibility::XAccessible* pItem);
+    HRESULT SelectMutipleChidren(css::accessibility::XAccessible** pItem,
+                int size);
+    HRESULT DeSelectMutipleChildren(css::accessibility::XAccessible** pItem,
+                int size);
+    css::accessibility::XAccessibleContext* GetContextByXAcc(
+            css::accessibility::XAccessible* pXAcc);
+    css::uno::Reference<css::accessibility::XAccessibleSelection> GetSelection();
     // end accSelect implementation methods
-    BOOL GetXInterfaceFromXAccessible(XAccessible*, XInterface**, int);
+    BOOL GetXInterfaceFromXAccessible(css::accessibility::XAccessible*,
+            css::uno::XInterface**, int);
     HRESULT WINAPI SmartQI(void* pv, REFIID iid, void** ppvObject);
 
 public:
@@ -279,12 +281,15 @@ public:
         return ((CMAccessible*)pv)->SmartQI(pv,iid,ppvObject);
     }
 
-    static void get_OLECHARFromAny(Any& pAny, OLECHAR* pChar);
+    static void get_OLECHARFromAny(css::uno::Any& pAny, OLECHAR* pChar);
 
-    static void get_OLECHAR4Numbering(const Any& pAny, short numberingLevel, const OUString& numberingPrefix,OLECHAR* pChar);
+    static void get_OLECHAR4Numbering(const css::uno::Any& pAny,
+            short numberingLevel, const OUString& numberingPrefix,
+            OLECHAR* pChar);
 
     // Helper function for data conversion.
-    static void ConvertAnyToVariant(const ::com::sun::star::uno::Any &rAnyVal, VARIANT *pvData);
+    static void ConvertAnyToVariant(const css::uno::Any &rAnyVal,
+            VARIANT *pvData);
 };
 
 
diff --git a/winaccessibility/source/UAccCOM/acccommon.h b/winaccessibility/source/UAccCOM/acccommon.h
index 924897ed6db8..61c876aa7e38 100644
--- a/winaccessibility/source/UAccCOM/acccommon.h
+++ b/winaccessibility/source/UAccCOM/acccommon.h
@@ -20,11 +20,6 @@
 #ifndef __ACCCOMMON_H_
 #define __ACCCOMMON_H_
 
-
-//using namespace com::sun::star::accessibility;
-//using namespace com::sun::star::uno;
-
-
 //for MAccessible.cxx
 struct ltComp
 {