Integrate branch of IAccessible2

Conflicts:
everything

Change-Id: I3d8cf956f511a0d953a1cefe83b6ef987806da25

5 files changed, 43 insertions, 1 deletions

diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 5fdb50b8109c..8f83d0650f51 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -25,9 +25,10 @@
 #include <set>
 #include <stack>
 
+#include <tools/color.hxx>
 #include <tools/datetime.hxx>
+#include <tools/link.hxx>
 #include <tools/mempool.hxx>
-#include "tools/link.hxx"
 #include <unotools/options.hxx>
 #include "global.hxx"
 #include "bigrange.hxx"
@@ -37,6 +38,26 @@
 
 class ScDocument;
 class ScFormulaCell;
+class ScChangeAction;
+class ScChangeTrack;
+class ScAppOptions;
+
+class ScActionColorChanger
+{
+private:
+    const ScAppOptions&     rOpt;
+    const std::set<OUString>& rUsers;
+    OUString                aLastUserName;
+    sal_uInt16              nLastUserIndex;
+    ColorData               nColor;
+
+
+public:
+    ScActionColorChanger( const ScChangeTrack& rTrack );
+    ~ScActionColorChanger() {}
+    void        Update( const ScChangeAction& rAction );
+    ColorData   GetColor() const    { return nColor; }
+};
 
 enum ScChangeActionType
 {
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 7b6f75c8fdf1..4091162b93b0 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -153,6 +153,7 @@ public:
     static ColorData GetCommentColor();
     static void InitializeColors();
     static sal_Bool IsColorsInitialized();
+    static void AppendChangTrackNoteSeparator(OUString &str);
 };
 
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e283b3d2f8c3..7a00c1d358a9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -237,6 +237,7 @@ friend class ScQueryCellIterator;
 friend class ScHorizontalCellIterator;
 friend class ScHorizontalAttrIterator;
 friend class ScDocAttrIterator;
+friend class ScAccessibleTableBase;
 friend class ScAttrRectIterator;
 friend class ScDocShell;
 friend class ScDocRowHeightUpdater;
@@ -438,7 +439,20 @@ private:
 
     bool                mbUseEmbedFonts;
 
+    OUString msDocAccTitle;
+
+public:
+    void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
+    const OUString getDocAccTitle() const { return msDocAccTitle; }
+
+private:
+    bool mbReadOnly;
+
 public:
+    void setDocReadOnly(bool b){ mbReadOnly = b; }
+    bool getDocReadOnly() const { return mbReadOnly; }
+    sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
+    void GetCellChangeTrackNote(const ScAddress &cell, OUString &strTrackText, sal_Bool &pbLeftEdge);
     bool              IsUsingEmbededFonts() { return mbUseEmbedFonts; }
     void              SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts = bUse; }
     SC_DLLPUBLIC sal_uLong          GetCellCount() const;       // all cells
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index a7cda389b015..095a27b4f851 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -197,6 +197,9 @@ public:
 
     static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = false );
 
+    virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
+    virtual sal_Int32 GetHyperlinkCount(SdrObject* pObj);
+
 private:
     static SfxObjectShell* pGlobalDrawPersist;          // for AllocModel
 public:
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e273da83e4c3..f29e7f9aa94f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1067,6 +1067,9 @@ private:
         SCROW mnCurRow;
         SCROW mnUBound;
     };
+
+public :
+    ScColumn* GetColumnByIndex(sal_Int32 index);
 };