[Libreoffice-commits] core.git: libreofficekit/source

Miklos Vajna vmiklos at collabora.co.uk
Tue Nov 3 02:19:35 PST 2015


 libreofficekit/source/gtk/lokdocview.cxx |    2 +-
 libreofficekit/source/gtk/tilebuffer.cxx |    2 +-
 libreofficekit/source/gtk/tilebuffer.hxx |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 602c1b4e2922c6a0ce425f398983ef64e595b606
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Nov 3 11:19:03 2015 +0100

    libreofficekit: -Werror=unused-parameter
    
    Change-Id: I89c4d9752ef650d516bed8fcdc5873de8ae87e18

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 66ab461..f980e7f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -969,7 +969,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
                 GTask* task = g_task_new(pDocView, NULL, paintTileCallback, pLOEvent);
                 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
 
-                Tile& currentTile = priv->m_pTileBuffer->getTile(nRow, nColumn, priv->m_fZoom, task, priv->lokThreadPool);
+                Tile& currentTile = priv->m_pTileBuffer->getTile(nRow, nColumn, task, priv->lokThreadPool);
                 GdkPixbuf* pPixBuf = currentTile.getBuffer();
                 gdk_cairo_set_source_pixbuf (pCairo, pPixBuf,
                                              twipToPixel(aTileRectangleTwips.x, priv->m_fZoom),
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
index a139082..6d447a8d 100644
--- a/libreofficekit/source/gtk/tilebuffer.cxx
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
@@ -79,7 +79,7 @@ void TileBuffer::setInvalid(int x, int y, float fZoom, GTask* task,
     }
 }
 
-Tile& TileBuffer::getTile(int x, int y, float fZoom, GTask* task,
+Tile& TileBuffer::getTile(int x, int y, GTask* task,
                           GThreadPool* lokThreadPool)
 {
     int index = x * m_nWidth + y;
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
index 27fbdf6..f74cae7 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -105,7 +105,6 @@ class TileBuffer
 
        @param x the tile along the x-axis of the buffer
        @param y the tile along the y-axis of the buffer
-       @param aZoom current zoom factor of the document
        @param task GTask object containing the necessary data
        @param pool GThreadPool managed by the widget instance used for all the
        LOK calls made by widget. It is needed here because getTile invokes one
@@ -113,7 +112,7 @@ class TileBuffer
 
        @return the tile at the mentioned position (x, y)
      */
-    Tile& getTile(int x, int y, float aZoom, GTask* task, GThreadPool* pool);
+    Tile& getTile(int x, int y, GTask* task, GThreadPool* pool);
     /// Destroys all the tiles in the tile buffer; also frees the memory allocated
     /// for all the Tile objects.
     void resetAllTiles();


More information about the Libreoffice-commits mailing list