summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-03-05 08:43:18 +0000
committerJabiertxo Arraiza Zenotz <jtx@jtx.marker.es>2013-03-05 08:43:18 +0000
commita33dbbc4fbad29c187611660d3651bbe57243903 (patch)
tree1260bfa9c376aa441bb26087283ed0014f5986ec /src/extension
parentFix sintax (diff)
parentmerge from branch (diff)
downloadinkscape-a33dbbc4fbad29c187611660d3651bbe57243903.tar.gz
inkscape-a33dbbc4fbad29c187611660d3651bbe57243903.zip
refactor bsplineSpirolive
(bzr r11950.1.44)
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/internal/filter/paint.h2
-rw-r--r--src/extension/internal/odf.cpp32
2 files changed, 7 insertions, 27 deletions
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index ad396e08f..f04dd92f9 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -88,7 +88,7 @@ public:
"<param name=\"noise\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"1000\">10</param>\n"
"<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n"
"</page>\n"
- "<page name=\"graintab\" _gui-text=\""N_("Grain") "\">\n"
+ "<page name=\"graintab\" _gui-text=\"" N_("Grain") "\">\n"
"<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
"<param name=\"grainxf\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
"<param name=\"grainyf\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 0639ae8d0..bd74ba47c 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -83,8 +83,8 @@
#include "dom/io/stringstream.h"
+#include "inkscape-version.h"
#include "document.h"
-
#include "extension/extension.h"
@@ -1240,7 +1240,8 @@ bool OdfOutput::writeMeta(ZipFile &zf)
outs.printf("xmlns:anim=\"urn:oasis:names:tc:opendocument:xmlns:animation:1.0\"\n");
outs.printf("office:version=\"1.0\">\n");
outs.printf("<office:meta>\n");
- outs.printf(" <meta:generator>Inkscape.org - 0.45</meta:generator>\n");
+ Glib::ustring tmp = Glib::ustring(" <meta:generator>Inkscape.org - ") + Inkscape::version_string + "</meta:generator>\n";
+ outs.writeString(tmp);
outs.printf(" <meta:initial-creator>%#s</meta:initial-creator>\n",
creator.c_str());
outs.printf(" <meta:creation-date>%#s</meta:creation-date>\n", date.c_str());
@@ -1465,7 +1466,7 @@ bool OdfOutput::writeStyle(ZipFile &zf)
outs.printf("<!--\n");
outs.printf("*************************************************************************\n");
outs.printf(" E N D O F F I L E\n");
- outs.printf(" Have a nice day - ishmal\n");
+ outs.printf(" Have a nice day\n");
outs.printf("*************************************************************************\n");
outs.printf("-->\n");
outs.printf("\n");
@@ -2170,7 +2171,7 @@ bool OdfOutput::writeStyleFooter(Writer &outs)
outs.printf("<!--\n");
outs.printf("*************************************************************************\n");
outs.printf(" E N D O F F I L E\n");
- outs.printf(" Have a nice day - ishmal\n");
+ outs.printf(" Have a nice day\n");
outs.printf("*************************************************************************\n");
outs.printf("-->\n");
outs.printf("\n");
@@ -2281,7 +2282,7 @@ bool OdfOutput::writeContentFooter(Writer &outs)
outs.printf("<!--\n");
outs.printf("*************************************************************************\n");
outs.printf(" E N D O F F I L E\n");
- outs.printf(" Have a nice day - ishmal\n");
+ outs.printf(" Have a nice day\n");
outs.printf("*************************************************************************\n");
outs.printf("-->\n");
outs.printf("\n");
@@ -2441,27 +2442,6 @@ OdfOutput::check (Inkscape::Extension::Extension */*module*/)
-//########################################################################
-//# I N P U T
-//########################################################################
-
-
-
-//#######################
-//# L A T E R !!! :-)
-//#######################
-
-
-
-
-
-
-
-
-
-
-
-
} //namespace Internal
} //namespace Extension