resync to trunk (after accessibility integration)

21 files changed, 304 insertions, 12 deletions

diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 51d0aba81a89..576853840973 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -32,17 +32,28 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <editeng/AccessibleStaticTextBase.hxx>
 #include <comphelper/uno3.hxx>
+//IAccessibility2 Implementation 2009-----
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleExtendedAttributes_HPP_
+#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+#endif
+//-----IAccessibility2 Implementation 2009
 
 class ScTabViewShell;
 class ScAccessibleDocument;
 
+typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleExtendedAttributes>
+                    ScAccessibleCellAttributeImpl;
+
 /** @descr
         This base class provides an implementation of the
         <code>AccessibleCell</code> service.
 */
 class ScAccessibleCell
     :   public  ScAccessibleCellBase,
-        public  accessibility::AccessibleStaticTextBase
+        public  accessibility::AccessibleStaticTextBase,
+//IAccessibility2 Implementation 2009-----
+        public  ScAccessibleCellAttributeImpl
+//-----IAccessibility2 Implementation 2009
 {
 public:
     //=====  internal  ========================================================
@@ -134,6 +145,14 @@ public:
         getSupportedServiceNames(void)
         throw (::com::sun::star::uno::RuntimeException);
 
+//IAccessibility2 Implementation 2009-----
+    virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+
+    // Override this method to handle cell's ParaIndent attribute specially.
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
 private:
     ScTabViewShell* mpViewShell;
     ScAccessibleDocument* mpAccDoc;
@@ -163,6 +182,10 @@ private:
     void AddRelation(const ScRange& rRange,
         const sal_uInt16 aRelationType,
         ::utl::AccessibleRelationSetHelper* pRelationSet);
+//IAccessibility2 Implementation 2009-----
+    sal_Bool IsFormulaMode();
+    sal_Bool IsDropdown();
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index d14f7953b425..d2287f460e63 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -142,6 +142,21 @@ private:
     virtual sal_Bool IsEditable(
         const com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
+//IAccessibility2 Implementation 2009-----
+protected:
+    virtual ::rtl::OUString SAL_CALL GetNote(void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL GetAllDisplayNote(void)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getShadowAttrs(void)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getBorderAttrs(void)
+        throw (::com::sun::star::uno::RuntimeException);
+public:
+    const ScAddress& GetCellAddress() const { return maCellAddress; }
+    sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 35794a608c51..f13c4e3b7762 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -29,7 +29,12 @@
 #include "viewdata.hxx"
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <cppuhelper/implbase2.hxx>
+//IAccessibility2 Implementation 2009-----
+//#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
+//-----IAccessibility2 Implementation 2009
 #include <svx/IAccessibleViewForwarder.hxx>
 
 class ScTabViewShell;
@@ -51,13 +56,19 @@ namespace utl
         <code>AccessibleContext</code> service.
 */
 
-typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleSelection,
+//IAccessibility2 Implementation 2009-----
+typedef cppu::ImplHelper3< ::com::sun::star::accessibility::XAccessibleSelection,
+                            ::com::sun::star::accessibility::XAccessibleExtendedAttributes,
+//-----IAccessibility2 Implementation 2009
                             ::com::sun::star::view::XSelectionChangeListener >
                     ScAccessibleDocumentImpl;
 
 class ScAccessibleDocument
     :   public ScAccessibleDocumentBase,
         public ScAccessibleDocumentImpl,
+//IAccessibility2 Implementation 2009-----
+           public com::sun::star::accessibility::XAccessibleGetAccFlowTo,
+//-----IAccessibility2 Implementation 2009
         public accessibility::IAccessibleViewForwarder
 {
 public:
@@ -124,6 +135,14 @@ public:
         getAccessibleStateSet(void)
         throw (::com::sun::star::uno::RuntimeException);
 
+//IAccessibility2 Implementation 2009-----
+    virtual ::rtl::OUString SAL_CALL
+        getAccessibleName(void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+//-----IAccessibility2 Implementation 2009
     ///=====  XAccessibleSelection  ===========================================
 
     virtual void SAL_CALL
@@ -318,6 +337,24 @@ private:
     rtl::OUString GetCurrentCellDescription() const;
 
     Rectangle GetVisibleArea_Impl() const;
+//IAccessibility2 Implementation 2009-----
+    com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence();
+public:
+    ScDocument *GetDocument() const ;
+    ScAddress   GetCurCellAddress() const;
+    //=====  XAccessibleGetAccFromXShape  ============================================
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+        SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+     virtual sal_Int32 SAL_CALL getForeground(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getBackground(  )
+        throw (::com::sun::star::uno::RuntimeException);
+protected:
+    void SwitchViewFireFocus();
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx
index 9ffe9c0e7b66..11c8feda9490 100644
--- a/sc/source/ui/inc/AccessibleDocumentBase.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx
@@ -37,6 +37,9 @@ public:
     ScAccessibleDocumentBase(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>& rxParent);
+//IAccessibility2 Implementation 2009-----
+    virtual void SwitchViewFireFocus();
+//-----IAccessibility2 Implementation 2009
 protected:
     virtual ~ScAccessibleDocumentBase   (void);
 };
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 2f4a2657321c..8adb777991be 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -85,6 +85,10 @@ public:
         getAccessibleStateSet(void)
         throw (::com::sun::star::uno::RuntimeException);
 
+//IAccessibility2 Implementation 2009-----
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(void)
+        throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 35f7af068ad3..34faf108cc91 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -27,6 +27,10 @@
 
 #include "AccessibleContextBase.hxx"
 
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include "global.hxx"
+//-----IAccessibility2 Implementation 2009
 namespace accessibility
 {
     class AccessibleTextHelper;
@@ -46,7 +50,10 @@ enum EditObjectType
         <code>AccessibleCell</code> service.
 */
 class ScAccessibleEditObject
-    :   public  ScAccessibleContextBase
+    :   public  ScAccessibleContextBase,
+//IAccessibility2 Implementation 2009-----
+        public ::com::sun::star::accessibility::XAccessibleSelection
+//-----IAccessibility2 Implementation 2009
 {
 public:
     //=====  internal  ========================================================
@@ -71,7 +78,17 @@ public:
     virtual void LostFocus();
 
     virtual void GotFocus();
+//IAccessibility2 Implementation 2009-----
+///=====  XInterface  =====================================================
 
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+        ::com::sun::star::uno::Type const & rType )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL acquire() throw ();
+
+    virtual void SAL_CALL release() throw ();
+//-----IAccessibility2 Implementation 2009
     ///=====  XAccessibleComponent  ============================================
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
@@ -110,6 +127,32 @@ public:
         getAccessibleStateSet(void)
         throw (::com::sun::star::uno::RuntimeException);
 
+    //=====  XAccessibleSelection  ============================================
+
+        virtual void SAL_CALL selectAccessibleChild(
+            sal_Int32 nChildIndex )
+            throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+            ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected(
+            sal_Int32 nChildIndex )
+            throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+            ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL clearAccessibleSelection(  )
+            throw ( ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL selectAllAccessibleChildren(  )
+            throw ( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
+            throw ( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
+            sal_Int32 nSelectedChildIndex )
+            throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+            ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL deselectAccessibleChild(
+            sal_Int32 nSelectedChildIndex )
+            throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+            ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+//-----IAccessibility2 Implementation 2009
 protected:
     /// Return this object's description.
     virtual ::rtl::OUString SAL_CALL
@@ -168,6 +211,20 @@ private:
         ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
 
     void CreateTextHelper();
+//IAccessibility2 Implementation 2009-----
+    ScDocument *m_pScDoc;
+    ScAddress m_curCellAddress;
+
+
+    ///=====  XAccessibleComponent  ============================================
+    virtual sal_Int32 SAL_CALL getForeground(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Int32 SAL_CALL getBackground(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    sal_Int32 GetFgBgColor(  const rtl::OUString &strPropColor) ;
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 170af5477490..f3dc86a655b6 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -30,6 +30,10 @@
 
 #include <vector>
 
+//IAccessibility2 Implementation 2009-----
+#include "rangelst.hxx"
+#include <map>
+//-----IAccessibility2 Implementation 2009
 class ScMyAddress : public ScAddress
 {
 public:
@@ -239,6 +243,17 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::accessibility::XAccessibleEventListener>& xListener)
         throw (com::sun::star::uno::RuntimeException);
+//IAccessibility2 Implementation 2009-----
+    //=====  XAccessibleTableSelection  ============================================
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+//-----IAccessibility2 Implementation 2009
 
 protected:
     /// Return the object's current bounding box relative to the desktop.
@@ -279,6 +294,55 @@ private:
     ScDocument* GetDocument(ScTabViewShell* pViewShell);
     Rectangle   GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos);
     Rectangle   GetVisCells(const Rectangle& rVisArea);
+//IAccessibility2 Implementation 2009-----
+    //void CreateSortedMarkedCells();
+    //void AddMarkedRange(const ScRange& rRange);
+    typedef std::vector<ScMyAddress> VEC_MYADDR;
+
+    typedef std::map<ScMyAddress,com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > >
+        MAP_ADDR_XACC;
+    MAP_ADDR_XACC m_mapSelectionSend;
+    void RemoveSelection(ScMarkData &refScMarkData);
+    sal_Bool IsSameMarkCell();
+    void CommitFocusCell(const ScAddress &aNewCell);
+public:
+    void FireFirstCellFocus();
+private:
+    sal_Bool m_bFormulaMode;
+    sal_Bool m_bFormulaLastMode;
+    ScAddress m_aFormulaActiveCell;
+    MAP_ADDR_XACC m_mapFormulaSelectionSend;
+    VEC_MYADDR m_vecFormulaLastMyAddr;
+    ScAccessibleCell*   m_pAccFormulaCell;
+    sal_uInt16 m_nMinX;
+    sal_uInt16 m_nMaxX;
+    sal_Int32 m_nMinY;
+    sal_Int32 m_nMaxY;
+    sal_Int32 GetRowAll() const { return m_nMaxY - m_nMinY + 1 ; }
+    sal_uInt16  GetColAll() const { return m_nMaxX - m_nMinX + 1; }
+    void NotifyRefMode();
+    void RemoveFormulaSelection(sal_Bool bRemoveAll =sal_False);
+    sal_Bool CheckChildIndex(sal_Int32)const ;
+    ScAddress GetChildIndexAddress(sal_Int32) const;
+    sal_Int32 GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn );
+    sal_Bool GetFormulaCurrentFocusCell(ScAddress &addr);
+public:
+    sal_Bool IsScAddrFormulaSel (const ScAddress &addr) const ;
+    sal_Bool IsFormulaMode() ;
+    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > GetActiveCell();
+    ScRange m_aLastWithInMarkRange;
+    String m_strCurCellValue;
+    ScRangeList m_LastMarkedRanges;
+    typedef std::vector<ScRange*> VEC_RANGE;
+    VEC_RANGE m_vecTempRange;
+    typedef std::pair<sal_uInt16,sal_uInt16> PAIR_COL;
+    typedef std::vector<PAIR_COL> VEC_COL;
+    VEC_COL m_vecTempCol;
+    ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex);
+    sal_Bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize);
+    sal_Bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet);
+    String m_strOldTabName;
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index dc303ed50cd6..a6f4f080d956 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -30,6 +30,9 @@
 #include "address.hxx"
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+//IAccessibility2 Implementation 2009-----
+#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
+//-----IAccessibility2 Implementation 2009
 #include <cppuhelper/implbase2.hxx>
 
 class ScTabViewShell;
@@ -45,6 +48,9 @@ typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleTable,
 
 class ScAccessibleTableBase :
             public ScAccessibleContextBase,
+//IAccessibility2 Implementation 2009-----
+            public   ::com::sun::star::accessibility::XAccessibleTableSelection,
+//-----IAccessibility2 Implementation 2009
             public ScAccessibleTableBaseImpl
 {
 public:
@@ -199,6 +205,16 @@ public:
         getAccessibleChild(sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException,
                 ::com::sun::star::lang::IndexOutOfBoundsException);
+//IAccessibility2 Implementation 2009-----
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
+//-----IAccessibility2 Implementation 2009
 
 protected:
     /// Return this object's description.
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index b33f00b90921..9664a6d84688 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -132,7 +132,11 @@ private:
 class ScAccessibleEditObjectTextData : public ScAccessibleTextData
 {
 public:
-                        ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin);
+//IAccessibility2 Implementation 2009-----
+    // Solution: Add a para to indicate whether the object is cloned
+                        //ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin);
+                        ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone=sal_False);
+//-----IAccessibility2 Implementation 2009
     virtual             ~ScAccessibleEditObjectTextData();
 
     virtual ScAccessibleTextData* Clone() const;
@@ -155,6 +159,9 @@ protected:
     EditEngine* mpEditEngine;
     SvxEditEngineForwarder* mpForwarder;
     Window* mpWindow;
+//IAccessibility2 Implementation 2009-----
+    sal_Bool mbIsCloned;
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index aafd55717cc6..88d65e1121f6 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -34,6 +34,9 @@ class ScNavigatorSettings;
 class ScDocument;
 class ScDocShell;
 class ScAreaLink;
+//IAccessibility2 Implementation 2009-----
+class SdrPage;
+//-----IAccessibility2 Implementation 2009
 
 #define SC_CONTENT_ROOT         0
 #define SC_CONTENT_TABLE        1
@@ -64,6 +67,10 @@ class ScContentTree : public SvTreeListBox
     String              aHiddenName;        // URL zum Laden
     String              aHiddenTitle;       // fuer Anzeige
     ScDocument*         pHiddenDocument;    // temporaer
+//IAccessibility2 Implementation 2009-----
+    sal_Bool                           bisInNavigatoeDlg;
+    String              sKeyString;
+//-----IAccessibility2 Implementation 2009
 
     sal_uInt16              pPosList[SC_CONTENT_COUNT];     // fuer die Reihenfolge
 
@@ -112,7 +119,12 @@ class ScContentTree : public SvTreeListBox
 
     DECL_LINK( ContentDoubleClickHdl, ScContentTree* );
     DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* );
+//IAccessibility2 Implementation 2009-----
+public:
+    SvLBoxEntry* pTmpEntry;
 
+    bool m_bFirstPaint;
+//-----IAccessibility2 Implementation 2009
 protected:
 //  virtual sal_Bool    Drop( const DropEvent& rEvt );
 //  virtual sal_Bool    QueryDrop( DropEvent& rEvt );
@@ -126,11 +138,21 @@ protected:
 
     virtual void    Command( const CommandEvent& rCEvt );
     virtual void    RequestHelp( const HelpEvent& rHEvt );
-
+//IAccessibility2 Implementation 2009-----
+    virtual void    InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&, SvLBoxButtonKind);
+//-----IAccessibility2 Implementation 2009
 public:
             ScContentTree( Window* pParent, const ResId& rResId );
             ~ScContentTree();
 
+//IAccessibility2 Implementation 2009-----
+    String          getAltLongDescText( SvLBoxEntry* pEntry , sal_Bool isAltText) const;
+    String          GetEntryAltText( SvLBoxEntry* pEntry ) const;
+    String          GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
+
+    void     ObjectFresh( sal_uInt16 nType,SvLBoxEntry* pEntry = NULL);
+    sal_Bool     SetNavigatorDlgFlag(sal_Bool isInNavigatoeDlg){ return bisInNavigatoeDlg=isInNavigatoeDlg;};
+//-----IAccessibility2 Implementation 2009
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual void    KeyInput( const KeyEvent& rKEvt );
 
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index 680804ce40e2..3ee3dae45fd8 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -100,6 +100,10 @@ private:
     ScDBCollection  aLocalDbCol;
     ScRange         theCurArea;
     List            aRemoveList;
+    //IAccessibility2 Implementation 2009-----
+    Timer       SynFocusTimer;
+    DECL_LINK( FocusToComoboxHdl, Timer* );
+    //-----IAccessibility2 Implementation 2009
 
 #ifdef _DBNAMDLG_CXX
 private:
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 2d549f767703..e2d8769f3286 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -404,6 +404,14 @@ public:
 
     const ScOptSolverSave* GetSolverSaveData() const    { return pSolverSaveData; }     // may be null
     void            SetSolverSaveData( const ScOptSolverSave& rData );
+
+//IAccessibility2 Implementation 2009-----
+    virtual void setDocAccTitle( const String& rTitle ) { aDocument.setDocAccTitle( rTitle ); }
+    virtual const String getDocAccTitle() const { return aDocument.getDocAccTitle(); }
+    void setDocReadOnly( sal_Bool b){ aDocument.setDocReadOnly(b);}
+    sal_Bool getDocReadOnly() const { return aDocument.getDocReadOnly(); }
+//-----IAccessibility2 Implementation 2009
+
     //<!--Added by PengYunQuan for Validity Cell Range Picker
     sal_Bool        AcceptStateUpdate() const;
     //-->Added by PengYunQuan for Validity Cell Range Picker
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 1759e6c8e7e6..caf61e219fd0 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -151,6 +151,10 @@ public:
     SdrEndTextEditKind  ScEndTextEdit();    // ruft SetDrawTextUndo(0)
 //UNUSED2009-05 void                    CaptionTextDirection(sal_uInt16 nSlot);
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
+//IAccessibility2 Implementation 2009-----
+    SdrObject*  GetObjectByName(const String& rName);
+    sal_Bool           SelectCurrentViewObject( const String& rName );
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 127f72b73e26..d7077fb0f991 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -239,7 +239,9 @@ private:
     void            ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const String& rStr );
 
     sal_Bool            HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
-
+//IAccessibility2 Implementation 2009-----
+    sal_Bool            HasScenarioRange( sal_uInt16 nCol, sal_Int32 nRow, ScRange& rScenRange );
+//-----IAccessibility2 Implementation 2009
     sal_Bool            DropScroll( const Point& rMousePos );
 
     sal_Int8        AcceptPrivateDrop( const AcceptDropEvent& rEvt );
@@ -388,6 +390,9 @@ public:
     void            DoInvertRect( const Rectangle& rPixel );
 
     void            CheckNeedsRepaint();
+//IAccessibility2 Implementation 2009-----
+    virtual void SwitchView();
+//-----IAccessibility2 Implementation 2009
 
     void            UpdateDPFromFieldPopupMenu();
 
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 4788dde2115f..bb469189161e 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -158,6 +158,9 @@ public:
     static void StaticInvalidate();
 
     FmFormView* GetDrawView() { return pDrawView; }
+//IAccessibility2 Implementation 2009-----
+    virtual void SwitchView();
+//-----IAccessibility2 Implementation 2009
 };
 
 
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 7770b27eec0f..a297bab5d356 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -91,6 +91,9 @@ private:
 
     sal_uInt16          nWhich;
     String          aCmdArr[6];
+    //IAccessibility2 Implementation 2009-----
+    DECL_LINK( ObjectSelectHdl, ScEditWindow* );
+    //-----IAccessibility2 Implementation 2009
 
 private:
 #ifdef _TPHFEDIT_CXX
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index d1b6c3017fbe..2efdcb0a0404 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -471,7 +471,7 @@ public:
                                 sal_Bool bCols = sal_False, sal_Bool bRows = sal_False, sal_Bool bCellSelection = sal_False );
     void            InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
                                     sal_Bool bTestNeg = sal_False,
