[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Noel Grandin (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx |5 +++--
 libreofficekit/source/gtk/lokdocview.cxx |5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 154cffd87ee4a21b5c0c291f84c95d74cde2a143
Author: Noel Grandin 
AuthorDate: Wed Jun 22 09:11:15 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 23 08:53:17 2022 +0200

clang-tidy modernize-pass-by-value in libreofficekit

Change-Id: I1a6b4eb804a8cc4eb5e67ae4bbf8f31863f323d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136273
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index dc106e58dcb4..22aadbe2f337 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
@@ -16,6 +16,7 @@
 
 #include 
 #include 
+#include 
 
 namespace {
 
@@ -26,9 +27,9 @@ struct GtvCalcHeaderBarPrivateImpl
 {
 int m_nSize;
 std::string m_aText;
-Header(int nSize, const std::string& rText)
+Header(int nSize, std::string aText)
 : m_nSize(nSize),
-  m_aText(rText)
+  m_aText(std::move(aText))
 { }
 };
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 39f2281b0c7d..a092a1dbf1ab 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -358,9 +359,9 @@ struct CallbackData
 std::string m_aPayload;
 LOKDocView* m_pDocView;
 
-CallbackData(int nType, const std::string& rPayload, LOKDocView* pDocView)
+CallbackData(int nType, std::string aPayload, LOKDocView* pDocView)
 : m_nType(nType),
-  m_aPayload(rPayload),
+  m_aPayload(std::move(aPayload)),
   m_pDocView(pDocView) {}
 };
 

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source solenv/clang-format

[Philipp Hofer (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx |   10 +++
 libreofficekit/qa/unit/compile_test.c|5 ---
 libreofficekit/source/gtk/tilebuffer.hxx |   21 +--
 solenv/clang-format/excludelist  |3 --
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 39821e7d24deffa72bd9254414d4b58f22be2fca
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:05:19 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Nov 19 10:43:43 2020 +0100

tdf#123936 Formatting files in module libreofficekit with clang-format

Change-Id: I3f086de3a49181d32e54d7d58e1206615a9371e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105687
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx 
b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
index bddf5c29e625..a441d4e13bf5 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
@@ -22,19 +22,19 @@ void createView(GtkWidget* pButton, gpointer /*pItem*/);
 
 void getRulerState(GtkWidget* pButton, gpointer /*pItem*/);
 
-void recentUnoChanged( GtkWidget* pSelector, gpointer /* pItem */ );
+void recentUnoChanged(GtkWidget* pSelector, gpointer /* pItem */);
 
 void unoCommandDebugger(GtkWidget* pButton, gpointer /* pItem */);
 
 void toggleEditing(GtkWidget* pButton, gpointer /*pItem*/);
 
-void changePartMode( GtkWidget* pSelector, gpointer /* pItem */ );
+void changePartMode(GtkWidget* pSelector, gpointer /* pItem */);
 
-void changePart( GtkWidget* pSelector, gpointer /*pItem*/ );
+void changePart(GtkWidget* pSelector, gpointer /*pItem*/);
 
-void openLokDialog( GtkWidget* pSelector, gpointer /*pItem*/ );
+void openLokDialog(GtkWidget* pSelector, gpointer /*pItem*/);
 
-void changeZoom( GtkWidget* pButton, gpointer /* pItem */ );
+void changeZoom(GtkWidget* pButton, gpointer /* pItem */);
 
 void toggleFindbar(GtkWidget* pButton, gpointer /*pItem*/);
 
diff --git a/libreofficekit/qa/unit/compile_test.c 
b/libreofficekit/qa/unit/compile_test.c
index bf0b1e5f1824..650718efaab2 100644
--- a/libreofficekit/qa/unit/compile_test.c
+++ b/libreofficekit/qa/unit/compile_test.c
@@ -15,9 +15,6 @@
 #include "test.h"
 
 // just make sure this stuff compiles from a plain C file
-LibreOfficeKit* compile_test(void)
-{
-return lok_init("install/path");
-}
+LibreOfficeKit* compile_test(void) { return lok_init("install/path"); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx 
b/libreofficekit/source/gtk/tilebuffer.hxx
index 9e7203b3bd69..79fa48c555db 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -54,8 +54,12 @@ GQuark LOKTileBufferErrorQuark(void);
 */
 class Tile
 {
- public:
-Tile() : valid(false), m_pBuffer(nullptr) {}
+public:
+Tile()
+: valid(false)
+, m_pBuffer(nullptr)
+{
+}
 ~Tile()
 {
 if (m_pBuffer)
@@ -75,7 +79,7 @@ class Tile
 
 private:
 /// Pixel buffer data for this tile
-cairo_surface_t *m_pBuffer;
+cairo_surface_t* m_pBuffer;
 };
 
 /**
@@ -87,11 +91,12 @@ private:
 */
 class TileBuffer
 {
- public:
- TileBuffer(int columns = 0, int scale = 1)
- : m_nWidth(columns)
+public:
+TileBuffer(int columns = 0, int scale = 1)
+: m_nWidth(columns)
 {
-cairo_surface_t *pSurface = 
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, nTileSizePixels * scale, 
nTileSizePixels * scale);
+cairo_surface_t* pSurface = cairo_image_surface_create(
+CAIRO_FORMAT_ARGB32, nTileSizePixels * scale, nTileSizePixels * 
scale);
 m_DummyTile.setSurface(pSurface);
 cairo_surface_destroy(pSurface);
 }
@@ -118,7 +123,7 @@ class TileBuffer
 /*
   Takes ownership of the surface and sets it on a tile at a given location
 */
-void  setTile(int x, int y, cairo_surface_t *surface);
+void setTile(int x, int y, cairo_surface_t* surface);
 
 /// Returns true if a valid tile exists at this location
 bool hasValidTile(int x, int y);
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ec3e954aacd4..c5a0601d11ba 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -7282,13 +7282,10 @@ 
libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
-libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx
 libreofficekit/qa/tilebench/tilebench.cxx
-libreofficekit/qa/unit/compile_test.c
 libreofficekit/qa/unit/tiledrendering.cxx
 libreofficekit/source/gtk/lokdocview.cxx
 libreofficekit/source/gtk/tilebuffer.cxx

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source ucb/source vcl/unx

[Stephan Bergmann (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-application.cxx|   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx|   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx   |5 +
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx |   11 +++
 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx   |   11 +++
 libreofficekit/source/gtk/lokdocview.cxx|5 +
 ucb/source/ucp/gio/gio_mount.cxx|5 +
 vcl/unx/gtk3/gtk3gloactiongroup.cxx |   10 ++
 vcl/unx/gtk3/gtk3glomenu.cxx|5 +
 10 files changed, 85 insertions(+)

New commits:
commit 0b3db87249652351f5a859ded1a876329ab18261
Author: Stephan Bergmann 
AuthorDate: Thu Oct 17 12:05:49 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 17 18:58:21 2019 +0200

Silence Clang 10 trunk -Wdeprecated-volatile in GLib for now

See  "Avoid C++20
deprecated assignment to volatile" for a potential fix in GLib (but also 
see my
question at  "[c++20]
P1152R4: warn on any simple-assignment to a volatile lvalue" whether that 
Clang
warning is actually wanted here).

With glib2-devel-2.62.1-1.fc31.x86_64, the suppressed warnings looked like

> libreofficekit/source/gtk/lokdocview.cxx:327:1: error: use of result of 
assignment to object of volatile-qualified type 'volatile gsize' (aka 'volatile 
unsigned long') is deprecated [-Werror,-Wdeprecated-volatile]
> G_DEFINE_TYPE_WITH_CODE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA,
> ^
> /usr/include/glib-2.0/gobject/gtype.h:1617:56: note: expanded from macro 
'G_DEFINE_TYPE_WITH_CODE'
> #define G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)  
_G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;} 
_G_DEFINE_TYPE_EXTENDED_END()
> ^
> /usr/include/glib-2.0/gobject/gtype.h:2034:3: note: expanded from macro 
'_G_DEFINE_TYPE_EXTENDED_BEGIN'
>   _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, 
TYPE_PARENT, flags) \
>   ^
> /usr/include/glib-2.0/gobject/gtype.h:2005:7: note: expanded from macro 
'_G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER'
>   g_once_init_leave (_define_type_id__volatile, g_define_type_id); \
>   ^
> /usr/include/glib-2.0/glib/gthread.h:257:17: note: expanded from macro 
'g_once_init_leave'
> (void) (0 ? *(location) = (result) : 0); \
> ^

Change-Id: If67ad04f8fb242f50b43a1d98ad2b28c4bed55a4
Reviewed-on: https://gerrit.libreoffice.org/80937
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 17f2ef77a1d3..7692b0b4a162 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -43,7 +43,18 @@ struct GtvApplicationWindowPrivate
 GtvRenderingArgs* m_pRenderingArgs;
 };
 
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
 G_DEFINE_TYPE_WITH_PRIVATE(GtvApplicationWindow, gtv_application_window, 
GTK_TYPE_APPLICATION_WINDOW);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
 
 static GtvApplicationWindowPrivate*
 getPrivate(GtvApplicationWindow* win)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 7481076778eb..b6598991f44b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -19,7 +19,18 @@ struct GtvApplicationPrivate
 GtvRenderingArgs* m_pRenderingArgs;
 };
 
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
 G_DEFINE_TYPE_WITH_PRIVATE(GtvApplication, gtv_application, 
GTK_TYPE_APPLICATION);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
 
 static GtvApplicationPrivate*
 getPrivate(GtvApplication* app)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index 57eba3e0efb3..9346057b7d01 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ 

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Michael Meeks (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |   15 ++
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx |2 
 libreofficekit/qa/gtktiledviewer/gtv-application.cxx|5 
 libreofficekit/source/gtk/lokdocview.cxx|   63 
 4 files changed, 81 insertions(+), 4 deletions(-)

New commits:
commit f29fded5a52f4c2fc1aae307e1f43326dd04108c
Author: Michael Meeks 
AuthorDate: Thu May 9 18:25:22 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri May 10 22:16:42 2019 +0200

unipoll: add a --unipoll parameter to gtktiledviewer.

Arguably should be the default. Implementation is a bit cute -
re-starting the main-loop as a child of a callback from its
idle handler.

Change-Id: I95e87c8a4ae3de745d7ca1f636859dd1d8deca17
Reviewed-on: https://gerrit.libreoffice.org/72072
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 1de1aa94568d..564c1de137c6 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -356,9 +356,18 @@ gtv_application_window_load_document(GtvApplicationWindow* 
window,
 *(priv->m_pRenderingArgs) = *aArgs;
 
 // setup lokdocview
-window->lokdocview = 
lok_doc_view_new_from_user_profile(priv->m_pRenderingArgs->m_aLoPath.c_str(),
-
priv->m_pRenderingArgs->m_aUserProfile.empty() ? nullptr : 
priv->m_pRenderingArgs->m_aUserProfile.c_str(),
-  nullptr, nullptr);
+const char *pUserProfile = priv->m_pRenderingArgs->m_aUserProfile.empty() ?
+nullptr : priv->m_pRenderingArgs->m_aUserProfile.c_str();
+
+window->lokdocview = GTK_WIDGET(
+g_initable_new(LOK_TYPE_DOC_VIEW, nullptr, nullptr,
+   "lopath", priv->m_pRenderingArgs->m_aLoPath.c_str(),
+   "unipoll", priv->m_pRenderingArgs->m_bUnipoll,
+   "userprofileurl", pUserProfile,
+   "halign", GTK_ALIGN_CENTER,
+   "valign", GTK_ALIGN_CENTER,
+   nullptr));
+
 gtk_container_add(GTK_CONTAINER(window->scrolledwindow), 
window->lokdocview);
 
 setupDocView(window);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
index 748195c5aff0..21508097e077 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
@@ -24,6 +24,7 @@ struct GtvRenderingArgs
 std::string m_aLoPath;
 std::string m_aUserProfile;
 bool m_bEnableTiledAnnotations;
+bool m_bUnipoll;
 
 std::string m_aBackgroundColor;
 bool m_bHidePageShadow;
@@ -31,6 +32,7 @@ struct GtvRenderingArgs
 
 GtvRenderingArgs()
 : m_bEnableTiledAnnotations(false),
+  m_bUnipoll(false),
   m_bHidePageShadow(false),
   m_bHideWhiteSpace(false)
 { }
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 3d802ee325d4..15e5f15f1697 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -46,6 +46,7 @@ gtv_application_init(GtvApplication* app)
 {
 { "version", 0, 0, G_OPTION_ARG_NONE, nullptr, "Show LOkit version", 
nullptr },
 { "lo-path", 0, 0, G_OPTION_ARG_STRING, nullptr, "LO path", nullptr },
+{ "unipoll", 0, 0, G_OPTION_ARG_NONE, nullptr, "Enable unified polling 
loop", nullptr },
 { "user-profile", 0, 0, G_OPTION_ARG_STRING, nullptr, "User profile to 
use", nullptr },
 { "enable-tiled-annotations", 0, 0, G_OPTION_ARG_NONE, nullptr, 
"Whether tiled annotations should be enabled", nullptr },
 { "background-color", 0, 0, G_OPTION_ARG_STRING, nullptr, "Background 
color", nullptr },
@@ -92,11 +93,13 @@ gtv_application_handle_local_options(GApplication* app, 
GVariantDict* options)
 return 1; // Cannot afford to continue in absence of this param
 }
 
+if (g_variant_dict_contains(options, "unipoll"))
+priv->m_pRenderingArgs->m_bUnipoll = true;
+
 if (g_variant_dict_contains(options, "version"))
 {
 if (!priv->m_pRenderingArgs->m_aLoPath.empty())
 {
-// FIXME: Crashes for some reason
 GtkWidget* pDocView = 
lok_doc_view_new(priv->m_pRenderingArgs->m_aLoPath.c_str(), nullptr, nullptr);
 const gchar* versionInfo = 
lok_doc_view_get_version_info(LOK_DOC_VIEW(pDocView));
 if (versionInfo)
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx |9 
 libreofficekit/source/gtk/lokdocview.cxx|   22 
++
 2 files changed, 31 insertions(+)

New commits:
commit f495a324921589d731d7d16f4554e36d4230476b
Author: Pranav Kant 
Date:   Mon Mar 12 22:03:05 2018 +0530

lokdocview: new property 'is-initialized'; fix gtktiledviewer for calc

there's no lokdocview property to tell if the doc has been completely
initialized (initializeForRendering() has been called, etc.). This new
property takes care of that which we now use to ignore
configure event fired before document is initialized for rendering.
Configure event handler queries document for row/col header which
asserts because some values hasn't been initialized yet.

Change-Id: I58385b2cb56bf317fe20ecf0570b7095f7260174
Reviewed-on: https://gerrit.libreoffice.org/51156
Tested-by: Jenkins 
Reviewed-by: pranavk 

diff --git 
a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index 5983b7f77e5b..c3ee592a5463 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -403,6 +403,15 @@ void LOKDocViewSigHandlers::window(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 gboolean LOKDocViewSigHandlers::configureEvent(GtkWidget* pWidget, 
GdkEventConfigure* /*pEvent*/, gpointer /*pData*/)
 {
 GtvApplicationWindow* window = 
GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pWidget)));
+
+gboolean isInit = false;
+g_object_get(G_OBJECT(window->lokdocview), "is-initialized", , 
nullptr);
+if (!isInit)
+{
+g_info("Ignoring configure event; document not yet ready");
+return false;
+}
+
 LibreOfficeKitDocument* pDocument = 
lok_doc_view_get_document(LOK_DOC_VIEW(window->lokdocview));
 if (pDocument && pDocument->pClass->getDocumentType(pDocument) == 
LOK_DOCTYPE_SPREADSHEET)
 {
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 87b69ec409af..8a76c78e1151 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -82,6 +82,7 @@ struct LOKDocViewPrivateImpl
 std::string m_aRenderingArguments;
 gdouble m_nLoadProgress;
 gboolean m_bIsLoading;
+gboolean m_bInit; // initializeForRendering() has been called
 gboolean m_bCanZoomIn;
 gboolean m_bCanZoomOut;
 LibreOfficeKit* m_pOffice;
@@ -194,6 +195,7 @@ struct LOKDocViewPrivateImpl
 LOKDocViewPrivateImpl()
 : m_nLoadProgress(0),
 m_bIsLoading(false),
+m_bInit(false),
 m_bCanZoomIn(true),
 m_bCanZoomOut(true),
 m_pOffice(nullptr),
@@ -293,6 +295,7 @@ enum
 PROP_LOAD_PROGRESS,
 PROP_ZOOM,
 PROP_IS_LOADING,
+PROP_IS_INITIALIZED,
 PROP_DOC_WIDTH,
 PROP_DOC_HEIGHT,
 PROP_CAN_ZOOM_IN,
@@ -970,6 +973,9 @@ static gboolean postDocumentLoad(gpointer pData)
 gtk_widget_grab_focus(GTK_WIDGET(pLOKDocView));
 lok_doc_view_set_zoom(pLOKDocView, 1.0);
 
+// we are completely loaded
+priv->m_bInit = TRUE;
+
 return G_SOURCE_REMOVE;
 }
 
@@ -2575,6 +2581,9 @@ static void lok_doc_view_get_property (GObject* object, 
guint propId, GValue *va
 case PROP_IS_LOADING:
 g_value_set_boolean (value, priv->m_bIsLoading);
 break;
+case PROP_IS_INITIALIZED:
+g_value_set_boolean (value, priv->m_bInit);
+break;
 case PROP_DOC_WIDTH:
 g_value_set_long (value, priv->m_nDocumentWidthTwips);
 break;
@@ -2845,6 +2854,19 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
   G_PARAM_STATIC_STRINGS));
 
 /**
+ * LOKDocView:is-initialized:
+ *
+ * Whether the requested document has completely loaded or not.
+ */
+properties[PROP_IS_INITIALIZED] =
+g_param_spec_boolean("is-initialized",
+ "Has initialized",
+ "Whether the view has completely initialized",
+ FALSE,
+ static_cast(G_PARAM_READABLE |
+  G_PARAM_STATIC_STRINGS));
+
+/**
  * LOKDocView:doc-width:
  *
  * The width of the currently loaded document in #LOKDocView in twips.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   23 +++--
 libreofficekit/source/gtk/lokdocview.cxx|   27 +++-
 2 files changed, 42 insertions(+), 8 deletions(-)

New commits:
commit 3616f875b014b7d58f81cd871ff7bbf9fd6c78d5
Author: Pranav Kant 
Date:   Tue Jan 24 17:41:54 2017 +0530

lokdocview: Separate gobject property for turning off comments

Pass --enable-tiled-annotations to gtktiledviewer on command line
to turn comments on again, by default they are turned off now.

Change-Id: I40e93ab683ec9538e088ae9aa83cda2eaaf9939e
Reviewed-on: https://gerrit.libreoffice.org/33622
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index cb32cd6..c2faacd 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -288,7 +288,11 @@ gboolean CommentsSidebar::docConfigureEvent(GtkWidget* 
pDocView, GdkEventConfigu
 TiledWindow& rWindow = lcl_getTiledWindow(pDocView);
 LibreOfficeKitDocument* pDocument = 
lok_doc_view_get_document(LOK_DOC_VIEW(pDocView));
 
-if (pDocument && pDocument->pClass->getDocumentType(pDocument) == 
LOK_DOCTYPE_TEXT)
+// whether tield rendering is turned on
+gboolean bTiledAnnotations;
+g_object_get(G_OBJECT(pDocView), "tiled-annotations", , 
nullptr);
+
+if (!bTiledAnnotations && pDocument && 
pDocument->pClass->getDocumentType(pDocument) == LOK_DOCTYPE_TEXT)
 {
 if (!rWindow.m_pCommentsSidebar)
 {
@@ -933,19 +937,20 @@ static void toggleFindbar(GtkWidget* pButton, gpointer 
/*pItem*/)
 }
 
 static void
-setLOKFeatures (GtkWidget* pDocView)
+setLOKFeatures (GtkWidget* pDocView, gboolean bTiledAnnotations)
 {
 g_object_set(G_OBJECT(pDocView),
  "doc-password", TRUE,
  "doc-password-to-modify", TRUE,
+ "tiled-annotations", bTiledAnnotations,
  nullptr);
 }
 
 /// Common initialization, regardless if it's just a new view or a full init.
-static TiledWindow& setupWidgetAndCreateWindow(GtkWidget* pDocView)
+static TiledWindow& setupWidgetAndCreateWindow(GtkWidget* pDocView, gboolean 
bTiledAnnotations)
 {
 setupDocView(pDocView);
-setLOKFeatures(pDocView);
+setLOKFeatures(pDocView, bTiledAnnotations);
 TiledWindow aWindow;
 aWindow.m_pDocView = pDocView;
 GtkWidget* pWindow = createWindow(aWindow);
@@ -974,8 +979,9 @@ static void createView(GtkWidget* pButton, gpointer 
/*pItem*/)
 std::string aArguments = aStream.str();
 
 GtkWidget* pDocView = 
lok_doc_view_new_from_widget(LOK_DOC_VIEW(rWindow.m_pDocView), 
aArguments.c_str());
-
-TiledWindow& rNewWindow = setupWidgetAndCreateWindow(pDocView);
+gboolean bTiledAnnotations;
+g_object_get(G_OBJECT(rWindow.m_pDocView), "tiled-annotations", 
, nullptr);
+TiledWindow& rNewWindow = setupWidgetAndCreateWindow(pDocView, 
bTiledAnnotations);
 // Hide the unused progress bar.
 gtk_widget_show_all(rNewWindow.m_pStatusBar);
 gtk_widget_hide(rNewWindow.m_pProgressBar);
@@ -988,17 +994,20 @@ static void createView(GtkWidget* pButton, gpointer 
/*pItem*/)
 static void createModelAndView(const char* pLOPath, const char* pDocPath, 
const std::vector& rArguments)
 {
 std::string aUserProfile;
+gboolean bTiledAnnotations = FALSE;
 for (size_t i = 0; i < rArguments.size(); ++i)
 {
 const std::string& rArgument = rArguments[i];
 if (rArgument == "--user-profile" && i + 1 < rArguments.size())
 aUserProfile = std::string("vnd.sun.star.pathname:")
 + rArguments[i + 1].c_str();
+else if (rArgument == "--enable-tiled-annotations")
+bTiledAnnotations = TRUE;
 }
 const gchar* pUserProfile = aUserProfile.empty() ? nullptr : 
aUserProfile.c_str();
 GtkWidget* pDocView = lok_doc_view_new_from_user_profile(pLOPath, 
pUserProfile, nullptr, nullptr);
 
-TiledWindow& rWindow = setupWidgetAndCreateWindow(pDocView);
+TiledWindow& rWindow = setupWidgetAndCreateWindow(pDocView, 
bTiledAnnotations);
 
 boost::property_tree::ptree aTree;
 for (size_t i = 0; i < rArguments.size(); ++i)
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 1cd2c05..80d40f5 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -299,6 +299,7 @@ enum
 PROP_CAN_ZOOM_OUT,
 PROP_DOC_PASSWORD,
 PROP_DOC_PASSWORD_TO_MODIFY,
+PROP_TILED_ANNOTATIONS,
 
 PROP_LAST
 };
@@ -2465,6 +2466,7 @@ static void lok_doc_view_set_property (GObject* object, 
guint propId, const GVal
 LOKDocViewPrivate& priv = getPrivate(pDocView);
 gboolean bDocPasswordEnabled = priv->m_nLOKFeatures & 

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source svl/source

[Miklos Vajna]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |  108 +++-
 libreofficekit/source/gtk/lokdocview.cxx|2 
 svl/source/undo/undo.cxx|4 
 3 files changed, 110 insertions(+), 4 deletions(-)

New commits:
commit a141cba76606c7dcc4965f0a25cc9a4ff2d8879e
Author: Miklos Vajna 
Date:   Fri Aug 5 18:01:06 2016 +0200

gtktiledviewer: expose undo/redo info in a repair document dialog

This shows the full undo and redo stack, with all the metadata available
via the LOK API.

Also fix SfxUndoManager::GetRedoActionsInfo(), so it's easy to show the
undo/redo stack in linear time; and fix a use-after-free in lokdocview.

Change-Id: I66625ed453efa61b5738d99d7d1ad8f468908240
Reviewed-on: https://gerrit.libreoffice.org/27913
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 37cf7e2..eaf1555 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -441,6 +441,106 @@ static void addMoreUnoParam(GtkWidget* /*pWidget*/, 
gpointer userdata)
 gtk_widget_show_all(pUnoParamAreaBox);
 }
 
+static void documentRepair(GtkWidget* pButton, gpointer /*pItem*/)
+{
+TiledWindow& rWindow = lcl_getTiledWindow(pButton);
+LOKDocView* pDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
+// Get the data.
+LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pDocView);
+// How it in linear time, so first redo in reverse order, then undo.
+std::vector aTypes = {".uno:Redo", ".uno:Undo"};
+std::vector aTrees;
+for (size_t nType = 0; nType < aTypes.size(); ++nType)
+{
+const std::string& rType = aTypes[nType];
+char* pValues = pDocument->pClass->getCommandValues(pDocument, 
rType.c_str());
+std::stringstream aInfo;
+aInfo << "lok::Document::getCommandValues('" << rType << "') returned 
'" << pValues << "'" << std::endl;
+g_info("%s", aInfo.str().c_str());
+std::stringstream aStream(pValues);
+free(pValues);
+assert(!aStream.str().empty());
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+aTrees.push_back(aTree);
+}
+
+// Create the dialog.
+GtkWidget* pDialog = gtk_dialog_new_with_buttons("Repair document",
+ GTK_WINDOW 
(gtk_widget_get_toplevel(GTK_WIDGET(pDocView))),
+ GTK_DIALOG_MODAL,
+ "Jump to state",
+ GTK_RESPONSE_OK,
+ nullptr);
+GtkWidget* pContentArea = gtk_dialog_get_content_area(GTK_DIALOG 
(pDialog));
+
+// Build the table.
+GtkTreeStore* pTreeStore = gtk_tree_store_new(5, G_TYPE_STRING, 
G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+for (size_t nTree = 0; nTree < aTrees.size(); ++nTree)
+{
+const auto& rTree = aTrees[nTree];
+for (const auto& rValue : rTree.get_child("actions"))
+{
+GtkTreeIter aTreeIter;
+gtk_tree_store_append(pTreeStore, , nullptr);
+gtk_tree_store_set(pTreeStore, ,
+   0, aTypes[nTree].c_str(),
+   1, rValue.second.get("index"),
+   2, 
rValue.second.get("comment").c_str(),
+   3, 
rValue.second.get("viewId").c_str(),
+   4, 
rValue.second.get("dateTime").c_str(),
+   -1);
+}
+}
+GtkWidget* pTreeView = 
gtk_tree_view_new_with_model(GTK_TREE_MODEL(pTreeStore));
+std::vector aColumns = {"Type", "Index", "Comment", "View 
ID", "Timestamp"};
+for (size_t nColumn = 0; nColumn < aColumns.size(); ++nColumn)
+{
+GtkCellRenderer* pRenderer = gtk_cell_renderer_text_new();
+GtkTreeViewColumn* pColumn = 
gtk_tree_view_column_new_with_attributes(aColumns[nColumn].c_str(),
+  
pRenderer,
+  
"text", nColumn,
+  
nullptr);
+gtk_tree_view_append_column(GTK_TREE_VIEW(pTreeView), pColumn);
+}
+gtk_box_pack_start(GTK_BOX(pContentArea), pTreeView, TRUE, TRUE, 2);
+
+// Show the dialog.
+gtk_widget_show_all(pDialog);
+gint res = gtk_dialog_run(GTK_DIALOG(pDialog));
+
+// Dispatch the matching command, if necessary.
+if (res == GTK_RESPONSE_OK)
+{
+

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Miklos Vajna]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |2 -
 libreofficekit/source/gtk/lokdocview.cxx|   28 +++-
 2 files changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 99f05d9947db2dd0676fafa66106d17e4d8eea6d
Author: Miklos Vajna 
Date:   Fri Jul 15 15:37:51 2016 +0200

gtktiledviewer: allow testing of destroyView()

By calling it when we're not the last window.

Change-Id: I6fd4763243fc088ccfe015b6c03b6b3f25146fac

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index f0aabdf..f80b506 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -1206,7 +1206,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
 GtkWidget *pWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW(pWindow), "LibreOfficeKit GTK Tiled 
Viewer");
 gtk_window_set_default_size(GTK_WINDOW(pWindow), 1280, 720);
-g_signal_connect(pWindow, "destroy", G_CALLBACK(gtk_main_quit), 0);
+g_signal_connect(pWindow, "destroy", G_CALLBACK(gtk_widget_destroy), 
pWindow);
 
 rWindow.m_pVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 gtk_container_add(GTK_CONTAINER(pWindow), rWindow.m_pVBox);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 613a909..0c9d135 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -155,6 +155,9 @@ struct LOKDocViewPrivateImpl
 GdkRectangle m_aVisibleArea;
 bool m_bVisibleAreaSet;
 
+/// Event source ID for handleTimeout() of this widget.
+guint m_nTimeoutId;
+
 LOKDocViewPrivateImpl()
 : m_aLOPath(nullptr),
 m_pUserProfileURL(nullptr),
@@ -196,11 +199,17 @@ struct LOKDocViewPrivateImpl
 m_nViewId(0),
 m_nTileSizeTwips(0),
 m_aVisibleArea({0, 0, 0, 0}),
-m_bVisibleAreaSet(false)
+m_bVisibleAreaSet(false),
+m_nTimeoutId(0)
 {
 memset(_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));
 memset(_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles));
 }
+
+~LOKDocViewPrivateImpl()
+{
+g_source_remove(m_nTimeoutId);
+}
 };
 
 /// Wrapper around LOKDocViewPrivateImpl, managed by malloc/memset/free.
@@ -873,7 +882,7 @@ static gboolean postDocumentLoad(gpointer pData)
 priv->m_pDocument->pClass->getDocumentSize(priv->m_pDocument, 
>m_nDocumentWidthTwips, >m_nDocumentHeightTwips);
 priv->m_nParts = priv->m_pDocument->pClass->getParts(priv->m_pDocument);
 aGuard.unlock();
-g_timeout_add(600, handleTimeout, pLOKDocView);
+priv->m_nTimeoutId = g_timeout_add(600, handleTimeout, pLOKDocView);
 
 float zoom = priv->m_fZoom;
 long nDocumentWidthTwips = priv->m_nDocumentWidthTwips;
@@ -2385,10 +2394,17 @@ static void lok_doc_view_finalize (GObject* object)
 LOKDocView* pDocView = LOK_DOC_VIEW (object);
 LOKDocViewPrivate& priv = getPrivate(pDocView);
 
-if (priv->m_pDocument)
-priv->m_pDocument->pClass->destroy (priv->m_pDocument);
-if (priv->m_pOffice)
-priv->m_pOffice->pClass->destroy (priv->m_pOffice);
+if (priv->m_pDocument && 
priv->m_pDocument->pClass->getViews(priv->m_pDocument) > 1)
+{
+priv->m_pDocument->pClass->destroyView(priv->m_pDocument, 
priv->m_nViewId);
+}
+else
+{
+if (priv->m_pDocument)
+priv->m_pDocument->pClass->destroy (priv->m_pDocument);
+if (priv->m_pOffice)
+priv->m_pOffice->pClass->destroy (priv->m_pOffice);
+}
 delete priv.m_pImpl;
 priv.m_pImpl = nullptr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   85 
 libreofficekit/source/gtk/lokdocview.cxx|   25 +
 2 files changed, 93 insertions(+), 17 deletions(-)

New commits:
commit a9b266aeea80423210618fe4c015e4791ceb1bc2
Author: Pranav Kant pran...@gnome.org
Date:   Sat Aug 15 18:48:11 2015 +0530

gtktiledviewer: Jump to cursor position when it changes

Change-Id: If50ac0bd21e59b0e0639aa353513451e88ae2a9f

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 73db976..8de7110 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -57,6 +57,25 @@ static void lcl_registerToolItem(GtkToolItem* pItem, const 
std::string rName)
 
 const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 };
 
+
+/// Get the visible area of the scrolled window
+static void getVisibleAreaTwips(GdkRectangle* pArea)
+{
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size()
+GtkAdjustment* pHAdjustment = 
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
+GtkAdjustment* pVAdjustment = 
gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
+
+pArea-x  = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
+   
gtk_adjustment_get_value(pHAdjustment));
+pArea-y  = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
+   
gtk_adjustment_get_value(pVAdjustment));
+pArea-width  = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
+   
gtk_adjustment_get_page_size(pHAdjustment));
+pArea-height = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
+   
gtk_adjustment_get_page_size(pVAdjustment));
+#endif
+}
+
 static void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
 {
 const char *sName = gtk_tool_button_get_icon_name( 
GTK_TOOL_BUTTON(pButton) );
@@ -175,23 +194,6 @@ static void doCopy(GtkWidget* /*pButton*/, gpointer 
/*pItem*/)
 free(pUsedFormat);
 }
 
-/// Get the visible area of the scrolled window
-static void getVisibleAreaTwips(GdkRectangle* pArea)
-{
-#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size()
-GtkAdjustment* pHAdjustment = 
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
-GtkAdjustment* pVAdjustment = 
gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
-
-pArea-x  = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
-   
gtk_adjustment_get_value(pHAdjustment));
-pArea-y  = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
-   
gtk_adjustment_get_value(pVAdjustment));
-pArea-width  = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
-   
gtk_adjustment_get_page_size(pHAdjustment));
-pArea-height = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
-   
gtk_adjustment_get_page_size(pVAdjustment));
-#endif
-}
 
 /// Searches for the next or previous text of pFindbarEntry.
 static void doSearch(bool bBackwards)
