|
 |
135360 |
From 356c869cbd52306275956973c18da53a15fe7655 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Pranav Kant <pranavk@libreoffice.org>
|
|
|
135360 |
Date: Wed, 20 Jan 2016 14:49:29 +0530
|
|
|
135360 |
Subject: [PATCH 388/398] lokdocview: Center the widget inside the allocation
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I8d7f8ffb1c5ddd07ccf7d56bdf0ccc866c927401
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/21624
|
|
|
135360 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
135360 |
Reviewed-by: Pranav Kant <pranavk@gnome.org>
|
|
|
135360 |
(cherry picked from commit 070bfedb7c0bc01ada0c0b95622543472ccb4a1c)
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/21638
|
|
|
135360 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
(cherry picked from commit 3763ab42fa88d9f2a2248eba1854f3d97fcfbde8)
|
|
|
135360 |
---
|
|
|
135360 |
libreofficekit/source/gtk/lokdocview.cxx | 11 +++++++++--
|
|
|
135360 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
index d2c66b951b7d..1af678e1acc2 100644
|
|
|
135360 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
@@ -2404,14 +2404,21 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
|
|
|
135360 |
SAL_DLLPUBLIC_EXPORT GtkWidget*
|
|
|
135360 |
lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
|
|
|
135360 |
{
|
|
|
135360 |
- return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error, "lopath", pPath == NULL ? LOK_PATH : pPath, NULL));
|
|
|
135360 |
+ return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error,
|
|
|
135360 |
+ "lopath", pPath == nullptr ? LOK_PATH : pPath,
|
|
|
135360 |
+ "halign", GTK_ALIGN_CENTER,
|
|
|
135360 |
+ nullptr));
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pOldLOKDocView)
|
|
|
135360 |
{
|
|
|
135360 |
LOKDocViewPrivate& pOldPriv = getPrivate(pOldLOKDocView);
|
|
|
135360 |
GtkWidget* pNewDocView = GTK_WIDGET(g_initable_new(LOK_TYPE_DOC_VIEW, /*cancellable=*/nullptr, /*error=*/nullptr,
|
|
|
135360 |
- "lopath", pOldPriv->m_aLOPath, "lopointer", pOldPriv->m_pOffice, "docpointer", pOldPriv->m_pDocument, NULL));
|
|
|
135360 |
+ "lopath", pOldPriv->m_aLOPath,
|
|
|
135360 |
+ "lopointer", pOldPriv->m_pOffice,
|
|
|
135360 |
+ "docpointer", pOldPriv->m_pDocument,
|
|
|
135360 |
+ "halign", GTK_ALIGN_CENTER,
|
|
|
135360 |
+ nullptr));
|
|
|
135360 |
|
|
|
135360 |
// No documentLoad(), just a createView().
|
|
|
135360 |
LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(pNewDocView));
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|