diff --git a/uppsrc/RichText/EncodeHTML.cpp b/uppsrc/RichText/EncodeHTML.cpp index 009567bf9..1e8cf6459 100644 --- a/uppsrc/RichText/EncodeHTML.cpp +++ b/uppsrc/RichText/EncodeHTML.cpp @@ -325,7 +325,7 @@ class DefaultHtmlObjectSaver : public HtmlObjectSaver { public: DefaultHtmlObjectSaver(const String& outdir_, const String& namebase_, int imtolerance_, Zoom z_) - : outdir(outdir_), namebase(namebase_), imtolerance(imtolerance_), z(z_), im(0) {} + : outdir(outdir_), namebase(namebase_), z(z_), imtolerance(imtolerance_), im(0) {} virtual String GetHtml(const RichObject& object); diff --git a/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp b/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp index 7ff64dbe9..6a97ae52b 100644 --- a/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp +++ b/uppsrc/Sql/src.tpp/SqlExp$en-us.tpp @@ -407,8 +407,16 @@ topic "SqlExp in examples"; [s0;%- [/R+75 Note: Based on .sch file REFERENCES]] :: [s0;%- [C1 Select(TABLE1(][*C1 SqlAll][C1 ()))]&] [s0;%- [C1 .From(TABLE1)]] -:: [s0;%- [C1 select TABLE1.][*C1 `*][C1 from TABLE1]] -:: [s0;%- [C1 Select(][*C1 SqlAll][C1 ().Of(TABLE1))]&] +::^ [s0;%- [C1 select TABLE1.][*C1 `*][C1 from TABLE1]] +::= [s0;%- [C1 Select(][*C1 SqlAll][C1 ().Of(TABLE1))]&] [s0;%- [C1 .From(TABLE1)]] -:: [s0;%- [C1 select TABLE1.][*C1 `*][C1 from TABLE1]]}}&] -[s0; ] \ No newline at end of file +::^ [s0;%- [C1 select TABLE1.][*C1 `*][C1 from TABLE1]] +::= [s0;%- [C1 Vector m;]&] +[s0;%- [C1 ...]&] +[s0;%- [C1 Select(ID)]&] +[s0;%- [C1 .From(TABLE1)]&] +[s0;%- [C1 .Where(ID `=`= ][*C1 SqlSetFrom][C1 (m))]] +::^ [s0;%- [C1 select ID]&] +[s0;%- [C1 from TABLE1]&] +[s0;%- [C1 where ID in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9)]]}}&] +[s0; ]] \ No newline at end of file