CWS-TOOLING: integrate CWS gridcontrol04

4 files changed, 10 insertions, 2 deletions

diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 198a24b8eb62..8ff17a2b71c7 100755
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -124,7 +124,7 @@ public:
     virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
     virtual std::vector<sal_Int32>& GetSelectedRows() = 0;
     virtual void RemoveSelectedRow(sal_Int32 _nRowPos) = 0;
-    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) = 0;
+    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/svtools/inc/svtools/table/abstracttablecontrol.hxx b/svtools/inc/svtools/table/abstracttablecontrol.hxx
index 2b3951f6aaf3..9206f20ecbcb 100644
--- a/svtools/inc/svtools/table/abstracttablecontrol.hxx
+++ b/svtools/inc/svtools/table/abstracttablecontrol.hxx
@@ -116,6 +116,7 @@ namespace svt { namespace table
     /** returns selection engine*/
     virtual SelectionEngine* getSelEngine() = 0;
     virtual void setCursorAtCurrentCell(const Point& rPoint) = 0;
+    virtual bool isTooltipActive() = 0;
     virtual rtl::OUString& setTooltip(const Point& rPoint ) = 0;
     virtual RowPos getCurrentRow(const Point& rPoint ) = 0;
     virtual void resizeColumn(const Point& rPoint ) = 0;
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index 6eb7f063f9fa..f3b7ed88b565 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -79,6 +79,7 @@ namespace svt { namespace table
         ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aText;
         Link m_aSelectHdl;
         bool m_bSelectionChanged;
+        bool m_bTooltip;
     public:
         ::std::auto_ptr< AccessibleTableControl_Impl > m_pAccessTable;
 
@@ -217,12 +218,13 @@ namespace svt { namespace table
     virtual sal_Bool isAccessibleAlive( ) const;
     virtual void commitGridControlEvent( sal_Int16 _nEventId, const com::sun::star::uno::Any& _rNewValue, const com::sun::star::uno::Any& _rOldValue );
     virtual void RemoveSelectedRow(RowPos _nRowPos);
-    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos);
+    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
     ::com::sun::star::uno::Sequence< sal_Int32 >& getColumnsForTooltip();
     ::com::sun::star::uno::Sequence< ::rtl::OUString >& getTextForTooltip();
     void setTooltip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aText, const ::com::sun::star::uno::Sequence< sal_Int32 >& nCols);
     void clearSelection();
     void selectionChanged(bool _bChanged);
+    bool isTooltip();
 
     protected:
     /// retrieves the XAccessible implementation associated with the GridControl instance
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx
index c9f96483d943..9a6ece489119 100644
--- a/svtools/inc/svtools/table/tabledatawindow.hxx
+++ b/svtools/inc/svtools/table/tabledatawindow.hxx
@@ -74,6 +74,11 @@ namespace svt { namespace table
         virtual void        CaptureMouse();
         virtual void        ReleaseMouse();
         virtual long        Notify(NotifyEvent& rNEvt);
+        virtual void        SetControlBackground(const Color& rColor);
+        virtual void        SetControlBackground();
+
+        void                SetBackground(const Wallpaper& rColor);
+        void                SetBackground();
     };
 //........................................................................
 } } // namespace svt::table