@@ -319,6 +321,54 @@ static void signalHyperlink(LOKDocView* /*pLOKDocView*/, 
char* pPayload, gpointe
 }
 }
 
+/// Cursor position changed
+static void cursorChanged(LOKDocView* /*pDocView*/, gint nX, gint nY,
+  gint /*nWidth*/, gint /*nHeight*/, gpointer 
/*pData*/)
+{
+GtkAdjustment* vadj = 
gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
+GtkAdjustment* hadj = 
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
+GdkRectangle visArea;
+gdouble upper;
+gint x = -1, y = -1;
+
+getVisibleAreaTwips(visArea);
+
+// check vertically
+if (nY  visArea.y)
+{
+y = nY - visArea.height/2;
+if (y  0)
+y = gtk_adjustment_get_lower(vadj);
+}
+else if (nY  visArea.y + visArea.height)
+{
+y = nY - visArea.height/2;
+upper = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView), 
gtk_adjustment_get_upper(vadj));
+if (y  upper)
+y = upper;
+
+}
+
+if (nX  visArea.x)
+{
+x = nX - visArea.width/2;
+if (x  0)
+x = gtk_adjustment_get_lower(hadj);
+}
+else if (nX  visArea.x + visArea.width)
+{
+x = nX - visArea.width/2;
+upper = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView), 
gtk_adjustment_get_upper(hadj));
+if (x  upper)
+x = upper;
+}
+
+if (y!=-1)
+gtk_adjustment_set_value(vadj, 
lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), y));
+if (x!=-1)
+gtk_adjustment_set_value(hadj, 

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Stephan Bergmann]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |2 +-
 libreofficekit/source/gtk/lokdocview.cxx|   16 +---
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 45b82d9f6d99fb059039f1ef05060b364aecb104
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Mar 16 12:21:05 2015 +0100

