mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 10:13:51 +01:00
Cell: fix wrong condition when checking for font styles
This commit is contained in:
parent
2cccd9fede
commit
083c3691b9
@ -10,7 +10,7 @@ namespace PDF {
|
||||
|
||||
|
||||
Cell::Cell(const AttributedString& content, const std::string& name, FontMapPtr pFontMap):
|
||||
_content(content),
|
||||
_content(content),
|
||||
_name(name),
|
||||
_outline(OUTLINE_NONE),
|
||||
_lineWidth(1.0f),
|
||||
@ -23,10 +23,10 @@ Cell::Cell(const AttributedString& content, const std::string& name, FontMapPtr
|
||||
|
||||
|
||||
Cell::Cell(const AttributedString& content, FontMapPtr pFontMap, const std::string& encoding, bool trueType, int widthAsPct):
|
||||
_content(content),
|
||||
_content(content),
|
||||
_outline(OUTLINE_NONE),
|
||||
_lineWidth(1.0f),
|
||||
_encoding(encoding),
|
||||
_encoding(encoding),
|
||||
_trueType(trueType),
|
||||
_widthAsPct(widthAsPct)
|
||||
{
|
||||
@ -104,13 +104,13 @@ void Cell::draw(Page& page, float x, float y, float width, float height)
|
||||
else if (_trueType) page.setTTFont((*_pFontMap)[AttributedString::STYLE_PLAIN], fontSize, _encoding);
|
||||
else page.setFont((*_pFontMap)[AttributedString::STYLE_PLAIN], fontSize, _encoding);
|
||||
}
|
||||
else if (fontStyle | AttributedString::STYLE_BOLD)
|
||||
else if (fontStyle & AttributedString::STYLE_BOLD)
|
||||
{
|
||||
if (!_pFontMap) page.setFont("Helvetica-Bold", fontSize);
|
||||
else if (_trueType) page.setTTFont((*_pFontMap)[AttributedString::STYLE_BOLD], fontSize, _encoding);
|
||||
else page.setFont((*_pFontMap)[AttributedString::STYLE_BOLD], fontSize, _encoding);
|
||||
}
|
||||
else if (fontStyle | AttributedString::STYLE_ITALIC)
|
||||
else if (fontStyle & AttributedString::STYLE_ITALIC)
|
||||
{
|
||||
if (!_pFontMap) page.setFont("Helvetica-Oblique", fontSize);
|
||||
else if (_trueType) page.setTTFont((*_pFontMap)[AttributedString::STYLE_ITALIC], fontSize, _encoding);
|
||||
|
Loading…
Reference in New Issue
Block a user