projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
output
/
odt.c
diff --git
a/src/output/odt.c
b/src/output/odt.c
index 686e7149c3b68b34002308e1147c3ebbd08eb756..2bf1f2956e47a8e498ce4d0e2be17da1a4529b76 100644
(file)
--- a/
src/output/odt.c
+++ b/
src/output/odt.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-31,6
+31,7
@@
#include "libpspp/assertion.h"
#include "libpspp/cast.h"
#include "libpspp/assertion.h"
#include "libpspp/cast.h"
+#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/temp-file.h"
#include "libpspp/version.h"
#include "libpspp/str.h"
#include "libpspp/temp-file.h"
#include "libpspp/version.h"
@@
-44,7
+45,6
@@
#include "output/text-item.h"
#include "gl/xalloc.h"
#include "output/text-item.h"
#include "gl/xalloc.h"
-#include "gl/error.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-91,7
+91,7
@@
create_mimetype (struct zip_writer *zip)
fp = create_temp_file ();
if (fp == NULL)
{
fp = create_temp_file ();
if (fp == NULL)
{
-
error (0,
errno, _("error creating temporary file"));
+
msg_error (
errno, _("error creating temporary file"));
return false;
}
return false;
}
@@
-517,7
+517,8
@@
odt_submit (struct output_driver *driver,
}
}
}
}
-struct output_driver_factory odt_driver_factory = { "odt", odt_create };
+struct output_driver_factory odt_driver_factory =
+ { "odt", "pspp.odf", odt_create };
static const struct output_driver_class odt_driver_class =
{
static const struct output_driver_class odt_driver_class =
{