|
 |
f325b2 |
From 1241127d63bb91f6c901d32525bce8de0da7108a Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
f325b2 |
Date: Tue, 9 Jun 2015 11:42:41 +0200
|
|
|
f325b2 |
Subject: [PATCH 030/398] -Werror,-Wunused-private-field
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I76cf487c66e048b5e9d0877a1b690cd066b73528
|
|
|
f325b2 |
(cherry picked from commit 3a1a5b9744eb73f82c28ecfaa39b54587ef8206b)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 10 +++-------
|
|
|
f325b2 |
libreofficekit/source/gtk/tilebuffer.hxx | 4 ----
|
|
|
f325b2 |
2 files changed, 3 insertions(+), 11 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 0124704d6784..90f033c80fe2 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -274,7 +274,7 @@ LOKDocView_Impl::CallbackData::CallbackData(int nType, const std::string& rPaylo
|
|
|
f325b2 |
LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView)
|
|
|
f325b2 |
: m_pDocView(pDocView),
|
|
|
f325b2 |
m_pDrawingArea(gtk_drawing_area_new()),
|
|
|
f325b2 |
- m_aTileBuffer(TileBuffer(0,0,0)),
|
|
|
f325b2 |
+ m_aTileBuffer(TileBuffer(0,0)),
|
|
|
f325b2 |
m_fZoom(1),
|
|
|
f325b2 |
m_pOffice(0),
|
|
|
f325b2 |
m_pDocument(0),
|
|
|
f325b2 |
@@ -1230,13 +1230,11 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_doc_view_open_document( LOKDocView* pDocView,
|
|
|
f325b2 |
long nDocumentHeightTwips = pDocView->m_pImpl->m_nDocumentHeightTwips;
|
|
|
f325b2 |
long nDocumentWidthPixels = twipToPixel(nDocumentWidthTwips, zoom);
|
|
|
f325b2 |
long nDocumentHeightPixels = twipToPixel(nDocumentHeightTwips, zoom);
|
|
|
f325b2 |
- // Total number of rows / columns in this document.
|
|
|
f325b2 |
- guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);
|
|
|
f325b2 |
+ // Total number of columns in this document.
|
|
|
f325b2 |
guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
|
|
|
f325b2 |
|
|
|
f325b2 |
|
|
|
f325b2 |
pDocView->m_pImpl->m_aTileBuffer = TileBuffer(pDocView->m_pImpl->m_pDocument,
|
|
|
f325b2 |
- nRows,
|
|
|
f325b2 |
nColumns);
|
|
|
f325b2 |
gtk_widget_set_size_request(pDocView->m_pImpl->m_pDrawingArea,
|
|
|
f325b2 |
nDocumentWidthPixels,
|
|
|
f325b2 |
@@ -1257,12 +1255,10 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_set_zoom ( LOKDocView* pDocView, float fZ
|
|
|
f325b2 |
pDocView->m_pImpl->m_fZoom = fZoom;
|
|
|
f325b2 |
long nDocumentWidthPixels = twipToPixel(pDocView->m_pImpl->m_nDocumentWidthTwips, fZoom);
|
|
|
f325b2 |
long nDocumentHeightPixels = twipToPixel(pDocView->m_pImpl->m_nDocumentHeightTwips, fZoom);
|
|
|
f325b2 |
- // Total number of rows / columns in this document.
|
|
|
f325b2 |
- guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);
|
|
|
f325b2 |
+ // Total number of columns in this document.
|
|
|
f325b2 |
guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
|
|
|
f325b2 |
|
|
|
f325b2 |
pDocView->m_pImpl->m_aTileBuffer = TileBuffer(pDocView->m_pImpl->m_pDocument,
|
|
|
f325b2 |
- nRows,
|
|
|
f325b2 |
nColumns);
|
|
|
f325b2 |
gtk_widget_set_size_request(pDocView->m_pImpl->m_pDrawingArea,
|
|
|
f325b2 |
nDocumentWidthPixels,
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
|
|
|
f325b2 |
index ea8e52452c8d..b9bf71b950d5 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/tilebuffer.hxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
|
|
|
f325b2 |
@@ -83,11 +83,9 @@ class TileBuffer
|
|
|
f325b2 |
{
|
|
|
f325b2 |
public:
|
|
|
f325b2 |
TileBuffer(LibreOfficeKitDocument *document,
|
|
|
f325b2 |
- int rows,
|
|
|
f325b2 |
int columns)
|
|
|
f325b2 |
: m_pLOKDocument(document)
|
|
|
f325b2 |
, m_nWidth(columns)
|
|
|
f325b2 |
- , m_nHeight(rows)
|
|
|
f325b2 |
{ }
|
|
|
f325b2 |
|
|
|
f325b2 |
~TileBuffer() {}
|
|
|
f325b2 |
@@ -126,8 +124,6 @@ class TileBuffer
|
|
|
f325b2 |
std::map<int, Tile> m_mTiles;
|
|
|
f325b2 |
/// Width of the current tile buffer (number of columns)
|
|
|
f325b2 |
int m_nWidth;
|
|
|
f325b2 |
- /// Height of the current tile buffer (numbero of rows)
|
|
|
f325b2 |
- int m_nHeight;
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
#endif // INCLUDED_TILEBUFFER_HXX
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|