diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-13 21:22:43 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-13 21:22:43 +0000 |
| commit | 5fdab345ed60a124a25aa0efecd36b4307b72681 (patch) | |
| tree | 9da8eae3a08679edbbb5994b6b2681a2c81b97f1 /src/extension/internal/odf.cpp | |
| parent | Prevent crashing on windows systems due to locale issues (diff) | |
| parent | cppcheck (diff) | |
| download | inkscape-5fdab345ed60a124a25aa0efecd36b4307b72681.tar.gz inkscape-5fdab345ed60a124a25aa0efecd36b4307b72681.zip | |
merge from trunk (r12201)
(bzr r11668.1.57)
Diffstat (limited to 'src/extension/internal/odf.cpp')
| -rw-r--r-- | src/extension/internal/odf.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 47671a8d2..4c27925ae 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -80,16 +80,15 @@ //# DOM-specific includes #include "dom/dom.h" #include "dom/util/ziptool.h" -#include "dom/io/domstream.h" -#include "dom/io/bufferstream.h" -#include "dom/io/stringstream.h" +//#include "dom/io/domstream.h" #include "inkscape-version.h" #include "document.h" #include "extension/extension.h" - +#include "io/inkscapestream.h" +#include "io/bufferstream.h" namespace Inkscape { @@ -97,15 +96,12 @@ namespace Extension { namespace Internal { - - - //# Shorthand notation typedef org::w3c::dom::DOMString DOMString; -typedef org::w3c::dom::XMLCh XMLCh; -typedef org::w3c::dom::io::OutputStreamWriter OutputStreamWriter; -typedef org::w3c::dom::io::BufferOutputStream BufferOutputStream; -typedef org::w3c::dom::io::StringOutputStream StringOutputStream; +typedef Inkscape::IO::BufferOutputStream BufferOutputStream; +typedef Inkscape::IO::OutputStreamWriter OutputStreamWriter; +typedef Inkscape::IO::StringOutputStream StringOutputStream; + //######################################################################## //# C L A S S SingularValueDecomposition |