Integrate branch of IAccessible2

Conflicts:
everything

Change-Id: I9619634ee1e60d449025c006803da29c1e9d14b3

7 files changed, 32 insertions, 9 deletions

diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index 83c2a605b56a..7ea8b42e1814 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.hxx
@@ -73,7 +73,10 @@ class SwOLENames : public Resource
 public:
     SwOLENames(const ResId& rResId) :
         Resource(rResId),
-        aNamesAry(ResId(1,*rResId.GetResMgr())){FreeResource();}
+        aNamesAry(ResId(1,*rResId.GetResMgr()))
+    {
+        FreeResource();
+    }
 
     ResStringArray&     GetNames() { return aNamesAry;}
 
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index b10f5eb6439f..3029f69444dd 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -34,7 +34,7 @@ class ToolBox;
 class SwGlblDocContents;
 class SwGlblDocContent;
 class SfxObjectShell;
-
+class SdrObject;
 
 #define EDIT_MODE_EDIT          0
 #define EDIT_MODE_UPD_IDX       1
@@ -91,6 +91,9 @@ class SwContentTree : public SvTreeListBox
 
     static bool         bIsInDrag;
 
+    bool                bIsKeySpace;
+    Rectangle           oldRectangle;
+
     void                FindActiveTypeAndRemoveUserData();
 
     using SvTreeListBox::ExecuteDrop;
@@ -144,6 +147,9 @@ protected:
 public:
     SwContentTree(Window* pParent, const ResId& rResId);
     ~SwContentTree();
+    OUString        GetEntryAltText( SvTreeListEntry* pEntry ) const;
+    OUString        GetEntryLongDescription( SvTreeListEntry* pEntry ) const;
+    SdrObject*      GetDrawingObjectsByContent(const SwContent *pCnt);
 
     bool            ToggleToRoot();
     bool            IsRoot() const {return bIsRoot;}
@@ -195,6 +201,7 @@ public:
     virtual void    KeyInput(const KeyEvent& rKEvt);
 
     virtual sal_Bool    Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
+    virtual sal_Int32  GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const;
 };
 
 
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 15b4e540f893..934c3f7aedd4 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -297,6 +297,7 @@ public:
 
     SwEditWin(Window *pParent, SwView &);
     virtual ~SwEditWin();
+    virtual void SwitchView();
 };
 
 #endif
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 5128f3fad9a5..dd4f519cef0d 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -140,6 +140,7 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>
                     CreateAccessible();
+    virtual void SwitchView();
 };
 
 /**
@@ -149,7 +150,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
 {
     // ViewWindow and handle to core
     // current dispatcher shell
-    SwPagePreviewWin        aViewWin;
+    SwPagePreviewWin*        pViewWin;
     //viewdata of the previous SwView and the new crsrposition
     OUString                sSwViewData;
     //and the new cursor position if the user double click in the PagePreview
@@ -221,11 +222,11 @@ public:
     TYPEINFO();
 
     inline Window*          GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); }
-    inline SwViewShell*       GetViewShell() const { return aViewWin.GetViewShell(); }
+    inline SwViewShell*       GetViewShell() const { return pViewWin->GetViewShell(); }
     inline const Rectangle& GetVisArea() const { return aVisArea; }
-    inline void             GrabFocusViewWin() { aViewWin.GrabFocus(); }
+    inline void             GrabFocusViewWin() { pViewWin->GrabFocus(); }
     inline void             RepaintCoreRect( const SwRect& rRect )
-                                { aViewWin.RepaintCoreRect( rRect ); }
+                                { pViewWin->RepaintCoreRect( rRect ); }
 
     void            DocSzChgd(const Size& rNewSize);
     const Size&     GetDocSz() const { return aDocSz; }
@@ -241,8 +242,8 @@ public:
     void            EnableHScrollbar(bool bEnable);
     void            EnableVScrollbar(bool bEnable);
 
-    sal_uInt16          GetPageCount() const        { return mnPageCount; }
-    sal_uInt16      GetSelectedPage() const {return aViewWin.SelectedPage();}
+    sal_uInt16      GetPageCount() const        { return mnPageCount; }
+    sal_uInt16      GetSelectedPage() const {return pViewWin->SelectedPage();}
 
     sal_Bool            HandleWheelCommands( const CommandEvent& );
 
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 073c1237ee03..3f2cfbf69213 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -79,7 +79,6 @@ public:
 
     sal_uInt16                  GetRemovedCount() const;
     const SwBoxEntry&       GetRemovedEntry(sal_uInt16 nPos) const;
-
 };
 
 #endif // INCLUDED_SW_SOURCE_UI_INC_SWLBOX_HXX
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 17fd68287071..3b1a0f25a4db 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -259,6 +259,10 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer
     Link            aButtonSelectedHdl;
     Control*        pActiveCtrl;
     Link            aModifyHdl;
+    OUString        accessibleName;
+    OUString        sAdditionalAccnameString1;
+    OUString        sAdditionalAccnameString2;
+    OUString        sAdditionalAccnameString3;
 
     SwTOXEntryTabPage*  m_pParent;
 
@@ -312,6 +316,9 @@ public:
 
     virtual void    GetFocus();
     virtual void    setAllocation(const Size &rAllocation);
+    void SetFocus2theAllBtn();
+private:
+    sal_uInt32 GetControlIndex(FormTokenType eType) const;
 };
 
 class SwTOXEntryTabPage;
@@ -440,6 +447,8 @@ public:
     OUString            GetLevelHelp(sal_uInt16 nLevel) const;
 
     void                PreTokenButtonRemoved(const SwFormToken& rToken);
+    void SetFocus2theAllBtn();
+    virtual long Notify( NotifyEvent& rNEvt );
 };
 
 class SwTOXStylesTabPage : public SfxTabPage
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 3cdd59c63615..597468989adc 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -182,6 +182,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     // to support keyboard the number of the page to go to can be set too
     sal_uInt16              m_nNewPage;
 
+    sal_uInt16          m_nOldPageNum;
+    OUString            m_sOldSectionName;
+
     Point               m_aTabColFromDocPos;  // moving table colmns out of the document
     SwTxtNode           * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#