vcl: reorganize accessibility functions in window.hxx

Change-Id: I25bd1368c17bcdbd642d60b056584243cd429cc0

include/vcl/window.hxx

@@ -592,13 +592,6 @@ private:
 
     SAL_DLLPRIVATE void                 ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY );
 
-    SAL_DLLPRIVATE bool                 ImplIsAccessibleCandidate() const;
-    SAL_DLLPRIVATE bool                 ImplIsAccessibleNativeFrame() const;
-    SAL_DLLPRIVATE sal_uInt16           ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const;
-    SAL_DLLPRIVATE Window*              ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const;
-    SAL_DLLPRIVATE bool                 ImplRegisterAccessibleNativeFrame();
-    SAL_DLLPRIVATE void                 ImplRevokeAccessibleNativeFrame();
-
     SAL_DLLPRIVATE Rectangle            ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const;
     SAL_DLLPRIVATE long                 ImplGetUnmirroredOutOffX();
 
@@ -646,16 +639,6 @@ protected:
     // FIXME: this is a hack to workaround missing layout functionality
     SAL_DLLPRIVATE void                 ImplAdjustNWFSizes();
 
-    // These eventually are supposed to go when everything is converted to .ui
-    SAL_DLLPRIVATE Window*              getLegacyNonLayoutAccessibleRelationMemberOf() const;
-    SAL_DLLPRIVATE Window*              getLegacyNonLayoutAccessibleRelationLabeledBy() const;
-    SAL_DLLPRIVATE Window*              getLegacyNonLayoutAccessibleRelationLabelFor() const;
-
-    // Let Label override the code part of GetAccessibleRelationLabelFor
-    virtual Window*                     getAccessibleRelationLabelFor() const;
-    virtual sal_uInt16                  getDefaultAccessibleRole() const;
-    virtual OUString                    getDefaultAccessibleName() const;
-
     virtual void                        CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags) SAL_OVERRIDE;
     virtual void                        ClipToPaintRegion( Rectangle& rDstRect ) SAL_OVERRIDE;
     virtual bool                        UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
@@ -1085,7 +1068,11 @@ public:
 
     virtual void                        SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace );
 
-    // Accessibility
+    /** @name Accessibility
+     */
+    ///@{
+public:
+
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
                                         GetAccessible( bool bCreate = true );
 
@@ -1122,6 +1109,34 @@ public:
     bool                                IsAccessibilityEventsSuppressed( bool bTraverseParentPath = true );
     void                                SetAccessibilityEventsSuppressed(bool bSuppressed);
 
+    // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys
+    virtual Window*                     GetParentLabelFor( const Window* pLabel ) const;
+    virtual Window*                     GetParentLabeledBy( const Window* pLabeled ) const;
+    KeyEvent                            GetActivationKey() const;
+
+protected:
+
+    // These eventually are supposed to go when everything is converted to .ui
+    SAL_DLLPRIVATE Window*              getLegacyNonLayoutAccessibleRelationMemberOf() const;
+    SAL_DLLPRIVATE Window*              getLegacyNonLayoutAccessibleRelationLabeledBy() const;
+    SAL_DLLPRIVATE Window*              getLegacyNonLayoutAccessibleRelationLabelFor() const;
+
+    // Let Label override the code part of GetAccessibleRelationLabelFor
+    virtual Window*                     getAccessibleRelationLabelFor() const;
+    virtual sal_uInt16                  getDefaultAccessibleRole() const;
+    virtual OUString                    getDefaultAccessibleName() const;
+
+private:
+
+    SAL_DLLPRIVATE bool                 ImplIsAccessibleCandidate() const;
+    SAL_DLLPRIVATE bool                 ImplIsAccessibleNativeFrame() const;
+    SAL_DLLPRIVATE sal_uInt16           ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const;
+    SAL_DLLPRIVATE Window*              ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const;
+    SAL_DLLPRIVATE bool                 ImplRegisterAccessibleNativeFrame();
+    SAL_DLLPRIVATE void                 ImplRevokeAccessibleNativeFrame();
+    ///@}
+
+public:
     /// request XCanvas render interface for this window
     ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >
                                         GetCanvas() const;
@@ -1142,11 +1157,6 @@ public:
     bool                                IsCreatedWithToolkit() const;
     void                                SetCreatedWithToolkit( bool b );
 
-            // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys
-    virtual Window*                     GetParentLabelFor( const Window* pLabel ) const;
-    virtual Window*                     GetParentLabeledBy( const Window* pLabeled ) const;
-    KeyEvent                            GetActivationKey() const;
-
     // Drag and Drop interfaces
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget();
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource();