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