Commit e44fc4f0 authored by Michael Meeks's avatar Michael Meeks
Browse files

Fix so it compiles; duh.

parent 3b3fe4c9
1999-09-26 Michael Meeks <michael@nuclecu.unam.mx>
* src/Makefile.am (gnumeric_libs): Fix so gnumeric compiles.
1999-09-26 Miguel de Icaza <miguel@gnu.org> 1999-09-26 Miguel de Icaza <miguel@gnu.org>
* src/sheet-object.c (sheet_button_release): Load content from * src/sheet-object.c (sheet_button_release): Load content from
...@@ -28,6 +32,7 @@ ...@@ -28,6 +32,7 @@
* gnumeric.desktop: added Estonian strings * gnumeric.desktop: added Estonian strings
>>>>>>> 1.864
1999-09-25 Michael Meeks <michael@nuclecu.unam.mx> 1999-09-25 Michael Meeks <michael@nuclecu.unam.mx>
* src/dialogs/dialog-zoom.c (dialog_zoom): Correct glade name. * src/dialogs/dialog-zoom.c (dialog_zoom): Correct glade name.
......
1999-09-26 Michael Meeks <michael@nuclecu.unam.mx>
* src/Makefile.am (gnumeric_libs): Fix so gnumeric compiles.
1999-09-26 Miguel de Icaza <miguel@gnu.org> 1999-09-26 Miguel de Icaza <miguel@gnu.org>
* src/sheet-object.c (sheet_button_release): Load content from * src/sheet-object.c (sheet_button_release): Load content from
...@@ -28,6 +32,7 @@ ...@@ -28,6 +32,7 @@
* gnumeric.desktop: added Estonian strings * gnumeric.desktop: added Estonian strings
>>>>>>> 1.864
1999-09-25 Michael Meeks <michael@nuclecu.unam.mx> 1999-09-25 Michael Meeks <michael@nuclecu.unam.mx>
* src/dialogs/dialog-zoom.c (dialog_zoom): Correct glade name. * src/dialogs/dialog-zoom.c (dialog_zoom): Correct glade name.
......
...@@ -695,7 +695,7 @@ decompress_vba (guint8 *data, guint32 len) ...@@ -695,7 +695,7 @@ decompress_vba (guint8 *data, guint32 len)
} }
printf ("\n"); printf ("\n");
for (lp = 0; lp < (dt & BUF_MASK); lp++) { for (lp = 0; lp < (dt & BUF_MASK); lp++) {
guint8 c = buffer[( (dt >> BUF_BITS) + lp ) % BUF_SIZE]; guint8 c = buffer[( pos - (dt >> BUF_BITS) + lp ) % BUF_SIZE];
buffer [pos++ % BUF_SIZE] = c; buffer [pos++ % BUF_SIZE] = c;
printf ("%c", c); printf ("%c", c);
} }
......
...@@ -205,7 +205,7 @@ gnumeric_LDFLAGS = -export-dynamic ...@@ -205,7 +205,7 @@ gnumeric_LDFLAGS = -export-dynamic
gnumeric_libs = \ gnumeric_libs = \
../plugins/excel/libexcel.a \ ../plugins/excel/libexcel.a \
../plugins/excel/libole2/libole2.a \ ../plugins/excel/libole2/libole2.la \
dialogs/libdialogs.a \ dialogs/libdialogs.a \
widgets/libwidgets.a \ widgets/libwidgets.a \
functions/libfunctions.a functions/libfunctions.a
......
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