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>

55 files changed, 294 insertions, 299 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(
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.h b/winaccessibility/source/UAccCOM/AccActionBase.h
index 0c7e1eb06dd9..783903031476 100644
--- a/winaccessibility/source/UAccCOM/AccActionBase.h
+++ b/winaccessibility/source/UAccCOM/AccActionBase.h
@@ -64,16 +64,16 @@ public:
     // Override of IUNOXWrapper.
     STDMETHOD(put_XInterface)(hyper pXInterface);
 
-    static void GetkeyBindingStrByXkeyBinding( const com::sun::star::uno::Sequence< com::sun::star::awt::KeyStroke > &keySet, OLECHAR* pString );
+    static void GetkeyBindingStrByXkeyBinding( const css::uno::Sequence< css::awt::KeyStroke > &keySet, OLECHAR* pString );
 
 protected:
 
     static OLECHAR* getOLECHARFromKeyCode(long key);
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleAction> pRXAct;
+    css::uno::Reference<css::accessibility::XAccessibleAction> pRXAct;
 
 private:
-    inline com::sun::star::accessibility::XAccessibleAction* GetXInterface()
+    inline css::accessibility::XAccessibleAction* GetXInterface()
     {
         return pRXAct.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.cxx b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
index 7069d9a3d588..b6f87ed2f787 100644
--- a/winaccessibility/source/UAccCOM/AccComponentBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.cxx
@@ -56,7 +56,7 @@ STDMETHODIMP CAccComponentBase::get_locationInParent(long *x, long *y)
         if(!pRXComp.is())
             return E_FAIL;
 
-        const ::com::sun::star::awt::Point& pt = GetXInterface()->getLocation();
+        const css::awt::Point& pt = GetXInterface()->getLocation();
         *x = pt.X;
         *y = pt.Y;
         return S_OK;
@@ -86,7 +86,7 @@ STDMETHODIMP CAccComponentBase::get_locationOnScreen(long *x, long *y)
         if(!pRXComp.is())
             return E_FAIL;
 
-        const ::com::sun::star::awt::Point& pt = GetXInterface()->getLocationOnScreen();
+        const css::awt::Point& pt = GetXInterface()->getLocationOnScreen();
         *x = pt.X;
         *y = pt.Y;
         return S_OK;
diff --git a/winaccessibility/source/UAccCOM/AccComponentBase.h b/winaccessibility/source/UAccCOM/AccComponentBase.h
index 18481e48b5ee..5ceec3d2997a 100644
--- a/winaccessibility/source/UAccCOM/AccComponentBase.h
+++ b/winaccessibility/source/UAccCOM/AccComponentBase.h
@@ -57,9 +57,9 @@ public:
 
 protected:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleComponent> pRXComp;
+    css::uno::Reference<css::accessibility::XAccessibleComponent> pRXComp;
 
-    inline com::sun::star::accessibility::XAccessibleComponent* GetXInterface()
+    inline css::accessibility::XAccessibleComponent* GetXInterface()
     {
         return pRXComp.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx
index 798e3300c3c8..e640ff0d94d7 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.cxx
+++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx
@@ -306,15 +306,15 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
     else if(ouName.equals(L"CharPosture") )
     {
         // Convert to FontSlant.
-        ::com::sun::star::awt::FontSlant fontSlant = (::com::sun::star::awt::FontSlant)ouValue.toInt32();
-        rAny.setValue(&fontSlant, cppu::UnoType<com::sun::star::awt::FontSlant>::get());
+        css::awt::FontSlant fontSlant = (css::awt::FontSlant)ouValue.toInt32();
+        rAny.setValue(&fontSlant, cppu::UnoType<css::awt::FontSlant>::get());
     }
     else if(ouName.equals(L"ParaTabStops") )
     {
 
         // Convert to the Sequence with TabStop element.
-        vector< ::com::sun::star::style::TabStop > vecTabStop;
-        ::com::sun::star::style::TabStop tabStop;
+        vector< css::style::TabStop > vecTabStop;
+        css::style::TabStop tabStop;
         ::rtl::OUString ouSubValue;
         sal_Int32 pos = 0, posComma = 0;
 
@@ -339,7 +339,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
                         if(posComma != -1)
                         {
                             ouSubValue = ouValue.copy(pos + 9, posComma - pos - 9);
-                            tabStop.Alignment = (::com::sun::star::style::TabAlign)ouSubValue.toInt32();
+                            tabStop.Alignment = (css::style::TabAlign)ouSubValue.toInt32();
                             pos = posComma + 1;
 
                             // DecimalChar.
@@ -396,7 +396,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
 
         // Dump into Sequence.
         int iSeqLen = (vecTabStop.size() == 0) ? 1 : vecTabStop.size();
-        Sequence< ::com::sun::star::style::TabStop > seqTabStop(iSeqLen);
+        Sequence< css::style::TabStop > seqTabStop(iSeqLen);
 
         if(vecTabStop.size() != 0)
         {
@@ -410,18 +410,18 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
         {
             // Create default value.
             seqTabStop[0].Position = 0;
-            seqTabStop[0].Alignment = ::com::sun::star::style::TabAlign_DEFAULT;
+            seqTabStop[0].Alignment = css::style::TabAlign_DEFAULT;
             seqTabStop[0].DecimalChar = '.';
             seqTabStop[0].FillChar = ' ';
         }
 
         // Assign to Any object.
-        rAny.setValue(&seqTabStop, cppu::UnoType<Sequence< ::com::sun::star::style::TabStop >>::get());
+        rAny.setValue(&seqTabStop, cppu::UnoType<Sequence< css::style::TabStop >>::get());
     }
     else if(ouName.equals(L"ParaLineSpacing") )
     {
         // Parse value string.
-        ::com::sun::star::style::LineSpacing lineSpacing;
+        css::style::LineSpacing lineSpacing;
         ::rtl::OUString ouSubValue;
         sal_Int32 pos = 0, posComma = 0;
 
@@ -459,7 +459,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
         }
 
         // Convert to Any object.
-        rAny.setValue(&lineSpacing, cppu::UnoType<com::sun::star::style::LineSpacing>::get());
+        rAny.setValue(&lineSpacing, cppu::UnoType<css::style::LineSpacing>::get());
     }
     else
     {
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h
index c1d15fbdc4ad..6edfb30c8a73 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.h
+++ b/winaccessibility/source/UAccCOM/AccEditableText.h
@@ -95,11 +95,11 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleEditableText> pRXEdtTxt;
+    css::uno::Reference<css::accessibility::XAccessibleEditableText> pRXEdtTxt;
 
-    void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, com::sun::star::uno::Any &rAny);
+    void get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const ::rtl::OUString &ouValue, css::uno::Any &rAny);
 
-    inline com::sun::star::accessibility::XAccessibleEditableText* GetXInterface()
+    inline css::accessibility::XAccessibleEditableText* GetXInterface()
     {
         return pRXEdtTxt.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
index 04cd3e8eafa2..c2902c4fa583 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx
@@ -120,7 +120,7 @@ STDMETHODIMP CAccHyperLink::get_anchor(/* [in] */ long index,
         return E_FAIL;
     }
     // Get Any type value via pRXLink.
-    ::com::sun::star::uno::Any  anyVal = GetXInterface()->getAccessibleActionAnchor(index);
+    css::uno::Any  anyVal = GetXInterface()->getAccessibleActionAnchor(index);
     // Convert Any to VARIANT.
     CMAccessible::ConvertAnyToVariant(anyVal, anchor);
 
@@ -152,7 +152,7 @@ STDMETHODIMP CAccHyperLink::get_anchorTarget(/* [in] */ long index,
         return E_FAIL;
     }
     // Get Any type value via pRXLink.
-    ::com::sun::star::uno::Any  anyVal = GetXInterface()->getAccessibleActionObject(index);
+    css::uno::Any  anyVal = GetXInterface()->getAccessibleActionObject(index);
     // Convert Any to VARIANT.
     CMAccessible::ConvertAnyToVariant(anyVal, anchorTarget);
 
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.h b/winaccessibility/source/UAccCOM/AccHyperLink.h
index a493aac12a66..5e142d2ac9f4 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.h
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.h
@@ -121,9 +121,9 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleHyperlink> pRXLink;
+    css::uno::Reference<css::accessibility::XAccessibleHyperlink> pRXLink;
 
-    inline com::sun::star::accessibility::XAccessibleHyperlink* GetXInterface()
+    inline css::accessibility::XAccessibleHyperlink* GetXInterface()
     {
         return pRXLink.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.h b/winaccessibility/source/UAccCOM/AccHypertext.h
index cd6bc960d101..566e585fea3e 100644
--- a/winaccessibility/source/UAccCOM/AccHypertext.h
+++ b/winaccessibility/source/UAccCOM/AccHypertext.h
@@ -146,7 +146,7 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleHypertext> pHyperText;
+    css::uno::Reference<css::accessibility::XAccessibleHypertext> pHyperText;
 
 };
 
diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx b/winaccessibility/source/UAccCOM/AccImage.cxx
index 55f0ec6d5b98..d1a6f6b5702e 100644
--- a/winaccessibility/source/UAccCOM/AccImage.cxx
+++ b/winaccessibility/source/UAccCOM/AccImage.cxx
@@ -26,8 +26,8 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
-using namespace com::sun::star::accessibility;
-using namespace com::sun::star::uno;
+using namespace css::accessibility;
+using namespace css::uno;
 
 /**
    * Get description.
diff --git a/winaccessibility/source/UAccCOM/AccImage.h b/winaccessibility/source/UAccCOM/AccImage.h
index 5a9ac8ef7059..e6f01d57346f 100644
--- a/winaccessibility/source/UAccCOM/AccImage.h
+++ b/winaccessibility/source/UAccCOM/AccImage.h
@@ -82,9 +82,9 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleImage> pRXImg;
+    css::uno::Reference<css::accessibility::XAccessibleImage> pRXImg;
 
-    inline com::sun::star::accessibility::XAccessibleImage* GetXInterface()
+    inline css::accessibility::XAccessibleImage* GetXInterface()
     {
         return pRXImg.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccRelation.h b/winaccessibility/source/UAccCOM/AccRelation.h
index 354202b39bce..8c20b80720bd 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.h
+++ b/winaccessibility/source/UAccCOM/AccRelation.h
@@ -79,7 +79,7 @@ public:
 
 private:
 
-    com::sun::star::accessibility::AccessibleRelation relation;
+    css::accessibility::AccessibleRelation relation;
 };
 
 #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h
index 673437ecd7b1..6fb1d0946a90 100644
--- a/winaccessibility/source/UAccCOM/AccTable.h
+++ b/winaccessibility/source/UAccCOM/AccTable.h
@@ -161,9 +161,9 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleTable> pRXTable;
+    css::uno::Reference<css::accessibility::XAccessibleTable> pRXTable;
 
-    inline com::sun::star::accessibility::XAccessibleTable* GetXInterface()
+    inline css::accessibility::XAccessibleTable* GetXInterface()
     {
         return pRXTable.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index 597aeceb2b40..705e968b293e 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -34,8 +34,8 @@
 #include <com/sun/star/accessibility/XAccessibleTextSelection.hpp>
 #include "MAccessible.h"
 
-using namespace com::sun::star::accessibility;
-using namespace com::sun::star::uno;
+using namespace css::accessibility;
+using namespace css::uno;
 
 
 // Construction/Destruction
@@ -114,7 +114,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long
 
     strAttrs += L"Version:1;";
 
-    Sequence< ::com::sun::star::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< rtl::OUString >());
+    Sequence< css::beans::PropertyValue > pValues = GetXInterface()->getCharacterAttributes(offset, Sequence< rtl::OUString >());
     int nCount = pValues.getLength();
 
     short numberingLevel = 0;
@@ -126,7 +126,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long
     for(int i =0; i<nCount; i++)
     {
 
-        ::com::sun::star::beans::PropertyValue &pValue = pValues[i];
+        css::beans::PropertyValue &pValue = pValues[i];
         if(pValue.Name == "NumberingLevel")
         {
             if (pValue.Value != Any())
@@ -286,11 +286,11 @@ STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType c
     if(offset < 0 || offset > GetXInterface()->getCharacterCount() )
         return E_FAIL;
 
-    com::sun::star::awt::Rectangle rectangle;
+    css::awt::Rectangle rectangle;
     rectangle = GetXInterface()->getCharacterBounds(offset);
 
     //IA2Point aPoint;
-    com::sun::star::awt::Point aPoint;
+    css::awt::Point aPoint;
 
     Reference<XAccessibleContext> pRContext = pUNOInterface->getAccessibleContext();
     if( !pRContext.is() )
@@ -302,13 +302,13 @@ STDMETHODIMP CAccTextBase::get_characterExtents(long offset, IA2CoordinateType c
     {
         if(coordType == IA2_COORDTYPE_SCREEN_RELATIVE)
         {
-            ::com::sun::star::awt::Point pt = pRComp->getLocationOnScreen();
+            css::awt::Point pt = pRComp->getLocationOnScreen();
             aPoint.X = pt.X;
             aPoint.Y = pt.Y;
         }
         else if(coordType == IA2_COORDTYPE_PARENT_RELATIVE)
         {
-            ::com::sun::star::awt::Point pt = pRComp->getLocation();
+            css::awt::Point pt = pRComp->getLocation();
             aPoint.X = pt.X;
             aPoint.Y = pt.Y;
         }
@@ -401,7 +401,7 @@ STDMETHODIMP CAccTextBase::get_offsetAtPoint(long x, long y, IA2CoordinateType,
     if(!pRXText.is())
         return E_FAIL;
 
-    com::sun::star::awt::Point point;
+    css::awt::Point point;
     point.X = x;
     point.Y = y;
     *offset = GetXInterface()->getIndexAtPoint(point);
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.h b/winaccessibility/source/UAccCOM/AccTextBase.h
index 1997c80a83f3..f6460fee7760 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.h
+++ b/winaccessibility/source/UAccCOM/AccTextBase.h
@@ -101,9 +101,9 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleText> pRXText;
+    css::uno::Reference<css::accessibility::XAccessibleText> pRXText;
 
-    inline com::sun::star::accessibility::XAccessibleText* GetXInterface()
+    inline css::accessibility::XAccessibleText* GetXInterface()
     {
         return pRXText.get();
     }
diff --git a/winaccessibility/source/UAccCOM/AccValue.cxx b/winaccessibility/source/UAccCOM/AccValue.cxx
index 28bc8c9ce00d..1dc691291369 100644
--- a/winaccessibility/source/UAccCOM/AccValue.cxx
+++ b/winaccessibility/source/UAccCOM/AccValue.cxx
@@ -48,7 +48,7 @@ STDMETHODIMP CAccValue::get_currentValue(VARIANT * currentValue)
         return E_FAIL;
 
     // Get Any type value from UNO.
-    ::com::sun::star::uno::Any  anyVal = GetXInterface()->getCurrentValue();
+    css::uno::Any  anyVal = GetXInterface()->getCurrentValue();
     // Convert Any to VARIANT.
     CMAccessible::ConvertAnyToVariant(anyVal, currentValue);
 
@@ -73,49 +73,49 @@ STDMETHODIMP CAccValue::setCurrentValue(VARIANT value)
         return E_FAIL;
 
     HRESULT hRet = S_OK;
-    ::com::sun::star::uno::Any anyVal;
+    css::uno::Any anyVal;
 
     // Set value according to value type.
     switch(value.vt)
     {
     case VT_UI1:
         {
-            ::com::sun::star::uno::Type     typeInfo(TypeClass_CHAR, (sal_Char *)"char");
+            css::uno::Type     typeInfo(TypeClass_CHAR, (sal_Char *)"char");
             anyVal.setValue(&value.bVal, typeInfo);
         }
         break;
 
     case VT_BOOL:
         {
-            ::com::sun::star::uno::Type     typeInfo(TypeClass_BOOLEAN, (sal_Char *)"bool");
+            css::uno::Type     typeInfo(TypeClass_BOOLEAN, (sal_Char *)"bool");
             anyVal.setValue(&value.boolVal, typeInfo);
         }
         break;
 
     case VT_I2:
         {
-            ::com::sun::star::uno::Type     typeInfo(TypeClass_SHORT, (sal_Char *)"short");
+            css::uno::Type     typeInfo(TypeClass_SHORT, (sal_Char *)"short");
             anyVal.setValue(&value.iVal, typeInfo);
         }
         break;
 
     case VT_I4:
         {
-            ::com::sun::star::uno::Type     typeInfo(TypeClass_LONG, (sal_Char *)"long");
+            css::uno::Type     typeInfo(TypeClass_LONG, (sal_Char *)"long");
             anyVal.setValue(&value.lVal, typeInfo);
         }
         break;
 
     case VT_R4:
         {
-            ::com::sun::star::uno::Type     typeInfo(TypeClass_FLOAT, (sal_Char *)"float");
+            css::uno::Type     typeInfo(TypeClass_FLOAT, (sal_Char *)"float");
             anyVal.setValue(&value.fltVal, typeInfo);
         }
         break;
 
     case VT_R8:
         {
-            ::com::sun::star::uno::Type     typeInfo(TypeClass_DOUBLE, (sal_Char *)"double");
+            css::uno::Type     typeInfo(TypeClass_DOUBLE, (sal_Char *)"double");
             anyVal.setValue(&value.dblVal, typeInfo);
         }
         break;
@@ -155,7 +155,7 @@ STDMETHODIMP CAccValue::get_maximumValue(VARIANT *maximumValue)
         return E_FAIL;
 
     // Get Any type value from UNO.
-    ::com::sun::star::uno::Any  anyVal = GetXInterface()->getMaximumValue();
+    css::uno::Any  anyVal = GetXInterface()->getMaximumValue();
     // Convert Any to VARIANT.
     CMAccessible::ConvertAnyToVariant(anyVal, maximumValue);
 
@@ -181,7 +181,7 @@ STDMETHODIMP CAccValue::get_minimumValue(VARIANT *mininumValue)
         return E_FAIL;
 
     // Get Any type value from UNO.
-    ::com::sun::star::uno::Any  anyVal = GetXInterface()->getMinimumValue();
+    css::uno::Any  anyVal = GetXInterface()->getMinimumValue();
     // Convert Any to VARIANT.
     CMAccessible::ConvertAnyToVariant(anyVal, mininumValue);
 
diff --git a/winaccessibility/source/UAccCOM/AccValue.h b/winaccessibility/source/UAccCOM/AccValue.h
index af67a67f4a04..582dab961114 100644
--- a/winaccessibility/source/UAccCOM/AccValue.h
+++ b/winaccessibility/source/UAccCOM/AccValue.h
@@ -84,9 +84,9 @@ public:
 
 private:
 
-    com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleValue> pRXVal;
+    css::uno::Reference<css::accessibility::XAccessibleValue> pRXVal;
 
-    inline com::sun::star::accessibility::XAccessibleValue* GetXInterface()
+    inline css::accessibility::XAccessibleValue* GetXInterface()
     {
         return pRXVal.get();
     }
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index a6bdc9095f4c..070d0dff4770 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -944,8 +944,8 @@ STDMETHODIMP CMAccessible::accLocation(long *pxLeft, long *pyTop, long *pcxWidth
                     if( !pRComponent.is() )
                         return S_FALSE;
 
-                    ::com::sun::star::awt::Point pCPoint = pRComponent->getLocationOnScreen();
-                    ::com::sun::star::awt::Size pCSize = pRComponent->getSize();
+                    css::awt::Point pCPoint = pRComponent->getLocationOnScreen();
+                    css::awt::Size pCSize = pRComponent->getSize();
                     *pxLeft = pCPoint.X;
                     *pyTop =  pCPoint.Y;
                     *pcxWidth = pCSize.Width;
@@ -2820,9 +2820,9 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
                 }
                 wcscpy(pChar, pString.getStr());
             }
-            else if (pAny.getValueType() == cppu::UnoType<Sequence< ::com::sun::star::style::TabStop >>::get())
+            else if (pAny.getValueType() == cppu::UnoType<Sequence< css::style::TabStop >>::get())
             {
-                Sequence < ::com::sun::star::style::TabStop > val;
+                Sequence < css::style::TabStop > val;
                 pAny >>= val;
                 int count = val.getLength();
 
@@ -2834,7 +2834,7 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
                     OLECHAR pAttrsDescimalChar[512] = {NULL};
                     OLECHAR pAttrsFillChar[512] = {NULL};
 
-                    ::com::sun::star::style::TabStop sigleVal = val[iIndex];
+                    css::style::TabStop sigleVal = val[iIndex];
 
                     swprintf( pAttrsPosition, L"Position=%ld,TabAlign=%ld",
                         sigleVal.Position, sigleVal.Alignment);
@@ -2860,24 +2860,24 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
         }
     case TypeClass_ENUM:
         {
-            if (pAny.getValueType() == cppu::UnoType<com::sun::star::awt::FontSlant>::get())
+            if (pAny.getValueType() == cppu::UnoType<css::awt::FontSlant>::get())
             {
-                com::sun::star::awt::FontSlant val;
+                css::awt::FontSlant val;
                 pAny >>= val;
                 swprintf( pChar, L"%d", val);
             }
         }
     case TypeClass_STRUCT:
         {
-            if (pAny.getValueType() == cppu::UnoType<com::sun::star::style::LineSpacing>::get())
+            if (pAny.getValueType() == cppu::UnoType<css::style::LineSpacing>::get())
             {
-                com::sun::star::style::LineSpacing val;
+                css::style::LineSpacing val;
                 pAny >>= val;
                 swprintf( pChar, L"Mode=%ld,Height=%ld,", val.Mode, val.Height);
             }
-            else if (pAny.getValueType() == cppu::UnoType<com::sun::star::accessibility::TextSegment>::get())
+            else if (pAny.getValueType() == cppu::UnoType<css::accessibility::TextSegment>::get())
             {
-                com::sun::star::accessibility::TextSegment val;
+                css::accessibility::TextSegment val;
                 pAny >>= val;
                 ::rtl::OUString realVal(val.SegmentText);
                 wcscpy(pChar, realVal.getStr());
@@ -2912,18 +2912,18 @@ void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,c
 {
     if(pChar == NULL)
         return;
-    Reference< ::com::sun::star::container::XIndexReplace > pXIndex;
+    Reference< css::container::XIndexReplace > pXIndex;
     if((pAny>>=pXIndex) && (numberingLevel !=-1))//numbering level is -1,means invalid value
     {
         Any aAny = pXIndex->getByIndex(numberingLevel);
-        Sequence< ::com::sun::star::beans::PropertyValue > aProps;
+        Sequence< css::beans::PropertyValue > aProps;
         aAny >>= aProps;
-        const ::com::sun::star::beans::PropertyValue* pPropArray = aProps.getConstArray();
+        const css::beans::PropertyValue* pPropArray = aProps.getConstArray();
         sal_Int32 nCount = aProps.getLength();
         swprintf(pChar,L"Numbering:NumberingLevel=%d,",numberingLevel);
         for( sal_Int32 i=0; i<nCount; i++ )
         {
-            ::com::sun::star::beans::PropertyValue rProp = pPropArray[i];
+            css::beans::PropertyValue rProp = pPropArray[i];
             if( (rProp.Name == "BulletChar" ) ||
                 (rProp.Name == "GraphicURL" ) ||
                 (rProp.Name == "NumberingType" ))
@@ -2970,7 +2970,7 @@ void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,c
     }
 }
 
-void CMAccessible::ConvertAnyToVariant(const ::com::sun::star::uno::Any &rAnyVal, VARIANT *pvData)
+void CMAccessible::ConvertAnyToVariant(const css::uno::Any &rAnyVal, VARIANT *pvData)
 {
     if(rAnyVal.hasValue())
     {
@@ -3195,7 +3195,7 @@ STDMETHODIMP CMAccessible:: get_locale( IA2Locale __RPC_FAR *locale  )
     if (!m_xContext.is())
         return E_FAIL;
 
-    ::com::sun::star::lang::Locale unoLoc = m_xContext.get()->getLocale();
+    css::lang::Locale unoLoc = m_xContext.get()->getLocale();
     locale->language = SysAllocString((OLECHAR*)unoLoc.Language.getStr());
     locale->country = SysAllocString((OLECHAR*)unoLoc.Country.getStr());
     locale->variant = SysAllocString((OLECHAR*)unoLoc.Variant.getStr());
@@ -3329,9 +3329,9 @@ STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr)
         return E_FAIL;
     else
     {
-        com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleExtendedAttributes> pRXAttr;
+        css::uno::Reference<css::accessibility::XAccessibleExtendedAttributes> pRXAttr;
         pRXAttr = pRXI.get();
-        ::com::sun::star::uno::Any  anyVal = pRXAttr->getExtendedAttributes();
+        css::uno::Any  anyVal = pRXAttr->getExtendedAttributes();
 
         ::rtl::OUString val;
         anyVal >>= val;
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h
index 91332715787e..2186843b3c19 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    com::sun::star::accessibility::XAccessible* pUNOInterface;
+    css::accessibility::XAccessible* pUNOInterface;
 };
 
 #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 4a60dd771191..22fa47d63317 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccComponentEventListener::AccComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccComponentEventListener::AccComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
 {
 }
@@ -46,8 +46,8 @@ AccComponentEventListener::~AccComponentEventListener()
  *
  * @param   AccessibleEventObject   the event object which contains information about event
  */
-void  AccComponentEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccComponentEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index f0267f432f67..f882ea49ccf9 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccContainerEventListener::AccContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccContainerEventListener::AccContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
 {
 }
@@ -46,8 +46,8 @@ AccContainerEventListener::~AccContainerEventListener()
  *
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccContainerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccContainerEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -488,12 +488,12 @@ void AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any& /*o
 
 void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible)
 {
-    Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pXAccessible->getAccessibleContext(),UNO_QUERY);
+    Reference<css::accessibility::XAccessibleContext> xContext(pXAccessible->getAccessibleContext(),UNO_QUERY);
     if(!xContext.is())
     {
         return;
     }
-    com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
+    css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
     if(pAccessibleContext == NULL)
     {
         return;
@@ -507,10 +507,10 @@ void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible
     int count = pAccessibleContext->getAccessibleChildCount();
     for (int i=0;i<count;i++)
     {
-        Reference<com::sun::star::accessibility::XAccessible> mxAccessible
+        Reference<css::accessibility::XAccessible> mxAccessible
         = pAccessibleContext->getAccessibleChild(i);
 
-        com::sun::star::accessibility::XAccessible* mpAccessible = mxAccessible.get();
+        css::accessibility::XAccessible* mpAccessible = mxAccessible.get();
         if(mpAccessible != NULL)
         {
             pAgent->UpdateState(mpAccessible);
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index e292911b9093..fe2f6ec02420 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccDescendantManagerEventListener::AccDescendantManagerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccDescendantManagerEventListener::AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
     :   AccComponentEventListener(pAcc, Agent)
 {
 }
@@ -45,8 +45,8 @@ AccDescendantManagerEventListener::~AccDescendantManagerEventListener()
  * Uno's event notifier when event is captured
  * @param AccessibleEventObject     the event object which contains information about event
  */
-void  AccDescendantManagerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccDescendantManagerEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index 474eddee325a..a053d1cb7470 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccDialogEventListener::AccDialogEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccDialogEventListener::AccDialogEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
 {}
 AccDialogEventListener::~AccDialogEventListener()
@@ -43,8 +43,8 @@ AccDialogEventListener::~AccDialogEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccDialogEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccDialogEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index 7b8811625754..02e382a6d104 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 using namespace cppu;
 
-AccEventListener::AccEventListener(com::sun::star::accessibility::XAccessible* pAcc,
+AccEventListener::AccEventListener(css::accessibility::XAccessible* pAcc,
                                    AccObjectManagerAgent* Agent)
     : m_xAccessible(pAcc)
     , pAgent(Agent)
@@ -56,8 +56,8 @@ AccEventListener::~AccEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -201,7 +201,7 @@ void AccEventListener::FireStatePropertyChange(short /*state*/, bool set )
  */
 short AccEventListener::GetRole()
 {
-    css::uno::Reference<com::sun::star::accessibility::XAccessibleContext> const
+    css::uno::Reference<css::accessibility::XAccessibleContext> const
         xContext(m_xAccessible->getAccessibleContext());
     if(xContext.is())
     {
@@ -258,8 +258,8 @@ void AccEventListener::RemoveMeFromBroadcaster()
 /**
  *  this method is invoked before listener is disposed
  */
-void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
-throw (::com::sun::star::uno::RuntimeException)
+void AccEventListener::disposing( const css::lang::EventObject& /*Source*/ )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 29cb395720ba..ece7d90b543b 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star::accessibility;
 #include <toolkit/awt/Vclxwindow.hxx>
 #include <vcl/sysdata.hxx>
 
-AccFrameEventListener::AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccFrameEventListener::AccFrameEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
 {
 }
@@ -49,8 +49,8 @@ AccFrameEventListener::~AccFrameEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccFrameEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccFrameEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index 9d809e9d4544..5e3adef3d56d 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccListEventListener::AccListEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccListEventListener::AccListEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccDescendantManagerEventListener(pAcc, Agent),
         shouldDeleteChild(true)
 {
@@ -46,7 +46,7 @@ AccListEventListener::~AccListEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
+void  AccListEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index 7be29cd860a1..50119671d00e 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccMenuEventListener::AccMenuEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccMenuEventListener::AccMenuEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccComponentEventListener(pAcc, Agent)
 {}
 AccMenuEventListener::~AccMenuEventListener()
@@ -43,8 +43,8 @@ AccMenuEventListener::~AccMenuEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccMenuEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccMenuEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index 050b83b8c2c4..97668985bcdf 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -471,9 +471,9 @@ void  AccObject::SetValue( Any pAny )
             strValue=::rtl::OUString::number(val);
         }
     }
-    else if (pAny.getValueType() == cppu::UnoType<com::sun::star::accessibility::TextSegment>::get())
+    else if (pAny.getValueType() == cppu::UnoType<css::accessibility::TextSegment>::get())
     {
-        com::sun::star::accessibility::TextSegment val;
+        css::accessibility::TextSegment val;
         if (pAny >>= val)
         {
             ::rtl::OUString realVal(val.SegmentText);
@@ -998,8 +998,8 @@ void AccObject::UpdateLocation()
     Reference< XAccessibleComponent > pRComponent(pContext,UNO_QUERY);
     if( pRComponent.is() )
     {
-        ::com::sun::star::awt::Point pCPoint = pRComponent->getLocationOnScreen();
-        ::com::sun::star::awt::Size pCSize = pRComponent->getSize();
+        css::awt::Point pCPoint = pRComponent->getLocationOnScreen();
+        css::awt::Size pCSize = pRComponent->getSize();
         Location tempLocation;
         tempLocation.m_dLeft = pCPoint.X;
         tempLocation.m_dTop =  pCPoint.Y;
diff --git a/winaccessibility/source/service/AccObjectContainerEventListener.cxx b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
index dcf6e49c5b6a..f1a150b3b853 100644
--- a/winaccessibility/source/service/AccObjectContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
@@ -34,7 +34,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccObjectContainerEventListener::AccObjectContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccObjectContainerEventListener::AccObjectContainerEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccContainerEventListener(pAcc, Agent)
 {}
 AccObjectContainerEventListener::~AccObjectContainerEventListener()
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx
index 7606f39b8cc9..949505f7e865 100644
--- a/winaccessibility/source/service/AccObjectManagerAgent.cxx
+++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx
@@ -227,7 +227,7 @@ void AccObjectManagerAgent::IncreaseState( XAccessible* pXAcc,unsigned short pSt
     }
 }
 
-void  AccObjectManagerAgent::UpdateState( com::sun::star::accessibility::XAccessible* pXAcc )
+void  AccObjectManagerAgent::UpdateState( css::accessibility::XAccessible* pXAcc )
 {
     if(pWinManager)
         pWinManager->UpdateState(pXAcc);
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index fe1d49a70822..1bf4af30a4f3 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -584,7 +584,7 @@ inline long AccObjectWinManager::ImpleGenerateResID()
    * @param pWnd  Top Window handle
    * @return The calling result.
    */
-sal_Bool AccObjectWinManager::InsertChildrenAccObj( com::sun::star::accessibility::XAccessible* pXAcc,
+sal_Bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessible* pXAcc,
         HWND pWnd)
 {
     if(!IsContainer(pXAcc))
@@ -600,10 +600,10 @@ sal_Bool AccObjectWinManager::InsertChildrenAccObj( com::sun::star::accessibilit
 
     short role = pRContext->getAccessibleRole();
 
-    if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role ||
-            com::sun::star::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
-            com::sun::star::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
-            com::sun::star::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
+    if(css::accessibility::AccessibleRole::DOCUMENT == role ||
+            css::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
+            css::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
+            css::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
     {
         if(IsStateManageDescendant(pXAcc))
         {
@@ -761,7 +761,7 @@ sal_Bool AccObjectWinManager::InsertAccObj( XAccessible* pXAcc,XAccessible* pPar
    * @param pXAcc XAccessible interface for top window
    * @return void
    */
-void AccObjectWinManager::SaveTopWindowHandle(HWND hWnd, com::sun::star::accessibility::XAccessible* pXAcc)
+void AccObjectWinManager::SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* pXAcc)
 {
     HwndXAcc.insert( XHWNDToXAccHash::value_type( hWnd,(void*)pXAcc ) );
 }
@@ -906,7 +906,7 @@ void AccObjectWinManager::IncreaseState( XAccessible* pXAcc,unsigned short pStat
         pAccObj->IncreaseState( pState );
 }
 
-void  AccObjectWinManager::UpdateState( com::sun::star::accessibility::XAccessible* pXAcc )
+void  AccObjectWinManager::UpdateState( css::accessibility::XAccessible* pXAcc )
 {
     AccObject* pAccObj = GetAccObjByXAcc( pXAcc );
     if( pAccObj )
@@ -1169,9 +1169,9 @@ void AccObjectWinManager::NotifyDestroy(XAccessible* pXAcc)
 }
 
 
-void AccObjectWinManager::UpdateChildState(com::sun::star::accessibility::XAccessible* pAccSubMenu)
+void AccObjectWinManager::UpdateChildState(css::accessibility::XAccessible* pAccSubMenu)
 {
-    Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccSubMenu,UNO_QUERY);
+    Reference<css::accessibility::XAccessibleContext> xContext(pAccSubMenu,UNO_QUERY);
     if (!xContext.is())
     {
         return;
@@ -1179,7 +1179,7 @@ void AccObjectWinManager::UpdateChildState(com::sun::star::accessibility::XAcces
     sal_Int32 nCount = xContext->getAccessibleChildCount();
     for (sal_Int32 i = 0 ; i < nCount ; ++i)
     {
-        Reference<com::sun::star::accessibility::XAccessible> xChild = xContext->getAccessibleChild(i);
+        Reference<css::accessibility::XAccessible> xChild = xContext->getAccessibleChild(i);
         if (xChild.is())
         {
             AccObject *pObj =  GetAccObjByXAcc(xChild.get());
@@ -1192,7 +1192,7 @@ void AccObjectWinManager::UpdateChildState(com::sun::star::accessibility::XAcces
 }
 
 
-bool AccObjectWinManager::IsSpecialToolboItem(com::sun::star::accessibility::XAccessible* pXAcc)
+bool AccObjectWinManager::IsSpecialToolboItem(css::accessibility::XAccessible* pXAcc)
 {
     if (pXAcc && oldFocus != pXAcc)
     {
@@ -1211,10 +1211,10 @@ bool AccObjectWinManager::IsSpecialToolboItem(com::sun::star::accessibility::XAc
     return false;
 }
 
-short AccObjectWinManager::GetRole(com::sun::star::accessibility::XAccessible* pXAcc)
+short AccObjectWinManager::GetRole(css::accessibility::XAccessible* pXAcc)
 {
     assert(pXAcc != NULL);
-    Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pXAcc->getAccessibleContext(),UNO_QUERY);
+    Reference<css::accessibility::XAccessibleContext> xContext(pXAcc->getAccessibleContext(),UNO_QUERY);
     if(xContext.is())
     {
         return xContext->getAccessibleRole();
@@ -1241,7 +1241,7 @@ XAccessible* AccObjectWinManager::GetAccDocByAccTopWin( XAccessible* pXAcc )
     return GetAccDocByHWND(hWnd);
 }
 
-bool AccObjectWinManager::IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc )
+bool AccObjectWinManager::IsTopWinAcc( css::accessibility::XAccessible* pXAcc )
 {
     bool bRet = false;
     AccObject* pAccObj = GetAccObjByXAcc( pXAcc );
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx
index a8db40debccf..9d064c220b08 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccParagraphEventListener::AccParagraphEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccParagraphEventListener::AccParagraphEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccContainerEventListener(pAcc, Agent)
 {}
 AccParagraphEventListener::~AccParagraphEventListener()
@@ -43,8 +43,8 @@ AccParagraphEventListener::~AccParagraphEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccParagraphEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccParagraphEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccTableEventListener.cxx b/winaccessibility/source/service/AccTableEventListener.cxx
index 2b477f7153de..c413ef050795 100644
--- a/winaccessibility/source/service/AccTableEventListener.cxx
+++ b/winaccessibility/source/service/AccTableEventListener.cxx
@@ -33,7 +33,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccTableEventListener::AccTableEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccTableEventListener::AccTableEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccDescendantManagerEventListener(pAcc, Agent)
 {}
 AccTableEventListener::~AccTableEventListener()
@@ -44,8 +44,8 @@ AccTableEventListener::~AccTableEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccTableEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-throw (::com::sun::star::uno::RuntimeException)
+void  AccTableEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
+throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccTextComponentEventListener.cxx b/winaccessibility/source/service/AccTextComponentEventListener.cxx
index 775c31fe7733..1e96712c7d37 100644
--- a/winaccessibility/source/service/AccTextComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccTextComponentEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccTextComponentEventListener::AccTextComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccTextComponentEventListener::AccTextComponentEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccComponentEventListener(pAcc, Agent)
 {}
 AccTextComponentEventListener::~AccTextComponentEventListener()
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index e18c0c346352..b1b91a0f7fdb 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -48,7 +48,7 @@ using namespace cppu;
  *  accessible listener to monitor all these objects.
  *  @param pAccessible      the accessible of the new opened window
  */
-void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible )
+void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* pAccessible )
 {
     //get SystemData from window
     VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible;
@@ -63,11 +63,11 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA
     {
         systemdata = NULL;
     }
-    Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
+    Reference<css::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
     if(!xContext.is())
         return;
 
-    com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
+    css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
     //Only AccessibleContext exist, add all listeners
     if(pAccessibleContext != NULL && systemdata != NULL)
     {
@@ -81,16 +81,16 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA
 
         short role = pAccessibleContext->getAccessibleRole();
 
-        if (role == com::sun::star::accessibility::AccessibleRole::POPUP_MENU ||
-                role == com::sun::star::accessibility::AccessibleRole::MENU )
+        if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
+                role == css::accessibility::AccessibleRole::MENU )
         {
             accManagerAgent.NotifyAccEvent(UM_EVENT_MENUPOPUPSTART, pAccessible);
         }
 
-        if (role == com::sun::star::accessibility::AccessibleRole::FRAME ||
-                role == com::sun::star::accessibility::AccessibleRole::DIALOG ||
-                role == com::sun::star::accessibility::AccessibleRole::WINDOW ||
-                role == com::sun::star::accessibility::AccessibleRole::ALERT)
+        if (role == css::accessibility::AccessibleRole::FRAME ||
+                role == css::accessibility::AccessibleRole::DIALOG ||
+                role == css::accessibility::AccessibleRole::WINDOW ||
+                role == css::accessibility::AccessibleRole::ALERT)
         {
             accManagerAgent.NotifyAccEvent(UM_EVENT_SHOW, pAccessible);
         }
@@ -109,15 +109,15 @@ AccTopWindowListener::~AccTopWindowListener()
 /**
  *  It is invoked when a new window is opened, the source of this EventObject is the window
  */
-void AccTopWindowListener::windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException)
 {
     SAL_INFO( "iacc2", "windowOpened triggered" );
 
     if ( !e.Source.is())
         return;
 
-    Reference< com::sun::star::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY );
-    com::sun::star::accessibility::XAccessible* pAccessible = xAccessible.get();
+    Reference< css::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY );
+    css::accessibility::XAccessible* pAccessible = xAccessible.get();
     if ( !pAccessible )
         return;
 
@@ -132,14 +132,14 @@ void AccTopWindowListener::windowOpened( const ::com::sun::star::lang::EventObje
  *  @param  pParentXAcc     the parent of current accessible object
  *  @param  pWND            the handle of top window which current object resides
  */
-void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible, com::sun::star::accessibility::XAccessible* pParentXAcc, HWND pWND)
+void AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAccessible, css::accessibility::XAccessible* pParentXAcc, HWND pWND)
 {
-    Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
+    Reference<css::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
     if(!xContext.is())
     {
         return;
     }
-    com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
+    css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
     if(pAccessibleContext == NULL)
     {
         return;
@@ -155,10 +155,10 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
 
 
     short role = pAccessibleContext->getAccessibleRole();
-    if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role ||
-            com::sun::star::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
-            com::sun::star::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
-            com::sun::star::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
+    if(css::accessibility::AccessibleRole::DOCUMENT == role ||
+            css::accessibility::AccessibleRole::DOCUMENT_PRESENTATION == role ||
+            css::accessibility::AccessibleRole::DOCUMENT_SPREADSHEET == role ||
+            css::accessibility::AccessibleRole::DOCUMENT_TEXT == role)
     {
         if(accManagerAgent.IsStateManageDescendant(pAccessible))
         {
@@ -170,22 +170,22 @@ void AccTopWindowListener::AddAllListeners(com::sun::star::accessibility::XAcces
     int count = pAccessibleContext->getAccessibleChildCount();
     for (int i=0;i<count;i++)
     {
-        Reference<com::sun::star::accessibility::XAccessible> mxAccessible
+        Reference<css::accessibility::XAccessible> mxAccessible
         = pAccessibleContext->getAccessibleChild(i);
 
-        com::sun::star::accessibility::XAccessible* mpAccessible = mxAccessible.get();
+        css::accessibility::XAccessible* mpAccessible = mxAccessible.get();
         if(mpAccessible != NULL)
         {
-            Reference<com::sun::star::accessibility::XAccessibleContext> mxAccessibleContext
+            Reference<css::accessibility::XAccessibleContext> mxAccessibleContext
             = mpAccessible->getAccessibleContext();
-            com::sun::star::accessibility::XAccessibleContext* mpContext = mxAccessibleContext.get();
+            css::accessibility::XAccessibleContext* mpContext = mxAccessibleContext.get();
             if(mpContext != NULL)
                 AddAllListeners( mpAccessible, pAccessible, pWND);
         }
     }
 }
 
-void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowClosing( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
 {
     SAL_INFO( "iacc2", "windowClosing triggered" );
 }
@@ -195,32 +195,32 @@ void AccTopWindowListener::windowClosing( const ::com::sun::star::lang::EventObj
  *  from current manager's cache, and remove the COM object and the accessible event listener
  *  assigned to the accessible objects.
  */
-void AccTopWindowListener::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException)
 {
     SAL_INFO( "iacc2", "windowClosed triggered" );
 
     if ( !e.Source.is())
         return;
 
-    Reference< com::sun::star::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY );
-    com::sun::star::accessibility::XAccessible* pAccessible = xAccessible.get();
+    Reference< css::accessibility::XAccessible > xAccessible ( e.Source, UNO_QUERY );
+    css::accessibility::XAccessible* pAccessible = xAccessible.get();
     if ( pAccessible == NULL)
         return;
 
-    Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
+    Reference<css::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
     if(!xContext.is())
     {
         return;
     }
-    com::sun::star::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
+    css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get();
 
     short role = -1;
     if(pAccessibleContext != NULL)
     {
         role = pAccessibleContext->getAccessibleRole();
 
-        if (role == com::sun::star::accessibility::AccessibleRole::POPUP_MENU ||
-                role == com::sun::star::accessibility::AccessibleRole::MENU)
+        if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
+                role == css::accessibility::AccessibleRole::MENU)
         {
             accManagerAgent.NotifyAccEvent(UM_EVENT_MENUPOPUPEND, pAccessible);
         }
@@ -228,28 +228,28 @@ void AccTopWindowListener::windowClosed( const ::com::sun::star::lang::EventObje
 
 
     accManagerAgent.DeleteChildrenAccObj( pAccessible );
-    if( role != com::sun::star::accessibility::AccessibleRole::POPUP_MENU )
+    if( role != css::accessibility::AccessibleRole::POPUP_MENU )
         accManagerAgent.DeleteAccObj( pAccessible );
 
 }
 
-void AccTopWindowListener::windowMinimized( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowMinimized( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
 {
 }
 
-void AccTopWindowListener::windowNormalized( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowNormalized( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
 {
 }
 
-void AccTopWindowListener::windowActivated( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowActivated( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
 {
 }
 
-void AccTopWindowListener::windowDeactivated( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::windowDeactivated( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
 {
 }
 
-void AccTopWindowListener::disposing( const ::com::sun::star::lang::EventObject&  ) throw (::com::sun::star::uno::RuntimeException)
+void AccTopWindowListener::disposing( const css::lang::EventObject&  ) throw (css::uno::RuntimeException)
 {
 }
 
diff --git a/winaccessibility/source/service/AccTreeEventListener.cxx b/winaccessibility/source/service/AccTreeEventListener.cxx
index fba5eb6fd5e4..59f80bfce7a1 100644
--- a/winaccessibility/source/service/AccTreeEventListener.cxx
+++ b/winaccessibility/source/service/AccTreeEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccTreeEventListener::AccTreeEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccTreeEventListener::AccTreeEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccDescendantManagerEventListener(pAcc, Agent)
 {}
 AccTreeEventListener::~AccTreeEventListener()
@@ -43,7 +43,7 @@ AccTreeEventListener::~AccTreeEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccTreeEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
+void  AccTreeEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx
index 8e1831375581..c89972031db3 100644
--- a/winaccessibility/source/service/AccWindowEventListener.cxx
+++ b/winaccessibility/source/service/AccWindowEventListener.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::accessibility;
 
-AccWindowEventListener::AccWindowEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
+AccWindowEventListener::AccWindowEventListener(css::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent)
         :AccEventListener(pAcc, Agent)
 {}
 AccWindowEventListener::~AccWindowEventListener()
@@ -43,7 +43,7 @@ AccWindowEventListener::~AccWindowEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject: the event object which contains information about event
  */
-void  AccWindowEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
+void  AccWindowEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index d9bdba053641..b39e8fd23a39 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -115,7 +115,7 @@ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
     if (m_pTopWindowListener.is() && nAcc)
     {
         m_pTopWindowListener->HandleWindowOpened(
-            static_cast<com::sun::star::accessibility::XAccessible*>(
+            static_cast<css::accessibility::XAccessible*>(
                 reinterpret_cast<void*>(nAcc)));
     }
 }
@@ -186,7 +186,7 @@ static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xA
                     }
                 }
             }
-            catch (::com::sun::star::uno::RuntimeException const&)
+            catch (css::uno::RuntimeException const&)
             {
                 // Ignore show events that throw DisposedExceptions in getAccessibleContext(),
                 // but keep revoking these windows in hide(s).