diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-20 10:16:07 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-23 09:19:06 +0100 |
| commit | 2730944192b84c8c0fc384c773f867e765790b58 (patch) | |
| tree | 5c2df315cfe25ab722f6ae77f46a0d7b17cf59ac /libreofficekit/qa | |
| parent | a20167ba502384144b20090ab7e144f25e38767e (diff) | |
lokdocview: add lok_docview_get_document()
And move private data out of LibreOfficeKitGtk.h, so that clients are
forced to use the getter/setter functions.
Change-Id: I6565312b5ec5a8e882c3763164ff5aa81ed9720c
Diffstat (limited to 'libreofficekit/qa')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index e9aeed66cf2f..94433f1d06c7 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -126,7 +126,7 @@ static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* pEvent, gpointer /*pD int nCharCode = 0; int nKeyCode = 0; - if (!pLOKDocView->m_bEdit) + if (!lok_docview_get_edit(pLOKDocView)) { g_info("signalKey: not in edit mode, ignore"); return; @@ -171,10 +171,11 @@ static void signalKey(GtkWidget* /*pWidget*/, GdkEventKey* pEvent, gpointer /*pD if (pEvent->state & GDK_SHIFT_MASK) nKeyCode |= KEY_SHIFT; + LibreOfficeKitDocument* pDocument = lok_docview_get_document(pLOKDocView); if (pEvent->type == GDK_KEY_RELEASE) - pLOKDocView->pDocument->pClass->postKeyEvent(pLOKDocView->pDocument, LOK_KEYEVENT_KEYUP, nCharCode, nKeyCode); + pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, nCharCode, nKeyCode); else - pLOKDocView->pDocument->pClass->postKeyEvent(pLOKDocView->pDocument, LOK_KEYEVENT_KEYINPUT, nCharCode, nKeyCode); + pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, nCharCode, nKeyCode); } // GtkComboBox requires gtk 2.24 or later @@ -340,7 +341,7 @@ int main( int argc, char* argv[] ) int bOpened = lok_docview_open_document( LOK_DOCVIEW(pDocView), argv[2] ); if (!bOpened) g_error("main: lok_docview_open_document() failed with '%s'", pOffice->pClass->getError(pOffice)); - assert( LOK_DOCVIEW(pDocView)->pDocument ); + assert(lok_docview_get_document(LOK_DOCVIEW(pDocView))); // GtkComboBox requires gtk 2.24 or later #if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION > 2 |