com::sun::star->css in winaccessibility/

Change-Id: I644364fc6d8fc334044a3e53fcde24a6ef86c021
Reviewed-on: https://gerrit.libreoffice.org/20142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

18 files changed, 119 insertions, 124 deletions

diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index 27f06e687aee..cf8698f03ee0 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -38,11 +38,11 @@ class AccComponentEventListener: public AccEventListener
 private:
     static FILE *output, *output2, *output3, *outacc;//used for debugging
 public:
-    AccComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccComponentEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for value changed event
     virtual void HandleValueChangedEvent(
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index 1df510361ee9..de157076bd4a 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -38,11 +38,11 @@
 class AccContainerEventListener: public AccEventListener
 {
 public:
-    AccContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccContainerEventListener();
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for child changed event
     virtual void HandleChildChangedEvent(
@@ -69,12 +69,10 @@ public:
     virtual void SetComponentState(short state, bool enable) override;
     virtual void FireStatePropertyChange(short state, bool set) override;
     virtual void FireStateFocusedChange(bool enable) override;
-    virtual bool IsEditable(
-        css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
+    virtual bool IsEditable(css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
 
     // update all children's state
-    void UpdateAllChildrenState(
-            com::sun::star::accessibility::XAccessible* pXAccessible);
+    void UpdateAllChildrenState( css::accessibility::XAccessible* pXAccessible);
 
     bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value);
 
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index 1157a52bd647..bb310f7d3d80 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -35,11 +35,11 @@ class AccDescendantManagerEventListener: public AccComponentEventListener
 {
 
 public:
-    AccDescendantManagerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccDescendantManagerEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for selection changed event
     virtual void HandleSelectionChangedEvent(
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index 64c745ff0129..8857512c4943 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -34,11 +34,11 @@
 class AccDialogEventListener: public AccEventListener
 {
 public:
-    AccDialogEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccDialogEventListener();
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index f3f85131dd2f..ecb7b286cd74 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -36,23 +36,22 @@ class AccObjectManagerAgent;
  */
 class AccEventListener
     : public ::cppu::WeakImplHelper<
-        com::sun::star::accessibility::XAccessibleEventListener>
+        css::accessibility::XAccessibleEventListener>
 {
 protected:
     //accessible owner's pointer
-    com::sun::star::uno::Reference<
-        com::sun::star::accessibility::XAccessible> m_xAccessible;
+    css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
     //agent pointer for objects' manager
     AccObjectManagerAgent* pAgent;
 public:
-    AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccEventListener( css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccEventListener();
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException);
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for name changed event
     virtual void HandleNameChangedEvent(css::uno::Any name);
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index e4b28610fecf..b41104d77bce 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -35,11 +35,11 @@
 class AccFrameEventListener: public AccEventListener
 {
 public:
-    AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccFrameEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index 2320e77803a8..a59ec47a2f32 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -37,11 +37,11 @@ class AccListEventListener: public AccDescendantManagerEventListener
 private:
     bool shouldDeleteChild;
 public:
-    AccListEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccListEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for active descendant changed event
     virtual void HandleActiveDescendantChangedEvent(
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index c7b05e3e5cb2..fbeeec7489c8 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -35,11 +35,11 @@
 class AccMenuEventListener: public AccComponentEventListener
 {
 public:
-    AccMenuEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccMenuEventListener();
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx
index 3f1c9ab2a241..3cbab61ec213 100644
--- a/winaccessibility/inc/AccObject.hxx
+++ b/winaccessibility/inc/AccObject.hxx
@@ -56,9 +56,9 @@ private:
     ::rtl::Reference<AccEventListener>  m_pListener;
     IAccSelectionList   m_selectionList;
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > m_xAccRef;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleAction > m_xAccActionRef;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext > m_xAccContextRef;
+    css::uno::Reference < css::accessibility::XAccessible > m_xAccRef;
+    css::uno::Reference < css::accessibility::XAccessibleAction > m_xAccActionRef;
+    css::uno::Reference < css::accessibility::XAccessibleContext > m_xAccContextRef;
 
     void ImplInitializeCreateObj();//create COM object
 
@@ -66,21 +66,20 @@ private:
     void UpdateRole();
 
     DWORD GetMSAAStateFromUNO(short xState);//translate state from UNO to MSAA value
-    ::com::sun::star::accessibility::XAccessibleSelection* GetXAccessibleSelection();
+    css::accessibility::XAccessibleSelection* GetXAccessibleSelection();
     void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded);
-    ::rtl::OUString GetMAccessibleValueFromAny(::com::sun::star::uno::Any pAny);
+    ::rtl::OUString GetMAccessibleValueFromAny(css::uno::Any pAny);
 
 public:
 
-    AccObject ( ::com::sun::star::accessibility::XAccessible* pXAcc = NULL,AccObjectManagerAgent* pAgent = NULL ,AccEventListener* accListener=NULL);
+    AccObject ( css::accessibility::XAccessible* pXAcc = NULL,AccObjectManagerAgent* pAgent = NULL ,AccEventListener* accListener=NULL);
     virtual ~AccObject();
 
     sal_Bool UpdateAccessibleInfoFromUnoToMSAA(  ); //implement accessible information mapping
     void UpdateDefaultAction();
 
     IMAccessible*  GetIMAccessible();   //return COM interface in acc object
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessible> const& GetXAccessible();
+    css::uno::Reference<css::accessibility::XAccessible> const& GetXAccessible();
 
     void SetResID(long id);//ResID means ChildID in MSAA
     long GetResID();
@@ -105,9 +104,9 @@ public:
     void  DecreaseState(short xState );//call COM interface DecreaseState method
     void  IncreaseState( short xState );//call COM interface IncreaseState method
 
-    void  SetName( com::sun::star::uno::Any newName);
-    void  SetValue( com::sun::star::uno::Any pAny );
-    void  SetDescription( com::sun::star::uno::Any newDesc );
+    void  SetName( css::uno::Any newName);
+    void  SetValue( css::uno::Any pAny );
+    void  SetDescription( css::uno::Any newDesc );
     void  SetRole( short Role );
 
     short GetRole() const;
diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx
index e52b59577949..94ce67cba093 100644
--- a/winaccessibility/inc/AccObjectContainerEventListener.hxx
+++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx
@@ -35,7 +35,7 @@
 class AccObjectContainerEventListener: public AccContainerEventListener
 {
 public:
-    AccObjectContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccObjectContainerEventListener();
 
     virtual void HandleStateChangedEvent(
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx
index b00fb3f4e8bb..6247260e1e19 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -44,58 +44,57 @@ public:
     AccObjectManagerAgent();
     virtual ~AccObjectManagerAgent();
 
-    virtual bool InsertAccObj(com::sun::star::accessibility::XAccessible* pXAcc,
-                              com::sun::star::accessibility::XAccessible* pParentXAcc,
+    virtual bool InsertAccObj(css::accessibility::XAccessible* pXAcc,
+                              css::accessibility::XAccessible* pParentXAcc,
                               sal_Int64 pWnd=0);
     virtual void GetIAccessibleFromResID(long childID,IMAccessible**);
-    virtual bool GetIAccessibleFromXAccessible(com::sun::star::accessibility::XAccessible* pXAcc, IAccessible** ppIA);
+    virtual bool GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc, IAccessible** ppIA);
 
-    virtual void DeleteAccObj( com::sun::star::accessibility::XAccessible* pXAcc );
-    virtual IMAccessible*  GetIMAccByXAcc(com::sun::star::accessibility::XAccessible* pXAcc);
+    virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
+    virtual IMAccessible*  GetIMAccByXAcc(css::accessibility::XAccessible* pXAcc);
 
-    bool NotifyAccEvent(short pEvent = 0, com::sun::star::accessibility::XAccessible* pXAcc = 0);
+    bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* pXAcc = 0);
 
-    bool InsertChildrenAccObj(com::sun::star::accessibility::XAccessible* pXAcc,
+    bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
                               sal_Int64 pWnd=0);
-    void DeleteChildrenAccObj( com::sun::star::accessibility::XAccessible* pXAcc );
+    void DeleteChildrenAccObj( css::accessibility::XAccessible* pXAcc );
 
-    void  DecreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
-    void  IncreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
-    void  UpdateState( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
+    void  IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
+    void  UpdateState( css::accessibility::XAccessible* pXAcc );
 
-    void  UpdateLocation( com::sun::star::accessibility::XAccessible* pXAcc,
+    void  UpdateLocation( css::accessibility::XAccessible* pXAcc,
                           long Top = 0,long left = 0,long width = 0,long height = 0 );
-    void  UpdateAction( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  UpdateAction( css::accessibility::XAccessible* pXAcc );
 
-    void  UpdateValue( com::sun::star::accessibility::XAccessible* pXAcc );
-    void  UpdateValue( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any );
+    void  UpdateValue( css::accessibility::XAccessible* pXAcc );
+    void  UpdateValue( css::accessibility::XAccessible* pXAcc, css::uno::Any );
 
-    void  UpdateAccName( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newName);
-    void  UpdateAccName( com::sun::star::accessibility::XAccessible* pXAcc);
+    void  UpdateAccName( css::accessibility::XAccessible* pXAcc, css::uno::Any newName);
+    void  UpdateAccName( css::accessibility::XAccessible* pXAcc);
 
-    void  UpdateDescription( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newDesc );
-    void  UpdateDescription( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  UpdateDescription( css::accessibility::XAccessible* pXAcc, css::uno::Any newDesc );
+    void  UpdateDescription( css::accessibility::XAccessible* pXAcc );
 
-    void NotifyDestroy(com::sun::star::accessibility::XAccessible* pXAcc);
+    void NotifyDestroy(css::accessibility::XAccessible* pXAcc);
 
-    com::sun::star::accessibility::XAccessible* GetParentXAccessible(
-        com::sun::star::accessibility::XAccessible* pXAcc );
-    short GetParentRole(com::sun::star::accessibility::XAccessible* pXAcc );
-    bool IsContainer(com::sun::star::accessibility::XAccessible* pXAcc);
+    css::accessibility::XAccessible* GetParentXAccessible( css::accessibility::XAccessible* pXAcc );
+    short GetParentRole(css::accessibility::XAccessible* pXAcc );
+    bool IsContainer(css::accessibility::XAccessible* pXAcc);
 
     void SaveTopWindowHandle(sal_Int64 hWnd,
-            com::sun::star::accessibility::XAccessible* pXAcc);
+            css::accessibility::XAccessible* pXAcc);
 
-    void UpdateChildState(com::sun::star::accessibility::XAccessible* pXAcc);
+    void UpdateChildState(css::accessibility::XAccessible* pXAcc);
 
-    bool IsSpecialToolboItem(com::sun::star::accessibility::XAccessible* pXAcc);
+    bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc);
 
-    short GetRole(com::sun::star::accessibility::XAccessible* pXAcc);
+    short GetRole(css::accessibility::XAccessible* pXAcc);
 
-    com::sun::star::accessibility::XAccessible* GetAccDocByAccTopWin( com::sun::star::accessibility::XAccessible* pXAcc );
-    bool IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc );
+    css::accessibility::XAccessible* GetAccDocByAccTopWin( css::accessibility::XAccessible* pXAcc );
+    bool IsTopWinAcc( css::accessibility::XAccessible* pXAcc );
 
-    bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pXAcc);
+    bool IsStateManageDescendant(css::accessibility::XAccessible* pXAcc);
 
     sal_Int64 Get_ToATInterface(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
 
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 99c866ec13fb..da853832858b 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -50,7 +50,7 @@ private:
     typedef std::map<HWND, void*> XHWNDToXAccHash;
     typedef std::map<const long, AccObject*> XResIdToAccObjHash;
 
-    typedef std::map<const HWND, com::sun::star::accessibility::XAccessible* >
+    typedef std::map<const HWND, css::accessibility::XAccessible* >
         XHWNDToDocumentHash;
 
     //XAccessible to AccObject
@@ -65,7 +65,7 @@ private:
     //for file name support
     XHWNDToDocumentHash XHWNDDocList;
 
-    com::sun::star::accessibility::XAccessible* oldFocus;
+    css::accessibility::XAccessible* oldFocus;
 
     AccObjectManagerAgent*   pAgent;
     ResIDGenerator ResIdGen;
@@ -74,72 +74,72 @@ private:
 
 private:
     long ImpleGenerateResID();
-    AccObject* GetAccObjByXAcc( com::sun::star::accessibility::XAccessible* pXAcc);
+    AccObject* GetAccObjByXAcc( css::accessibility::XAccessible* pXAcc);
 
     AccObject* GetTopWindowAccObj(HWND hWnd);
 
-    com::sun::star::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd);
+    css::accessibility::XAccessible* GetAccDocByHWND(HWND hWnd);
 
     void       DeleteAccListener( AccObject* pAccObj );
     void       InsertAccChildNode(AccObject* pCurObj,AccObject* pParentObj,HWND pWnd);
     void       DeleteAccChildNode(AccObject* pChild);
-    void       DeleteFromHwndXAcc(com::sun::star::accessibility::XAccessible* pXAcc );
-    int  UpdateAccSelection(com::sun::star::accessibility::XAccessible* pXAcc);
+    void       DeleteFromHwndXAcc(css::accessibility::XAccessible* pXAcc );
+    int  UpdateAccSelection(css::accessibility::XAccessible* pXAcc);
 
     ::rtl::Reference<AccEventListener> CreateAccEventListener(
-            com::sun::star::accessibility::XAccessible* pXAcc);
+            css::accessibility::XAccessible* pXAcc);
 public:
     virtual ~AccObjectWinManager();
-    sal_Bool InsertAccObj( com::sun::star::accessibility::XAccessible* pXAcc,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWnd);
-    sal_Bool InsertChildrenAccObj( com::sun::star::accessibility::XAccessible* pXAcc,HWND pWnd=0);
-    void DeleteAccObj( com::sun::star::accessibility::XAccessible* pXAcc );
-    void DeleteChildrenAccObj(com::sun::star::accessibility::XAccessible* pAccObj);
+    sal_Bool InsertAccObj( css::accessibility::XAccessible* pXAcc,css::accessibility::XAccessible* pParentXAcc,HWND pWnd);
+    sal_Bool InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc,HWND pWnd=0);
+    void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
+    void DeleteChildrenAccObj(css::accessibility::XAccessible* pAccObj);
 
-    sal_Bool NotifyAccEvent( com::sun::star::accessibility::XAccessible* pXAcc,short state = 0 );
+    sal_Bool NotifyAccEvent( css::accessibility::XAccessible* pXAcc,short state = 0 );
 
     LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
 
-    void  DecreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
-    void  IncreaseState( com::sun::star::accessibility::XAccessible* pXAcc,unsigned short pState );
-    void  UpdateState( com::sun::star::accessibility::XAccessible* pXAcc );
-    void  SetLocation( com::sun::star::accessibility::XAccessible* pXAcc,
+    void  DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
+    void  IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
+    void  UpdateState( css::accessibility::XAccessible* pXAcc );
+    void  SetLocation( css::accessibility::XAccessible* pXAcc,
                        long Top = 0,long left = 0,long width = 0,long height = 0);
 
-    void  SetValue( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any pAny );
-    void  UpdateValue( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  SetValue( css::accessibility::XAccessible* pXAcc, css::uno::Any pAny );
+    void  UpdateValue( css::accessibility::XAccessible* pXAcc );
 
-    void  SetAccName( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newName);
-    void  UpdateAccName( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  SetAccName( css::accessibility::XAccessible* pXAcc, css::uno::Any newName);
+    void  UpdateAccName( css::accessibility::XAccessible* pXAcc );
 
-    void  SetDescription( com::sun::star::accessibility::XAccessible* pXAcc, com::sun::star::uno::Any newDesc );
-    void UpdateDescription( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  SetDescription( css::accessibility::XAccessible* pXAcc, css::uno::Any newDesc );
+    void UpdateDescription( css::accessibility::XAccessible* pXAcc );
 
-    void  SetRole( com::sun::star::accessibility::XAccessible* pXAcc, long Role );
+    void  SetRole( css::accessibility::XAccessible* pXAcc, long Role );
 
-    void  UpdateAccFocus( com::sun::star::accessibility::XAccessible* newFocus );
-    void  UpdateAction( com::sun::star::accessibility::XAccessible* pXAcc );
+    void  UpdateAccFocus( css::accessibility::XAccessible* newFocus );
+    void  UpdateAction( css::accessibility::XAccessible* pXAcc );
 
-    sal_Bool IsContainer( com::sun::star::accessibility::XAccessible* pAccessible );
+    sal_Bool IsContainer( css::accessibility::XAccessible* pAccessible );
 
-    IMAccessible* GetIMAccByXAcc( com::sun::star::accessibility::XAccessible* pXAcc );
+    IMAccessible* GetIMAccByXAcc( css::accessibility::XAccessible* pXAcc );
     IMAccessible* GetIAccessibleFromResID(long resID);
 
-    void NotifyDestroy( com::sun::star::accessibility::XAccessible* pXAcc );
-    com::sun::star::accessibility::XAccessible* GetParentXAccessible( com::sun::star::accessibility::XAccessible* pXAcc );
-    short GetParentRole( com::sun::star::accessibility::XAccessible* pXAcc );
+    void NotifyDestroy( css::accessibility::XAccessible* pXAcc );
+    css::accessibility::XAccessible* GetParentXAccessible( css::accessibility::XAccessible* pXAcc );
+    short GetParentRole( css::accessibility::XAccessible* pXAcc );
 
-    void SaveTopWindowHandle(HWND hWnd, com::sun::star::accessibility::XAccessible* pXAcc);
+    void SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* pXAcc);
 
-    void UpdateChildState(com::sun::star::accessibility::XAccessible* pXAcc);
+    void UpdateChildState(css::accessibility::XAccessible* pXAcc);
 
-    bool IsSpecialToolboItem(com::sun::star::accessibility::XAccessible* pXAcc);
+    bool IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc);
 
-    short GetRole(com::sun::star::accessibility::XAccessible* pXAcc);
+    short GetRole(css::accessibility::XAccessible* pXAcc);
 
-    com::sun::star::accessibility::XAccessible* GetAccDocByAccTopWin( com::sun::star::accessibility::XAccessible* pXAcc );
-    bool IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc );
+    css::accessibility::XAccessible* GetAccDocByAccTopWin( css::accessibility::XAccessible* pXAcc );
+    bool IsTopWinAcc( css::accessibility::XAccessible* pXAcc );
 
-    bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pAccessible);
+    bool IsStateManageDescendant(css::accessibility::XAccessible* pAccessible);
 
 };
 #endif // INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index 7ecf1c870d11..a618223b196d 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -35,11 +35,11 @@
 class AccParagraphEventListener: public AccContainerEventListener
 {
 public:
-    AccParagraphEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccParagraphEventListener();
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for caret changed event
     virtual void HandleCaretChangedEvent(
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index 501afdd4a7e0..958d7e06ab31 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -35,11 +35,11 @@
 class AccTableEventListener: public AccDescendantManagerEventListener
 {
 public:
-    AccTableEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccTableEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for active descendant changed event
     virtual void HandleActiveDescendantChangedEvent(
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx
index 5bb7986eb522..6ca166b0644a 100644
--- a/winaccessibility/inc/AccTextComponentEventListener.hxx
+++ b/winaccessibility/inc/AccTextComponentEventListener.hxx
@@ -35,7 +35,7 @@
 class AccTextComponentEventListener: public AccComponentEventListener
 {
 public:
-    AccTextComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccTextComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccTextComponentEventListener();
 
     virtual void SetComponentState(short state, bool enable) override;
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx
index 1a52becf0e60..b11be4a81c23 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -36,7 +36,7 @@
  * cached into bridge managers, and they are monitored by listeners for later accessible event handling.
  */
 class AccTopWindowListener
-    : public ::cppu::WeakImplHelper<com::sun::star::awt::XTopWindowListener>
+    : public ::cppu::WeakImplHelper<css::awt::XTopWindowListener>
 {
 private:
     AccObjectManagerAgent accManagerAgent;
@@ -45,20 +45,20 @@ public:
     virtual ~AccTopWindowListener();
 
     // XTopWindowListener
-    virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException);
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException);
 
-    virtual void AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWND );
+    virtual void AddAllListeners(css::accessibility::XAccessible* pAccessible,css::accessibility::XAccessible* pParentXAcc,HWND pWND );
     //for On-Demand load.
-    virtual void HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible );
+    virtual void HandleWindowOpened( css::accessibility::XAccessible* pAccessible );
 
     sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam);
 };
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index 3ac46c8a0cc2..d1f86334d8e5 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -35,11 +35,11 @@
 class AccTreeEventListener: public AccDescendantManagerEventListener
 {
 public:
-    AccTreeEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccTreeEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for active descendant changed event
     virtual void HandleActiveDescendantChangedEvent(
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index 8db9b0aafa8e..ef9a8a7f6c54 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -35,11 +35,11 @@
 class AccWindowEventListener: public AccEventListener
 {
 public:
-    AccWindowEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
+    AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccWindowEventListener();
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException);
 
     //for child changed event
     virtual void HandleChildChangedEvent(