github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

+CtrlCore/ParseRTF.cpp: added simple table cell shading support (solid color only)

Browse source 
+Oracle/Oci8.cpp: OracleBlob / Clob upgraded to 64-bit LOB handle

git-svn-id: svn://ultimatepp.org/upp/trunk@3650 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2011-07-13 18:34:03 +00:00
parent c8fc3a6b37
commit b80c030e3c
9 changed files with 675 additions and 875 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uppsrc/CtrlCore/ParseRTF.cpp
View file

@ -102,6 +102,9 @@ private:
RichCell::Format format;
Rect cellmarginunits;
int shading;
Color shading_fore;
Color shading_back;
int end_dots;
bool merge_first;
bool merge;
@ -184,6 +187,9 @@ RTFParser::CellInfo::CellInfo()
, merge_first(false)
, merge(false)
, cellmarginunits(0, 0, 0, 0)
, shading(0)
, shading_fore(Black())
, shading_back(White())
{
}
@ -310,6 +316,14 @@ void RTFParser::FlushTable(int level)
out_co = cell.info.format.bordercolor;
}
}
if(cell.info.shading > 0) {
Color zero = White();
Color one = Nvl(cell.info.shading_fore, Black());
int r = zero.GetR() + iscale(one.GetR() - zero.GetR(), cell.info.shading, 10000);
int g = zero.GetG() + iscale(one.GetG() - zero.GetG(), cell.info.shading, 10000);
int b = zero.GetB() + iscale(one.GetB() - zero.GetB(), cell.info.shading, 10000);
cell.info.format.color = Color(r, g, b);
}
}
}
table.format.frame = Nvl(tbl_border, 0);
@ -1231,6 +1245,8 @@ void RTFParser::ReadTableStyle()
else if(PassQ("clbrdrb"))
ReadCellBorder(CellInfoAt(ts.stylecol).format.border.bottom);
else if(PassQ("cltxlrtb")) {}
else if(PassQ("clshdng"))
CellInfoAt(ts.stylecol).shading = command_arg;
else if(PassQ("clcbpat")) {
if(command_arg >= 0 && command_arg < color_table.GetCount())
CellInfoAt(ts.stylecol).format.color = color_table[command_arg];