use JsonWriter for the rest of ITiledRenderable

and fix bug in buffer reallacotion where mPos pointing
at the beginning of the new buffer instead of at the
correct index inside it.

Change-Id: Ie1ffaa176f6165e2cec85c93adc945312eff38e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96650
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 6 insertions, 12 deletions

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index e290c4960368..7b841844874d 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -173,9 +173,8 @@ public:
      * @param rRectangle - if not empty, then limit the output only to the area of this rectangle
      * @return a JSON describing position/content of rows/columns
      */
-    virtual OUString getRowColumnHeaders(const tools::Rectangle& /*rRectangle*/)
+    virtual void getRowColumnHeaders(const tools::Rectangle& /*rRectangle*/, tools::JsonWriter& /*rJsonWriter*/)
     {
-        return OUString();
     }
 
     /**
@@ -183,9 +182,8 @@ public:
      * current' views' co-ordinate system.
      * (This could maybe also be used for tables in Writer/Impress in future?)
      */
-    virtual OString getCellCursor()
+    virtual void getCellCursor(tools::JsonWriter& /*rJsonWriter*/)
     {
-        return OString();
     }
 
     virtual PointerStyle getPointer() = 0;
@@ -237,30 +235,26 @@ public:
 
     /// Implementation for
     /// lok::Document::getCommandValues(".uno:TrackedChangeAuthors").
-    virtual OUString getTrackedChangeAuthors()
+    virtual void getTrackedChangeAuthors(tools::JsonWriter& /*rJsonWriter*/)
     {
-        return OUString();
     }
 
     /// Implementation for
     /// lok::Document::getCommandValues(".uno:ViewAnnotations");
-    virtual OUString getPostIts()
+    virtual void getPostIts(tools::JsonWriter& /*rJsonWriter*/)
     {
-        return OUString();
     }
 
     /// Implementation for
     /// lok::Document::getCommandValues(".uno:ViewAnnotationsPosition");
-    virtual OUString getPostItsPos()
+    virtual void getPostItsPos(tools::JsonWriter& /*rJsonWriter*/)
     {
-        return OUString();
     }
 
     /// Implementation for
     /// lok::Document::getCommandValues(".uno:RulerState");
-    virtual OUString getRulerState()
+    virtual void getRulerState(tools::JsonWriter& /*rJsonWriter*/)
     {
-        return OUString();
     }
 
     /*