diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-21 16:19:42 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-22 09:05:31 +0100 |
| commit | e518a58dad658cd8aaad10a11816e35ab8bfa07c (patch) | |
| tree | 27c37b386527c082d3ad3d3000ea365db18fbefe /libreofficekit | |
| parent | 16d75204418455c0d9dff13607432dae33a7566e (diff) | |
rhbz#1527945 segv on failed open of password protected doc in gnome-documents
Change-Id: I1bec502ae20d03214c673d8911792c89669c0fe9
Reviewed-on: https://gerrit.libreoffice.org/46922
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/source/gtk/lokdocview.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 3abc2949cae4..2735c77b9f75 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -2235,7 +2235,6 @@ openDocumentInThread (gpointer data) priv->m_pOffice->pClass->registerCallback(priv->m_pOffice, globalCallbackWorker, pDocView); priv->m_pDocument = priv->m_pOffice->pClass->documentLoad( priv->m_pOffice, priv->m_aDocPath ); - priv->m_eDocumentType = static_cast<LibreOfficeKitDocumentType>(priv->m_pDocument->pClass->getDocumentType(priv->m_pDocument)); if ( !priv->m_pDocument ) { char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice ); @@ -2243,6 +2242,7 @@ openDocumentInThread (gpointer data) } else { + priv->m_eDocumentType = static_cast<LibreOfficeKitDocumentType>(priv->m_pDocument->pClass->getDocumentType(priv->m_pDocument)); gdk_threads_add_idle(postDocumentLoad, pDocView); g_task_return_boolean (task, true); } |