diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:48:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:48:23 +0000 |
| commit | faa81c0b16b2d99a91acf5312403d03f036a1ba7 (patch) | |
| tree | 062c61cb5635614cb75d82e75647a69a0ad9f58a /forms | |
| parent | 7a0d98f2327d7e24cee31946a1fc6883f2644d69 (diff) | |
INTEGRATION: CWS dba23c (1.8.26); FILE MERGED
2007/07/20 21:27:22 fs 1.8.26.1: lost some font properties
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/formcontrolfont.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 5bd0ffc507f5..fee7c9bb393d 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formcontrolfont.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2007-03-09 13:33:03 $ + * last change: $Author: hr $ $Date: 2007-07-31 13:48:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -197,7 +197,10 @@ namespace frm //--------------------------------------------------------------------- bool FontControlModel::isFontAggregateProperty( sal_Int32 _nPropertyHandle ) const { - return ( _nPropertyHandle == PROPERTY_ID_FONT_NAME ) + return ( _nPropertyHandle == PROPERTY_ID_FONT_CHARWIDTH ) + || ( _nPropertyHandle == PROPERTY_ID_FONT_ORIENTATION ) + || ( _nPropertyHandle == PROPERTY_ID_FONT_WIDTH ) + || ( _nPropertyHandle == PROPERTY_ID_FONT_NAME ) || ( _nPropertyHandle == PROPERTY_ID_FONT_STYLENAME ) || ( _nPropertyHandle == PROPERTY_ID_FONT_FAMILY ) || ( _nPropertyHandle == PROPERTY_ID_FONT_CHARSET ) |