projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove string stat_version
[pspp]
/
src
/
output
/
odt.c
diff --git
a/src/output/odt.c
b/src/output/odt.c
index a29c045d0b67e8920344a0e3e0b6f6a5f99f4db8..521e5b877fd1f905681ce9f3c67cbf384f1acdaa 100644
(file)
--- a/
src/output/odt.c
+++ b/
src/output/odt.c
@@
-36,6
+36,7
@@
#include "libpspp/temp-file.h"
#include "libpspp/version.h"
#include "libpspp/zip-writer.h"
#include "libpspp/temp-file.h"
#include "libpspp/version.h"
#include "libpspp/zip-writer.h"
+#include "data/file-handle-def.h"
#include "output/driver-provider.h"
#include "output/message-item.h"
#include "output/options.h"
#include "output/driver-provider.h"
#include "output/message-item.h"
#include "output/options.h"
@@
-244,7
+245,7
@@
write_meta_data (struct odt_driver *odt)
xmlTextWriterStartElement (w, _xml ("office:meta"));
{
xmlTextWriterStartElement (w, _xml ("meta:generator"));
xmlTextWriterStartElement (w, _xml ("office:meta"));
{
xmlTextWriterStartElement (w, _xml ("meta:generator"));
- xmlTextWriterWriteString (w, _xml (
stat_
version));
+ xmlTextWriterWriteString (w, _xml (version));
xmlTextWriterEndElement (w);
}
xmlTextWriterEndElement (w);
}
@@
-290,12
+291,13
@@
write_meta_data (struct odt_driver *odt)
}
static struct output_driver *
}
static struct output_driver *
-odt_create (
const char *file_name
, enum settings_output_devices device_type,
+odt_create (
struct file_handle *fh
, enum settings_output_devices device_type,
struct string_map *o UNUSED)
{
struct output_driver *d;
struct odt_driver *odt;
struct zip_writer *zip;
struct string_map *o UNUSED)
{
struct output_driver *d;
struct odt_driver *odt;
struct zip_writer *zip;
+ const char *file_name = fh_get_file_name (fh);
zip = zip_writer_create (file_name);
if (zip == NULL)
zip = zip_writer_create (file_name);
if (zip == NULL)
@@
-303,6
+305,7
@@
odt_create (const char *file_name, enum settings_output_devices device_type,
odt = xzalloc (sizeof *odt);
d = &odt->driver;
odt = xzalloc (sizeof *odt);
d = &odt->driver;
+
output_driver_init (d, &odt_driver_class, file_name, device_type);
odt->zip = zip;
output_driver_init (d, &odt_driver_class, file_name, device_type);
odt->zip = zip;