Commit 68775a25 authored by Jody Goldberg's avatar Jody Goldberg

- Some minor fixes to handle attemptingto open a directory.

- Ensure that config.h is included in all the XL layer files.
parent ee98c351
1999-10-03 Jody Goldberg <jgoldberg@home.com>
* boot.c (excel_probe) : Only free the MsOle object if it
was created successfully.
1999-10-02 Jody Goldberg <jgoldberg@home.com>
* *.c : Ensure that we include config.h first.
* *.[ch] : Update and add Copyright notices.
1999-09-29 Jody Goldberg <jgoldberg@home.com>
* ms-excel-read.c (ms_excel_read_cell:MULBLANK) : Insert blanks in
......
......@@ -8,6 +8,7 @@
**/
#include <stdio.h>
#include <sys/stat.h>
#include <config.h>
#include <gnome.h>
#include "gnumeric.h"
......@@ -25,12 +26,13 @@ static gboolean
excel_probe (const char *filename)
{
MsOle *f;
MsOleErr result;
result = ms_ole_open (&f, filename);
ms_ole_destroy (&f);
if (ms_ole_open (&f, filename) == MS_OLE_ERR_OK) {
ms_ole_destroy (&f);
return TRUE;
}
return result == MS_OLE_ERR_OK;
return FALSE;
}
static gboolean
......
......@@ -9,6 +9,7 @@
* (C) 1999 Jody Goldberg
**/
#include <config.h>
#include "gnumeric-chart.h"
GnumericChart *
......
1999-10-03 Jody Goldberg <jgoldberg@home.com>
* ms-ole.c (ms_ole_destroy) : Quick and dirty test to
avoid freeing the magic ptr on exit when we have a
failure during intialization.
1999-09-30 Arturo Tena <arturo@directmail.org>
* ms-ole.c: Cleanup the code.
......
......@@ -1520,7 +1520,9 @@ ms_ole_destroy (MsOle **ptr)
if (f->dirty)
ms_ole_cleanup (f);
if (f->ole_mmap) {
if (f->mem == (void *)0xdeadbeef)
f->mem = NULL;
else if (f->ole_mmap) {
munmap (f->mem, f->length);
} else {
guint32 i;
......
......@@ -16,8 +16,9 @@
#include <malloc.h>
#include <assert.h>
#include <ctype.h>
#include <glib.h>
#include <config.h>
#include <glib.h>
#include "ms-ole.h"
#include "ms-biff.h"
#include "biff-types.h"
......
......@@ -7,6 +7,9 @@
* (C) 1999 Jody Goldberg
**/
#include <stdio.h>
#include <config.h>
#include "excel.h"
#include "ms-chart.h"
#include "ms-formula-read.h"
......@@ -15,8 +18,6 @@
#include "utils.h"
#include "gnumeric-chart.h"
#include <stdio.h>
/* #define NO_DEBUG_EXCEL */
extern int ms_excel_chart_debug;
......
......@@ -12,7 +12,7 @@
#include <stdio.h>
#include "config.h"
#include <config.h>
#include "ms-escher.h"
#include "escher-types.h"
#include "biff-types.h"
......
......@@ -8,13 +8,14 @@
* (C) 1998, 1999 Michael Meeks, Jody Goldberg
**/
#include <config.h>
#include "ms-formula-read.h"
#include "ms-excel-read.h"
#include "ms-obj.h"
#include "ms-chart.h"
#include "gnumeric-chart.h"
#include "ms-escher.h"
#include "print-info.h"
#include "selection.h"
#include "utils.h" /* for cell_name */
......
......@@ -13,11 +13,11 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <config.h>
#include <stdio.h>
#include <ctype.h>
#include <math.h>
#include <config.h>
#include <gnome.h>
#include "gnumeric.h"
......
......@@ -9,8 +9,9 @@
#include <fcntl.h>
#include <assert.h>
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <gnome.h>
#include "gnumeric.h"
#include "func.h"
......
......@@ -10,9 +10,11 @@
#include <fcntl.h>
#include <assert.h>
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <gnome.h>
#include "gnumeric.h"
#include "func.h"
......
......@@ -8,6 +8,7 @@
* (C) 1998, 1999 Jody Goldberg, Michael Meeks
**/
#include <config.h>
#include "ms-obj.h"
#include "ms-chart.h"
#include "ms-escher.h"
......
......@@ -9,8 +9,8 @@
#include <stdio.h>
#include <config.h>
#include <glib.h>
#include "ms-ole.h"
#include "ms-ole-summary.h"
#include "ms-biff.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment