From 07f52f4e37afec5952dc42a9cafbcaac9c2152ae Mon Sep 17 00:00:00 2001

From: Andrzej Hunt <andrzej@ahunt.org>

Date: Wed, 4 Nov 2015 17:24:15 +0100

Subject: [PATCH 279/398] sc lok: tdf#94605 introduce uno:CellCursor

This allows the client to rerequest the current cursor position,

which is necessary e.g. on zoom-level changes.

Conflicts:

	desktop/source/lib/init.cxx

	sc/inc/docuno.hxx

Change-Id: I10d81e220a56a36e2ec0c59005cd1d4f134857d5

(cherry picked from commit 2bcaffd12263e8f3c2a2fbf8ccc4b9bba2642146)

---

 desktop/source/lib/init.cxx      | 43 ++++++++++++++++++++++++++++++++++++++++

 include/vcl/ITiledRenderable.hxx | 12 +++++++++++

 sc/inc/docuno.hxx                |  6 ++++++

 sc/source/ui/inc/gridwin.hxx     |  9 +++++++++

 sc/source/ui/unoobj/docuno.cxx   | 17 ++++++++++++++++

 sc/source/ui/view/gridwin.cxx    | 36 ++++++++++++++++++++++++++++-----

 6 files changed, 118 insertions(+), 5 deletions(-)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx

index bf244cd7aefa..3ca554d7e6f9 100644

--- a/desktop/source/lib/init.cxx

+++ b/desktop/source/lib/init.cxx

@@ -31,6 +31,7 @@

 #include <comphelper/dispatchcommand.hxx>

 #include <comphelper/lok.hxx>

 #include <comphelper/processfactory.hxx>

+#include <comphelper/string.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>

 #include <com/sun/star/container/XNameAccess.hpp>

@@ -1208,6 +1209,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCo

 {

     OString aCommand(pCommand);

     static const OString aViewRowColumnHeaders(".uno:ViewRowColumnHeaders");

+    static const OString aCellCursor(".uno:CellCursor");

     if (!strcmp(pCommand, ".uno:CharFontName"))

     {

@@ -1266,6 +1268,47 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCo

         OUString aHeaders = pDoc->getRowColumnHeaders(aRectangle);

         OString aString = OUStringToOString(aHeaders, RTL_TEXTENCODING_UTF8);

+

+        char* pMemory = static_cast<char*>(malloc(aString.getLength() + 1));

+        strcpy(pMemory, aString.getStr());

+        return pMemory;

+    }

+    else if (aCommand.startsWith(aCellCursor)

+    {

+        ITiledRenderable* pDoc = getTiledRenderable(pThis);

+        if (!pDoc)

+        {

+            gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";

+            return 0;

+        }

+

+        OString aString;

+        OString aParams = aCommand.copy(OString(".uno:CellCursor:").getLength());

+

+        sal_Int32 nIndex = 0;

+        OString aOutputWidth = aParams.getToken(0,  ',',  nIndex);

+        OString aOutputHeight = aParams.getToken(0,  ',',  nIndex);

+        OString aTileWidth = aParams.getToken(0,  ',',  nIndex);

+        OString aTileHeight = aParams.getToken(0,  ',',  nIndex);

+

+        int nOutputWidth, nOutputHeight;

+        long nTileWidth, nTileHeight;

+        if (!(comphelper::string::getTokenCount(aParams, ',') == 4

+              && !aOutputWidth.isEmpty()

+              && (nOutputWidth = aOutputWidth.toInt32()) != 0

+              && !aOutputHeight.isEmpty()

+              && (nOutputHeight = aOutputHeight.toInt32()) != 0

+              && !aTileWidth.isEmpty()

+              && (nTileWidth = aTileWidth.toInt64()) != 0

+              && !aTileHeight.isEmpty()

+              && (nTileHeight = aTileHeight.toInt64()) != 0))

+        {

+            gImpl->maLastExceptionMsg = "Can't parse arguments for .uno:CellCursor, no cursor returned";

+            return NULL;

+        }

+

+        OString aString = pDoc->getCellCursor(nOutputWidth, nOutputHeight, nTileWidth, nTileHeight);

+

         char* pMemory = static_cast<char*>(malloc(aString.getLength() + 1));

         strcpy(pMemory, aString.getStr());

         return pMemory;

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx

index efa9bc272b40..963f1fc7054a 100644

--- a/include/vcl/ITiledRenderable.hxx

+++ b/include/vcl/ITiledRenderable.hxx

@@ -159,6 +159,18 @@ public:

         return OUString();

     }

+    /**

+     * Get position and size of cell cursor in Calc.

+     * (This could maybe also be used for tables in Writer/Impress in future?)

+     */

+    virtual OString getCellCursor(int /*nOutputWidth*/,

+                                  int /*nOutputHeight*/,

+                                  long /*nTileWidth*/,

+                                  long /*nTileHeight*/)

+    {

+        return OString();

+    }

+

     /// Sets the clipboard of the component.

     virtual void setClipboard(const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard) = 0;

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx

index 828fc1af7ea0..70f61ca03548 100644

--- a/sc/inc/docuno.hxx

+++ b/sc/inc/docuno.hxx

@@ -424,6 +424,12 @@ public:

     /// @see vcl::ITiledRenderable::getRowColumnHeaders().

     virtual OUString getRowColumnHeaders(const Rectangle& rRectangle) override;

+

+    /// @see vcl::ITiledRenderable::getCellCursor().

+    virtual OString getCellCursor( int nOutputWidth,

+                                   int nOutputHeight,

+                                   long nTileWidth,

+                                   long nTileHeight ) override;

 };

 class ScDrawPagesObj : public cppu::WeakImplHelper2<

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx

index 747ce88c2038..8081f107409c 100644

--- a/sc/source/ui/inc/gridwin.hxx

+++ b/sc/source/ui/inc/gridwin.hxx

@@ -301,6 +301,7 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou

     void            GetSelectionRects( ::std::vector< Rectangle >& rPixelRects );

+

     void            updateLibreOfficeKitCellCursor();

 protected:

     virtual void    PrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;

@@ -445,6 +446,14 @@ public:

     void            UpdateShrinkOverlay();

     void            UpdateAllOverlays();

+    /// @see ScModelObj::getCellCursor().

+    OString         getCellCursor(const Fraction& rZoomX,

+                                  const Fraction& rZoomY);

+    OString         getCellCursor(int nOutputWidth,

+                                  int nOutputHeight,

+                                  long nTileWidth,

+                                  long nTileHeight);

+

 protected:

     // #114409#

     void ImpCreateOverlayObjects();

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx

index 1316fd73d328..66794f3c6f27 100644

--- a/sc/source/ui/unoobj/docuno.cxx

+++ b/sc/source/ui/unoobj/docuno.cxx

@@ -886,6 +886,23 @@ OUString ScModelObj::getRowColumnHeaders(const Rectangle& rRectangle)

     return pTabView->getRowColumnHeaders(rRectangle);

 }

