winaccessibility: remove "using" from headers

Change-Id: I212c1f3449416ff3629a677112fc5a4702e89eb0

20 files changed, 106 insertions, 88 deletions

diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index a47da0eac35f..05ecc12d7952 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
+
 /**
  * AccComponentEventListener is inherited from AccEventListener. It handles the evnets
  * generated by component controls. The accessible roles are: CHECK_BOX, ICON, LABEL,
@@ -45,16 +45,19 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for value changed event
-    virtual void SAL_CALL handleValueChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleValueChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for action changed event
     virtual void SAL_CALL handleActionChangedEvent();
 
     //for text changed event
-    virtual void SAL_CALL handleTextChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleTextChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for caret changed event
-    virtual void SAL_CALL handleCaretChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleCaretChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
     virtual void SAL_CALL handleVisibleDataChangedEvent();
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index 125e2e0ff195..d7019dcd25ca 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccContainerEventListener is inherited from AccEventListener. It handles the evnets
@@ -46,17 +45,21 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for selection changed event
-    virtual void SAL_CALL handleSelectionChangedEvent(const Any &oldValue, const Any &newValue);
+    virtual void SAL_CALL handleSelectionChangedEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
 
     //for all children changed event
     virtual void SAL_CALL handleAllChildrenChangedEvent();
 
     //for text changed event
-    virtual void SAL_CALL handleTextChangedEvent(Any oldValue, Any newValue);
-    virtual void SAL_CALL handleStateChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleTextChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
+    virtual void SAL_CALL handleStateChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
     virtual void SAL_CALL handleVisibleDataChangedEvent();
@@ -65,31 +68,39 @@ public:
     virtual void SAL_CALL handleBoundrectChangedEvent();
 
     //for value changed event
-    virtual void SAL_CALL handleValueChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleValueChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //state changed
     virtual void SAL_CALL setComponentState(short state, bool enable);
     virtual void SAL_CALL fireStatePropertyChange(short state, bool set
                                                      );
     virtual void SAL_CALL fireStateFocusdChange(bool enable);
-    virtual bool SAL_CALL IsEditable(Reference<com::sun::star::accessibility::XAccessibleContext> xContext);
+    virtual bool SAL_CALL IsEditable(
+        css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
 
     // update all children's state
     void SAL_CALL UpdateAllChildrenState( com::sun::star::accessibility::XAccessible* pXAccessible );
 
-    bool NotifyChildEvent(short nWinEvent,const Any &Value);
+    bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value);
 
-    virtual void handleSelectionChangedAddEvent(const Any &oldValue, const Any &newValue);
-    virtual void handleSelectionChangedRemoveEvent(const Any &oldValue, const Any &newValue);
-    virtual void handleSelectionChangedWithinEvent(const Any &oldValue, const Any &newValue);
+    virtual void handleSelectionChangedAddEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
+    virtual void handleSelectionChangedRemoveEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
+    virtual void handleSelectionChangedWithinEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
 
-    virtual void handlePageChangedEvent (const Any &oldValue, const Any &newValue);
+    virtual void handlePageChangedEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
 
-    virtual void handleSectionChangedEvent (const Any &oldValue, const Any &newValue);
-    virtual void handleColumnChangedEvent (const Any &oldValue, const Any &newValue);
+    virtual void handleSectionChangedEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
+    virtual void handleColumnChangedEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
     //IAccessibility2 Implementation 2009-----
     //for name changed event
-    virtual void SAL_CALL handleNameChangedEvent(Any name);
+    virtual void SAL_CALL handleNameChangedEvent(css::uno::Any name);
     //-----IAccessibility2 Implementation 2009
 };
 
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index e9ba41ca1176..240e4f79047e 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
-
 /**
  * AccDescendantManagerEventListener is inherited from AccComponentEventListener. It handles
  * the evnets generated by active descendant controls. They are: TREE, LIST, and TABLE.
@@ -45,18 +43,24 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for selection changed event
-    virtual void SAL_CALL handleSelectionChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleSelectionChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent (Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
-    virtual void SAL_CALL handleChildChangedNoFocusEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedNoFocusEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
-    bool NotifyChildEvent(short nWinEvent,const Any &Value);
+    bool NotifyChildEvent(short nWinEvent,const css::uno::Any &Value);
 
-    virtual void handleSelectionChangedAddEvent(const Any &oldValue, const Any &newValue);
-    virtual void handleSelectionChangedRemoveEvent(const Any &oldValue, const Any &newValue);
-    virtual void handleSelectionChangedWithinEvent(const Any &oldValue, const Any &newValue);
+    virtual void handleSelectionChangedAddEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
+    virtual void handleSelectionChangedRemoveEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
+    virtual void handleSelectionChangedWithinEvent(
+            const css::uno::Any &oldValue, const css::uno::Any &newValue);
 };
 
 #endif
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index ee7e3af3c22a..47e3215be4c4 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
-
 /**
  * AccDialogEventListener is inherited from AccEventListener. It handles the evnets
  * generated by Dialogs. The accessible role is: DIALOG.
@@ -43,7 +41,8 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent (Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
     virtual void SAL_CALL handleVisibleDataChangedEvent();
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index 263e525b9137..7447fe89f034 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -28,7 +28,7 @@
 #include <osl/mutex.hxx>
 
 class AccObjectManagerAgent;
-using namespace ::com::sun::star::uno;
+
 /**
  * AccEventListener is the general event listener for all controls. It defines the
  * procedure of all the event handling and provides the basic support for some simple
@@ -54,13 +54,14 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for name changed event
-    virtual void SAL_CALL handleNameChangedEvent(Any name);
+    virtual void SAL_CALL handleNameChangedEvent(css::uno::Any name);
 
     //for description changed event
-    virtual void SAL_CALL handleDescriptionChangedEvent(Any desc);
+    virtual void SAL_CALL handleDescriptionChangedEvent(css::uno::Any desc);
 
     //for state changed event
-    virtual void SAL_CALL handleStateChangedEvent (Any oldValue, Any newValue);
+    virtual void SAL_CALL handleStateChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
     virtual void SAL_CALL setComponentState(short state, bool enable);
     virtual void SAL_CALL fireStatePropertyChange(short state, bool set
                                                      );
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index d2a0c1f0a1cc..d606edcc1f77 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccFrameEventListener is inherited from AccEventListener. It handles the evnets
@@ -43,7 +42,8 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
     virtual void SAL_CALL handleVisibleDataChangedEvent();
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index 3a47131c584a..0addafd424de 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccListEventListener is inherited from AccDescendantManagerEventListener. It handles
@@ -44,9 +43,11 @@ public:
     //AccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
     //for active descendant changed event
-    virtual void SAL_CALL handleActiveDescendantChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleActiveDescendantChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
     //for value changed event
-    virtual void SAL_CALL handleValueChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleValueChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 };
 
 #endif
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index 1c10ff22d498..662469e4d1fe 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccMenuEventListener is inherited from AccComponentEventListener. It handles the evnets
@@ -43,7 +42,8 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent (Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for selection changed event
     virtual void SAL_CALL handleSelectionChangedEvent();
diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx
index 3f00cc20eb4b..878f7c0b75c0 100644
--- a/winaccessibility/inc/AccObjectContainerEventListener.hxx
+++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccObjectContainerEventListener is inherited from AccContainerEventListener. It handles the evnets
@@ -40,7 +39,8 @@ public:
     virtual ~AccObjectContainerEventListener();
 
     //overwrite handleStateChangedEvent()
-    virtual void SAL_CALL handleStateChangedEvent (Any oldValue, Any newValue);
+    virtual void SAL_CALL handleStateChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
     //for visible data changed event, for shapes, the visiabledatachanged should be mapped to LOCATION_CHANGED
     virtual void SAL_CALL handleVisibleDataChangedEvent();
 };
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index f192f2c1571a..a7460c84701a 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccParagraphEventListener is inherited from AccContainerEventListener. It handles the evnets
@@ -43,7 +42,8 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for caret changed event
-    virtual void SAL_CALL handleCaretChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleCaretChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
     virtual void SAL_CALL handleVisibleDataChangedEvent();
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index befd4fdb86ed..d23086749b0b 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccTableEventListener is inherited from AccDescendantManagerEventListener. It handles
@@ -42,9 +41,10 @@ public:
     //AccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
     //for active descendant changed event
-    virtual void SAL_CALL handleActiveDescendantChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleActiveDescendantChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
-    void SAL_CALL handleTableModelChangeEvent(Any newValue);
+    void SAL_CALL handleTableModelChangeEvent(css::uno::Any newValue);
 
 };
 
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx
index ee76bf886337..064a73643ce8 100644
--- a/winaccessibility/inc/AccTextComponentEventListener.hxx
+++ b/winaccessibility/inc/AccTextComponentEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccTextComponentEventListener is inherited from AccComponentEventListener. It handles the evnets
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index cc8c03b7567d..d0cc1eb119d6 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
 
 /**
  * AccTreeEventListener is inherited from AccDescendantManagerEventListener. It handles
@@ -42,7 +41,8 @@ public:
     //AccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
     //for active descendant changed event
-    virtual void SAL_CALL handleActiveDescendantChangedEvent(Any oldValue, Any newValue);
+    virtual void SAL_CALL handleActiveDescendantChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 };
 
 #endif
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index 04b9ef43e36e..d538c81ba192 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
-using namespace ::com::sun::star::uno;
+
 /**
  * AccWindowEventListener is inherited from AccEventListener. It handles the events
  * generated by Dialogs. The accessible role is: WINDOW.
@@ -42,7 +42,8 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent (Any oldValue, Any newValue);
+    virtual void SAL_CALL handleChildChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
     virtual void SAL_CALL handleVisibleDataChangedEvent();
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
 {