-                                    sal_Bool bCols = sal_False, sal_Bool bRows = sal_False );
+                                    sal_Bool bCols = sal_False, sal_Bool bRows = sal_False, sal_Bool bForceNeg = sal_False );
     void            InitOwnBlockMode();
     void            DoneBlockMode( sal_Bool bContinue = sal_False );
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 4fc864018956..e93b6d55369c 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -161,7 +161,9 @@ private:
     sal_Bool                    bPrintSelected;             // for result of SvxPrtQryBox
 
     sal_Bool                    bReadOnly;                  // um Status-Aenderungen zu erkennen
-
+//IAccessibility2 Implementation 2009-----
+    sal_Bool                    bIsActive;
+//-----IAccessibility2 Implementation 2009
     SbxObject*              pScSbxObject;
 
 //UNUSED2008-05  sal_Bool                    bChartDlgIsEdit;            // Datenbereich aendern
@@ -421,6 +423,11 @@ public:
     bool    ExecuteRetypePassDlg(ScPasswordHash eDesiredHash);
 
     using ScTabView::ShowCursor;
+//IAccessibility2 Implementation 2009-----
+    sal_Bool IsActive(){ return bIsActive; }
+    rtl::OUString GetFormula(ScAddress& rAddress);
+    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & GetForms() const;
+//-----IAccessibility2 Implementation 2009
 };
 
 //==================================================================
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 8fe160f4f8e2..8a87b5252bed 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -78,6 +78,9 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
     inline ScHeaderEditEngine*  GetEditEngine() const {return pEdEngine;}
