X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=textmodel.cc;h=c02620c36c9e0dd5c97b31c493f3ebddb827eb0a;hb=e2fd5debfd8b94a6ec77a514962851594f0690f0;hp=f9dbae242b007f39c8438e7dfae1708cae626a8c;hpb=d7f2452e20b04d1559b7bdd3aa49b6fbf7d0abaf;p=odcread.git

diff --git a/textmodel.cc b/textmodel.cc
index f9dbae2..c02620c 100644
--- a/textmodel.cc
+++ b/textmodel.cc
@@ -10,20 +10,12 @@
 namespace odc {
 
 const std::string TextModel::TYPENAME("TextModels.Model^");
-const TypeProxy<TextModel> TextModel::PROXY;
+const TypeProxy<TextModel, ContainerModel> TextModel::PROXY;
 
 TextModel::TextModel(INTEGER id) : ContainerModel(id) {}
 
-const std::string &TextModel::getType() {
-	return TYPENAME;
-}
-
-const std::string *TextModel::getSuper() {
-	return &ContainerModel::getType();
-}
-
 const std::string &TextModel::getTypeName() const {
-	return getType();
+	return TYPENAME;
 }
 
 void TextModel::internalize(Reader &reader) {
@@ -33,20 +25,12 @@ void TextModel::internalize(Reader &reader) {
 }
 
 const std::string StdTextModel::TYPENAME("TextModels.StdModel^");
-const TypeProxy<StdTextModel> StdTextModel::PROXY;
+const TypeProxy<StdTextModel, TextModel> StdTextModel::PROXY;
 
 StdTextModel::StdTextModel(INTEGER id) : TextModel(id), d_pieces() {}
 
-const std::string &StdTextModel::getType() {
-	return TYPENAME;
-}
-
-const std::string *StdTextModel::getSuper() {
-	return &TextModel::getType();
-}
-
 const std::string &StdTextModel::getTypeName() const {
-	return getType();
+	return TYPENAME;
 }
 
 /*
@@ -182,8 +166,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 {