mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror,-Wunused-private-field

Browse Source 
Change-Id: I76cf487c66e048b5e9d0877a1b690cd066b73528
This commit is contained in:
Stephan Bergmann
2015-06-09 11:42:41 +02:00
parent 9805ae85eb
commit 3a1a5b9744
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libreofficekit/source/gtk/lokdocview.cxx
View File

@@ -274,7 +274,7 @@ LOKDocView_Impl::CallbackData::CallbackData(int nType, const std::string& rPaylo
LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView) LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView)
: m_pDocView(pDocView), : m_pDocView(pDocView),
m_pDrawingArea(gtk_drawing_area_new()), m_pDrawingArea(gtk_drawing_area_new()),
m_aTileBuffer(TileBuffer(0,0,0)), m_aTileBuffer(TileBuffer(0,0)),
m_fZoom(1), m_fZoom(1),
m_pOffice(0), m_pOffice(0),
m_pDocument(0), m_pDocument(0),
@@ -1230,13 +1230,11 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_doc_view_open_document( LOKDocView* pDocView,
long nDocumentHeightTwips = pDocView->m_pImpl->m_nDocumentHeightTwips; long nDocumentHeightTwips = pDocView->m_pImpl->m_nDocumentHeightTwips;
long nDocumentWidthPixels = twipToPixel(nDocumentWidthTwips, zoom); long nDocumentWidthPixels = twipToPixel(nDocumentWidthTwips, zoom);
long nDocumentHeightPixels = twipToPixel(nDocumentHeightTwips, zoom); long nDocumentHeightPixels = twipToPixel(nDocumentHeightTwips, zoom);
// Total number of rows / columns in this document. // Total number of columns in this document.
guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);
guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels); guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
pDocView->m_pImpl->m_aTileBuffer = TileBuffer(pDocView->m_pImpl->m_pDocument, pDocView->m_pImpl->m_aTileBuffer = TileBuffer(pDocView->m_pImpl->m_pDocument,
nRows,
nColumns); nColumns);
gtk_widget_set_size_request(pDocView->m_pImpl->m_pDrawingArea, gtk_widget_set_size_request(pDocView->m_pImpl->m_pDrawingArea,
nDocumentWidthPixels, nDocumentWidthPixels,
@@ -1257,12 +1255,10 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_set_zoom ( LOKDocView* pDocView, float fZ
pDocView->m_pImpl->m_fZoom = fZoom; pDocView->m_pImpl->m_fZoom = fZoom;
long nDocumentWidthPixels = twipToPixel(pDocView->m_pImpl->m_nDocumentWidthTwips, fZoom); long nDocumentWidthPixels = twipToPixel(pDocView->m_pImpl->m_nDocumentWidthTwips, fZoom);
long nDocumentHeightPixels = twipToPixel(pDocView->m_pImpl->m_nDocumentHeightTwips, fZoom); long nDocumentHeightPixels = twipToPixel(pDocView->m_pImpl->m_nDocumentHeightTwips, fZoom);
// Total number of rows / columns in this document. // Total number of columns in this document.
guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);
guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels); guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
pDocView->m_pImpl->m_aTileBuffer = TileBuffer(pDocView->m_pImpl->m_pDocument, pDocView->m_pImpl->m_aTileBuffer = TileBuffer(pDocView->m_pImpl->m_pDocument,
nRows,
nColumns); nColumns);
gtk_widget_set_size_request(pDocView->m_pImpl->m_pDrawingArea, gtk_widget_set_size_request(pDocView->m_pImpl->m_pDrawingArea,
nDocumentWidthPixels, nDocumentWidthPixels,

4
libreofficekit/source/gtk/tilebuffer.hxx
View File

@@ -83,11 +83,9 @@ class TileBuffer
{ {
public: public:
TileBuffer(LibreOfficeKitDocument *document, TileBuffer(LibreOfficeKitDocument *document,
int rows,
int columns) int columns)
: m_pLOKDocument(document) : m_pLOKDocument(document)
, m_nWidth(columns) , m_nWidth(columns)
, m_nHeight(rows)
{ } { }
~TileBuffer() {} ~TileBuffer() {}
@@ -126,8 +124,6 @@ class TileBuffer
std::map<int, Tile> m_mTiles; std::map<int, Tile> m_mTiles;
/// Width of the current tile buffer (number of columns) /// Width of the current tile buffer (number of columns)
int m_nWidth; int m_nWidth;
/// Height of the current tile buffer (numbero of rows)
int m_nHeight;
}; };
#endif // INCLUDED_TILEBUFFER_HXX #endif // INCLUDED_TILEBUFFER_HXX