+    //IAccessibility2 Implementation 2009-----
+    void            SetObjectSelectHdl( const Link& aLink){ aObjectSelectLink = aLink; };
+    //-----IAccessibility2 Implementation 2009
 protected:
     virtual void    Paint( const Rectangle& rRec );
     virtual void    MouseMove( const MouseEvent& rMEvt );
@@ -96,6 +99,11 @@ private:
 
     com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > xAcc;
     ScAccessibleEditObject* pAcc;
+
+    //IAccessibility2 Implementation 2009-----
+    Link                aObjectSelectLink;
+    //-----IAccessibility2 Implementation 2009
+
 };
 
 //===================================================================
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 21f4652fdda5..1d0fc5e2af36 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -93,9 +93,8 @@ class ScValidationDlg :public ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false
     //<!--Added by PengYunQuan for Validity Cell Range Picker
     typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase;
 
-    //Start_Moddify by liliang 03/26/2008 SODC_13677_2
     DECL_LINK( OkHdl, Button * );
-    //End_Moddify by liliang 03/26/2008 SODC_13677_2
+
     bool    m_bOwnRefHdlr:1;
 
     ScTabViewShell *m_pTabVwSh;
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 3f2d1f9b0867..262f16e4c551 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -251,8 +251,11 @@ public:
     ScAutoFormatData* CreateAutoFormatData();
     void            AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord = sal_True );
 
-    void            SearchAndReplace( const SvxSearchItem* pSearchItem,
+//IAccessibility2 Implementation 2009-----
+//  void            SearchAndReplace( const SvxSearchItem* pSearchItem,
+    sal_Bool            SearchAndReplace( const SvxSearchItem* pSearchItem,
                                         sal_Bool bAddUndo, sal_Bool bIsApi );
+//-----IAccessibility2 Implementation 2009
 
     void            Solve( const ScSolveParam& rParam );
     void            TabOp( const ScTabOpParam& rParam,  sal_Bool bRecord = sal_True );