libreofficekit: various loplugin fixes

Change-Id: I317f8f5397bfeb9c0d6ecaaa656cb31e66eece0b

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 92ffdd4..716bcc2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -112,7 +112,7 @@ void toggleEditing(GtkWidget* /*pButton*/, gpointer 
/*pItem*/)
 {
 LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
 bool bActive = 
gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(pEnableEditing));
-if (lok_docview_get_edit(pLOKDocView) != bActive)
+if (bool(lok_docview_get_edit(pLOKDocView)) != bActive)
 lok_docview_set_edit(pLOKDocView, bActive);
 }
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 1f542b5..c0f2130 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -29,8 +29,8 @@
 // Number of handles around a graphic selection.
 #define GRAPHIC_HANDLE_COUNT 8
 
-static void lok_docview_class_init( LOKDocViewClass* pClass );
-static void lok_docview_init( LOKDocView* pDocView );
+static void lok_docview_class_init( gpointer );
+static void lok_docview_init( GTypeInstance *, gpointer );
 static float pixelToTwip(float nInput);
 static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* pEvent, 
gpointer pData);
 
@@ -301,8 +301,8 @@ SAL_DLLPUBLIC_EXPORT guint lok_docview_get_type()
 pName,
 sizeof( LOKDocView ),
 sizeof( LOKDocViewClass ),
