From 3cab04de81abb9cfc4add9a4e2220759d48d8d9a Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 23 Nov 2011 09:34:57 +0000 Subject: [PATCH] *RichText: AsQtf(RichObject) now uses QTF_NOSTYLES flag (fixes issue with changing default style) git-svn-id: svn://ultimatepp.org/upp/trunk@4190 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/RichText/EncodeQtf.cpp | 2 +- uppsrc/RichText/init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/RichText/EncodeQtf.cpp b/uppsrc/RichText/EncodeQtf.cpp index 4df5f07eb..dfbfe41fe 100644 --- a/uppsrc/RichText/EncodeQtf.cpp +++ b/uppsrc/RichText/EncodeQtf.cpp @@ -573,7 +573,7 @@ RichText AsRichText(const RichObject& obj) String AsQTF(const RichObject& obj) { - return AsQTF(AsRichText(obj)); + return AsQTF(AsRichText(obj), CHARSET_UTF8, QTF_NOSTYLES|QTF_BODY); } END_UPP_NAMESPACE diff --git a/uppsrc/RichText/init b/uppsrc/RichText/init index e6bef4f34..d25290c96 100644 --- a/uppsrc/RichText/init +++ b/uppsrc/RichText/init @@ -2,7 +2,7 @@ #define _RichText_icpp_init_stub #include "plugin\png/init" #include "Draw/init" -#define BLITZ_INDEX__ FE62D0E2146FBF4817DC19CA31B694C89 +#define BLITZ_INDEX__ F879f8417b17173ef5a1decd1d548c525 #include "RichImage.icpp" #undef BLITZ_INDEX__ #endif