|
 |
f325b2 |
From c59de3973a3910b949528806dab6756f7ed92199 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 16 Jun 2015 11:34:36 +0200
|
|
|
f325b2 |
Subject: [PATCH 052/398] lokdocview: couple for missing
|
|
|
f325b2 |
static_cast<GParamFlags>()
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I038c05c0d081f52e4ac90688f73397565413632d
|
|
|
f325b2 |
(cherry picked from commit 9dcd2d119ab67bde9de588c42db3805525d5f06a)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 13 +++++--------
|
|
|
f325b2 |
1 file changed, 5 insertions(+), 8 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 7031be9b6536..20b1aa6b837e 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -519,10 +519,7 @@ callback (gpointer pData)
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- g_info ("%d %d", priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
|
|
|
f325b2 |
- g_info ("startin");
|
|
|
f325b2 |
payloadToSize(pCallback->m_aPayload.c_str(), priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
|
|
|
f325b2 |
- g_info ("%d %d", priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
|
|
|
f325b2 |
gtk_widget_set_size_request(GTK_WIDGET(pDocView),
|
|
|
f325b2 |
twipToPixel(priv->m_nDocumentWidthTwips, priv->m_fZoom),
|
|
|
f325b2 |
twipToPixel(priv->m_nDocumentHeightTwips, priv->m_fZoom));
|
|
|
f325b2 |
@@ -1156,7 +1153,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
"Document Path",
|
|
|
f325b2 |
"The URI of the document to open",
|
|
|
f325b2 |
0,
|
|
|
f325b2 |
- G_PARAM_READWRITE));
|
|
|
f325b2 |
+ static_cast<GParamFlags>(G_PARAM_READWRITE)));
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* LOKDocView:editable:
|
|
|
f325b2 |
@@ -1169,7 +1166,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
"Editable",
|
|
|
f325b2 |
"Whether the content is in edit mode or not",
|
|
|
f325b2 |
FALSE,
|
|
|
f325b2 |
- G_PARAM_READWRITE));
|
|
|
f325b2 |
+ static_cast<GParamFlags>(G_PARAM_READWRITE)));
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* LOKDocView:load-progress:
|
|
|
f325b2 |
@@ -1214,7 +1211,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
"Is Loading",
|
|
|
f325b2 |
"Whether the view is loading a document",
|
|
|
f325b2 |
FALSE,
|
|
|
f325b2 |
- G_PARAM_READABLE));
|
|
|
f325b2 |
+ static_cast<GParamFlags>(G_PARAM_READABLE)));
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* LOKDocView:doc-width:
|
|
|
f325b2 |
@@ -1227,7 +1224,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
"Document Width",
|
|
|
f325b2 |
"Width of the document in twips",
|
|
|
f325b2 |
0, G_MAXLONG, 0,
|
|
|
f325b2 |
- G_PARAM_READWRITE));
|
|
|
f325b2 |
+ static_cast<GParamFlags>(G_PARAM_READWRITE)));
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* LOKDocView:doc-height:
|
|
|
f325b2 |
@@ -1240,7 +1237,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
f325b2 |
"Document Height",
|
|
|
f325b2 |
"Height of the document in twips",
|
|
|
f325b2 |
0, G_MAXLONG, 0,
|
|
|
f325b2 |
- G_PARAM_READWRITE));
|
|
|
f325b2 |
+ static_cast<GParamFlags>(G_PARAM_READWRITE)));
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* LOKDocView:can-zoom-in:
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|