gridsort: don't decide in the TableControl whether a cell content is a image or a string-convertible - this is

the renderer's task in the original design.

1 files changed, 18 insertions, 10 deletions

diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx
index 01a2e308f3c0..01492ae26fc4 100644
--- a/svtools/inc/svtools/table/gridtablerenderer.hxx
+++ b/svtools/inc/svtools/table/gridtablerenderer.hxx
@@ -43,9 +43,6 @@ namespace svt { namespace table
 
         This class is able to paint a table grid, table headers, and cell
         backgrounds according to the selected/active state of cells.
-
-        TODO update the documentation when it's decided whether this renderer
-        also does value handling
     */
     class GridTableRenderer : public ITableRenderer
     {
@@ -74,7 +71,7 @@ namespace svt { namespace table
         */
         RowPos  getCurrentRow();
 
-    protected:
+    public:
         // ITableRenderer overridables
         virtual void    PaintHeaderArea(
                             OutputDevice& _rDevice, const Rectangle& _rArea,
@@ -91,16 +88,27 @@ namespace svt { namespace table
                             bool _bActive, bool _bSelected,
                             OutputDevice& _rDevice, const Rectangle& _rArea,
                             const StyleSettings& _rStyle );
-        virtual void    PaintCellImage( ColPos _nColumn,
-                            bool _bActive, bool _bSelected,
-                            OutputDevice& _rDevice, const Rectangle& _rArea,
-                const StyleSettings& _rStyle, Image* _pCellData );
-        virtual void    PaintCellString( ColPos _nColumn,
+        virtual void    PaintCell( ColPos const i_col,
                             bool _bActive, bool _bSelected,
                             OutputDevice& _rDevice, const Rectangle& _rArea,
-                            const StyleSettings& _rStyle, rtl::OUString& _rText );
+                            const StyleSettings& _rStyle );
         virtual void    ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect);
         virtual void    HideCellCursor( Window& _rView, const Rectangle& _rCursorRect);
+
+    private:
+        struct CellRenderContext;
+
+        void    impl_paintCellContent(
+                        CellRenderContext const & i_context
+                   );
+        void    impl_paintCellImage(
+                        CellRenderContext const & i_context,
+                        Image const & i_image
+                   );
+        void    impl_paintCellText(
+                        CellRenderContext const & i_context,
+                        ::rtl::OUString const & i_text
+                   );
     };
 //........................................................................
 } } // namespace svt::table