+OString ScModelObj::getCellCursor( int nOutputWidth, int nOutputHeight,

+                                   long nTileWidth, long nTileHeight )

+{

+    SolarMutexGuard aGuard;

+

+    ScViewData* pViewData = ScDocShell::GetViewData();

+

+    if (!pViewData)

+        return OString();

+

+    ScGridWindow* pGridWindow = pViewData->GetActiveWin();

+    if (!pGridWindow)

+        return OString();

+

+    return "{ \"commandName\": \".uno:CellCursor\", \"commandValues\": \"" + pGridWindow->getCellCursor( nOutputWidth, nOutputHeight, nTileWidth, nTileHeight ) + "\" }";

+}

+

 void ScModelObj::initializeForTiledRendering()

 {

     SolarMutexGuard aGuard;

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx

index daca987b14b2..efa8d332ad2a 100644

--- a/sc/source/ui/view/gridwin.cxx

+++ b/sc/source/ui/view/gridwin.cxx

@@ -5784,19 +5784,36 @@ bool ScGridWindow::InsideVisibleRange( SCCOL nPosX, SCROW nPosY )

     return maVisibleRange.isInside(nPosX, nPosY);

 }

-void ScGridWindow::updateLibreOfficeKitCellCursor() {

+// Use the same zoom calculations as in paintTile - this

+// means the client can ensure they can get the correct

+// cursor corresponding to their current tile sizings.

+OString ScGridWindow::getCellCursor( int nOutputWidth, int nOutputHeight,

+                                     long nTileWidth, long nTileHeight )

+{

+    Fraction zoomX = Fraction(long(nOutputWidth * TWIPS_PER_PIXEL), nTileWidth);

+    Fraction zoomY = Fraction(long(nOutputHeight * TWIPS_PER_PIXEL), nTileHeight);

+    return getCellCursor(zoomX, zoomY);

+}

+

+OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoomY) {

     ScDocument* pDoc = pViewData->GetDocument();

     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();

-    if (!pDrawLayer->isTiledRendering())

-        return;

+    // GridWindows stores a shown cell cursor in mpOOCursors, hence

+    // we can use that to determine whether we would want to be showing

+    // one (client-side) for tiled rendering too.

+    if (!pDrawLayer->isTiledRendering() || !mpOOCursors.get())

+    {

+        return OString("EMPTY");

+    }

     SCCOL nX = pViewData->GetCurX();

     SCROW nY = pViewData->GetCurY();

     Fraction defaultZoomX = pViewData->GetZoomX();

     Fraction defaultZoomY = pViewData->GetZoomX();

-    pViewData->SetZoom(mTiledZoomX, mTiledZoomY, true);

+

+    pViewData->SetZoom(rZoomX, rZoomY, true);

     Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );

     long nSizeXPix;

@@ -5810,7 +5827,15 @@ void ScGridWindow::updateLibreOfficeKitCellCursor() {

     pViewData->SetZoom(defaultZoomX, defaultZoomY, true);

-    pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_CELL_CURSOR, aRect.toString().getStr());

+    return aRect.toString();

+}

+

+void ScGridWindow::updateLibreOfficeKitCellCursor()

+{

+    ScDocument* pDoc = pViewData->GetDocument();

+    ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();

+    OString aCursor = getCellCursor(mTiledZoomX, mTiledZoomY);

+    pDrawLayer->libreOfficeKitCallback(LOK_CALLBACK_CELL_CURSOR, aCursor.getStr());

 }

 void ScGridWindow::CursorChanged()

@@ -6098,6 +6123,7 @@ void ScGridWindow::UpdateCursorOverlay()

     if ( !aPixelRects.empty() )

     {

         if (pDrawLayer->isTiledRendering()) {

+            mpOOCursors.reset(new sdr::overlay::OverlayObjectList);

             updateLibreOfficeKitCellCursor();

         }

         else

-- 

2.12.0