Update handling of multi-byte strings

diff --git a/odcread.cc b/odcread.cc
index 24bb51ea68a0fa9e8706ac8a42aa11b94871c6fb..e790fdd36bcdc3b211d3c4d277cf9462ee6db3dd 100644 (file)
--- a/odcread.cc
+++ b/odcread.cc
@@ -85,8 +85,9 @@ namespace odc {
                        d_context.top()->addPiece(text);
                }
                virtual void textLongPiece(const LongPiece *piece) {
-                       std::string text = piece->getText();
-                       d_context.top()->addPiece(text);
+                       throw "Long Piece not handled";
+                       //std::string text = piece->getText();
+                       //d_context.top()->addPiece(text);
                }
        };
 

diff --git a/textmodel.cc b/textmodel.cc
index f9dbae242b007f39c8438e7dfae1708cae626a8c..56bedbae3aa34a82d08c8249a16796fcb71099b8 100644 (file)
--- a/textmodel.cc
+++ b/textmodel.cc
@@ -182,8 +182,8 @@ std::string LongPiece::toString() const {
        return std::string("LongPiece(FIXME)");// + std::wstring((wchar_t*)d_buf) + std::string(")");
 }
 
-std::string LongPiece::getText() const {
-       return std::string("FIXME");// + std::wstring((wchar_t*)d_buf) + std::string(")");
+std::wstring LongPiece::getText() const {
+       return std::wstring((wchar_t*)d_buf);
 }
 
 void LongPiece::accept(Visitor &visitor) const {

diff --git a/textmodel.h b/textmodel.h
index 92d387a61b5596595b4dd985c9f1c36692671755..07a8f646c56760606adf5607623a3a5260dd7d46 100644 (file)
--- a/textmodel.h
+++ b/textmodel.h
@@ -37,7 +37,7 @@ namespace odc {
                ~LongPiece();
                virtual void read(Reader &reader);
                virtual std::string toString() const;
-               virtual std::string getText() const;
+               virtual std::wstring getText() const;
                virtual void accept(Visitor &visitor) const;
        };