strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LOK DocView: handle document load failure without crashing.

Browse source 
Change-Id: Icd668b3a7ec3ac58322a6af3f1da6008837d0b6b
This commit is contained in:
Michael Meeks 2014-06-26 11:14:50 +01:00
parent c6bd06cb6d
commit 3c440aad56
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libreofficekit/source/gtk/lokdocview.c
View file

@ -22,8 +22,9 @@ static void lok_docview_init( LOKDocView* pDocView );
void lcl_onDestroy( LOKDocView* pDocView, gpointer pData )
{
(void) pData;
pDocView->pDocument->pClass->destroy( pDocView->pDocument );
pDocView->pDocument = 0;
if ( pDocView->pDocument )
pDocView->pDocument->pClass->destroy( pDocView->pDocument );
pDocView->pDocument = NULL;
}
SAL_DLLPUBLIC_EXPORT guint lok_docview_get_type()
@ -139,15 +140,22 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( LOKDocView* pDocView, c
if ( pDocView->pDocument )
{
pDocView->pDocument->pClass->destroy( pDocView->pDocument );
pDocView->pDocument = 0;
pDocView->pDocument = NULL;
}
pDocView->pDocument = pDocView->pOffice->pClass->documentLoad( pDocView->pOffice,
pPath );
pPath );
if ( !pDocView->pDocument )
{
// FIXME: should have a GError parameter and populate it.
char *pError = pDocView->pOffice->pClass->getError( pDocView->pOffice );
fprintf( stderr, "Error opening document '%s'\n", pError );
return FALSE;
}
else
renderDocument( pDocView );
renderDocument( pDocView );
return FALSE;
return TRUE;
}
SAL_DLLPUBLIC_EXPORT void lok_docview_set_zoom ( LOKDocView* pDocView, float fZoom )