|
 |
f325b2 |
From a56ef7d60e8ee96204700a0b6c1474ed2d1560ad Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 3 Nov 2015 11:19:03 +0100
|
|
|
f325b2 |
Subject: [PATCH 262/398] libreofficekit: -Werror=unused-parameter
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I89c4d9752ef650d516bed8fcdc5873de8ae87e18
|
|
|
f325b2 |
(cherry picked from commit 602c1b4e2922c6a0ce425f398983ef64e595b606)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 2 +-
|
|
|
f325b2 |
libreofficekit/source/gtk/tilebuffer.cxx | 2 +-
|
|
|
f325b2 |
libreofficekit/source/gtk/tilebuffer.hxx | 3 +--
|
|
|
f325b2 |
3 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 867c0d165448..d570bbd1393b 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -969,7 +969,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
|
|
|
f325b2 |
GTask* task = g_task_new(pDocView, NULL, paintTileCallback, pLOEvent);
|
|
|
f325b2 |
g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
|
|
|
f325b2 |
|
|
|
f325b2 |
- Tile& currentTile = priv->m_pTileBuffer->getTile(nRow, nColumn, priv->m_fZoom, task, priv->lokThreadPool);
|
|
|
f325b2 |
+ Tile& currentTile = priv->m_pTileBuffer->getTile(nRow, nColumn, task, priv->lokThreadPool);
|
|
|
f325b2 |
GdkPixbuf* pPixBuf = currentTile.getBuffer();
|
|
|
f325b2 |
gdk_cairo_set_source_pixbuf (pCairo, pPixBuf,
|
|
|
f325b2 |
twipToPixel(aTileRectangleTwips.x, priv->m_fZoom),
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
index 6c9847674e53..1158209b2273 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
@@ -85,7 +85,7 @@ void TileBuffer::setInvalid(int x, int y, float fZoom, GTask* task,
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-Tile& TileBuffer::getTile(int x, int y, float fZoom, GTask* task,
|
|
|
f325b2 |
+Tile& TileBuffer::getTile(int x, int y, GTask* task,
|
|
|
f325b2 |
GThreadPool* lokThreadPool)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
int index = x * m_nWidth + y;
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
|
|
|
f325b2 |
index bef1444f9c9c..5e1ea1a27049 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/tilebuffer.hxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
|
|
|
f325b2 |
@@ -107,7 +107,6 @@ class TileBuffer
|
|
|
f325b2 |
|
|
|
f325b2 |
@param x the tile along the x-axis of the buffer
|
|
|
f325b2 |
@param y the tile along the y-axis of the buffer
|
|
|
f325b2 |
- @param aZoom current zoom factor of the document
|
|
|
f325b2 |
@param task GTask object containing the necessary data
|
|
|
f325b2 |
@param pool GThreadPool managed by the widget instance used for all the
|
|
|
f325b2 |
LOK calls made by widget. It is needed here because getTile invokes one
|
|
|
f325b2 |
@@ -115,7 +114,7 @@ class TileBuffer
|
|
|
f325b2 |
|
|
|
f325b2 |
@return the tile at the mentioned position (x, y)
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- Tile& getTile(int x, int y, float aZoom, GTask* task, GThreadPool* pool);
|
|
|
f325b2 |
+ Tile& getTile(int x, int y, GTask* task, GThreadPool* pool);
|
|
|
f325b2 |
/// Destroys all the tiles in the tile buffer; also frees the memory allocated
|
|
|
f325b2 |
/// for all the Tile objects.
|
|
|
f325b2 |
void resetAllTiles();
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|