diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-05-03 12:52:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-05-03 12:52:41 +0000 |
| commit | 69a443614cf346a8f127468294f14240d848f698 (patch) | |
| tree | 3929dd2e1f18eb5402215dc632d2b650601caad3 /starmath/source/node.cxx | |
| parent | 38b2e7594149455b02cdced43189d50c0743e14a (diff) | |
INTEGRATION: CWS tl11 (1.34.10); FILE MERGED
2005/04/26 14:08:38 tl 1.34.10.1: #i43449# italic and bold fonts more clearly defined and SmFontDialog reworked
Diffstat (limited to 'starmath/source/node.cxx')
| -rw-r--r-- | starmath/source/node.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index fbdc6d9b5662..ac9d9d804a07 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2,9 +2,9 @@ * * $RCSfile: node.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: vg $ $Date: 2005-02-16 17:59:02 $ + * last change: $Author: obo $ $Date: 2005-05-03 13:52:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2414,9 +2414,9 @@ void SmTextNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) aText = GetToken().aText; GetFont() = rFormat.GetFont(GetFontDesc()); - if (GetFont().GetItalic() > ITALIC_NONE) + if (IsItalic( GetFont() )) Attributes() |= ATTR_ITALIC; - if (GetFont().GetWeight() > WEIGHT_NORMAL) + if (IsBold( GetFont() )) Attributes() |= ATTR_BOLD; }; @@ -2861,10 +2861,10 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell //! fuer dieses hier, mal entfallen.) // //! see also SmFontStyles::GetStyleName - if (GetFont().GetWeight() > WEIGHT_NORMAL) - SetAttribut(ATTR_BOLD); - if (GetFont().GetItalic() > ITALIC_NONE) + if (IsItalic( GetFont() )) SetAttribut(ATTR_ITALIC); + if (IsBold( GetFont() )) + SetAttribut(ATTR_BOLD); Flags() |= FLG_FONT; }; |