-(GtkClassInitFunc) lok_docview_class_init,
-(GtkObjectInitFunc) lok_docview_init,
+lok_docview_class_init,
+lok_docview_init,
 NULL,
 NULL,
 (GtkClassInitFunc) NULL
@@ -321,8 +321,9 @@ enum
 
 static guint docview_signals[LAST_SIGNAL] = { 0 };
 
-static void lok_docview_class_init( LOKDocViewClass* pClass )
+static void lok_docview_class_init( gpointer ptr )
 {
+LOKDocViewClass* pClass = static_castLOKDocViewClass *(ptr);
 GObjectClass *gobject_class = G_OBJECT_CLASS(pClass);
 pClass-edit_changed = NULL;
 docview_signals[EDIT_CHANGED] =
@@ -336,8 +337,9 @@ static void lok_docview_class_init( LOKDocViewClass* pClass 
)
  G_TYPE_BOOLEAN);
 }
 
-static void lok_docview_init( LOKDocView* pDocView )
+static void lok_docview_init( GTypeInstance *, gpointer ptr )
 {
+LOKDocView* pDocView = static_castLOKDocView *(ptr);
 // Gtk ScrolledWindow is apparently not fully initialised yet, we 
specifically
 // have to set the [hv]adjustment to prevent GTK assertions from firing, 
see
 // https://bugzilla.gnome.org/show_bug.cgi?id=438114 for more info.
@@ -878,7 +880,7 @@ static gboolean lok_docview_callback(gpointer pData)
 }
 break;
 default:
