summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/odf.cpp
diff options
context:
space:
mode:
authorPeter Moulder <peter.moulder@monash.edu>2007-10-11 13:46:40 +0000
committerpjrm <pjrm@users.sourceforge.net>2007-10-11 13:46:40 +0000
commitc3899dac849638c01931b598ff7e4a4c4a484d93 (patch)
tree35e8e08fcf85ab1db7750a79509f900eb9baee2e /src/extension/internal/odf.cpp
parentFix g_return_if_fail failure: It can validly happen that fit_canvas_to_select... (diff)
downloadinkscape-c3899dac849638c01931b598ff7e4a4c4a484d93.tar.gz
inkscape-c3899dac849638c01931b598ff7e4a4c4a484d93.zip
Avoid string literal char* warnings on g++-4.2: change some functions to take char const* rather than char*.
(bzr r3874)
Diffstat (limited to 'src/extension/internal/odf.cpp')
-rw-r--r--src/extension/internal/odf.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index e233515c9..58d19be32 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -884,12 +884,12 @@ int SingularValueDecomposition::rank()
/**
* Get the value of a node/attribute pair
*/
-static Glib::ustring getAttribute( Inkscape::XML::Node *node, char *attrName)
+static Glib::ustring getAttribute( Inkscape::XML::Node *node, char const *attrName)
{
Glib::ustring val;
- char *valstr = (char *)node->attribute(attrName);
+ char const *valstr = node->attribute(attrName);
if (valstr)
- val = (const char *)valstr;
+ val = valstr;
return val;
}
@@ -1175,7 +1175,7 @@ bool OdfOutput::writeManifest(ZipFile &zf)
else if (ext == ".jpg")
outs.printf("image/jpeg");
outs.printf("\" manifest:full-path=\"");
- outs.printf((char *)newName.c_str());
+ outs.printf(newName.c_str());
outs.printf("\"/>\n");
}
outs.printf("</manifest:manifest>\n");