diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-02-15 17:41:43 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-02-15 17:41:43 +0000 |
| commit | f986ce1bf97a05515103c828a42ff9a77a244c02 (patch) | |
| tree | d65419c34b2c3b97230d282d508384565e477109 /src/dom/io/domstream.cpp | |
| parent | Removed unused function (diff) | |
| parent | Bug #561503: fix typo in earlier fix (r11133) (diff) | |
| download | inkscape-f986ce1bf97a05515103c828a42ff9a77a244c02.tar.gz inkscape-f986ce1bf97a05515103c828a42ff9a77a244c02.zip | |
Merge to trunk
(bzr r11950.2.3)
Diffstat (limited to 'src/dom/io/domstream.cpp')
| -rw-r--r-- | src/dom/io/domstream.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp index de221f855..21d09662a 100644 --- a/src/dom/io/domstream.cpp +++ b/src/dom/io/domstream.cpp @@ -510,7 +510,7 @@ void BasicOutputStream::flush() /** * Writes the specified byte to this output stream. */ -int BasicOutputStream::put(XMLCh ch) +int BasicOutputStream::put(gunichar ch) { if (closed) return -1; @@ -886,7 +886,7 @@ void BasicWriter::flush() /** * Writes the specified byte to this output writer. */ -int BasicWriter::put(XMLCh ch) +int BasicWriter::put(gunichar ch) { if (destination && destination->put(ch)>=0) return 1; @@ -1079,7 +1079,7 @@ void OutputStreamWriter::flush() * Overloaded to redirect the output chars from the next Writer * in the chain to an OutputStream instead. */ -int OutputStreamWriter::put(XMLCh ch) +int OutputStreamWriter::put(gunichar ch) { //Do we need conversions here? int intCh = (int) ch; @@ -1133,11 +1133,10 @@ void StdWriter::flush() * Overloaded to redirect the output chars from the next Writer * in the chain to an OutputStream instead. */ -int StdWriter::put(XMLCh ch) +int StdWriter::put(gunichar ch) { //Do we need conversions here? - int intCh = (int) ch; - if (outputStream->put(intCh) < 0) + if (outputStream->put(ch) < 0) return -1; return 1; } |