-g_assert(0);
+g_assert(false);
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Matúš Kukan]

 libreofficekit/qa/unit/tiledrendering.cxx |3 ++-
 libreofficekit/source/shim.c  |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a95934d8dbd91e3c6250578171483859cb11f3c2
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Thu Jul 17 10:35:49 2014 +0200

Fix some CppunitTest_libreofficekit_tiledrendering related problems

Change-Id: Icdcde0af1b3d5744ef2842e4b4d2b85a094ac686

diff --git a/libreofficekit/qa/unit/tiledrendering.cxx 
b/libreofficekit/qa/unit/tiledrendering.cxx
index d48e304..67fa62e 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -42,7 +42,8 @@ public:
 void TiledRenderingTest::testOverlay()
 {
 const string sSrcRoot = getenv( SRC_ROOT );
-const string sLOPath = sSrcRoot + /instdir/program;
+const string sInstDir = getenv( INSTDIR );
+const string sLOPath = sInstDir + /program;
 const string sDocPath = sSrcRoot + 
/odk/examples/java/DocumentHandling/test/test1.odt;
 
 scoped_ptr Office  pOffice( lok_cpp_init(
diff --git a/libreofficekit/source/shim.c b/libreofficekit/source/shim.c
index ac272e8..b533a61 100644
--- a/libreofficekit/source/shim.c
+++ b/libreofficekit/source/shim.c
@@ -22,7 +22,7 @@
 #endif
 
 #define TARGET_LIBlib sofficeapp .so
-#define TARGET_MERGED_LIB lib libmergedlo .so
+#define TARGET_MERGED_LIB lib mergedlo .so
 
 typedef LibreOfficeKit *(HookFunction)( const char *install_path);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits