diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 11:00:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 11:00:23 +0000 |
| commit | 68276375c9b5798ad0d210a401dd4eeffd3ae33d (patch) | |
| tree | 95305940e3adb752f3c8d65d062ce1e5a2884d78 /chart2/source/tools/CharacterProperties.cxx | |
| parent | INTEGRATION: CWS chart27 (1.9.30); FILE MERGED (diff) | |
| download | core-68276375c9b5798ad0d210a401dd4eeffd3ae33d.tar.gz core-68276375c9b5798ad0d210a401dd4eeffd3ae33d.zip | |
INTEGRATION: CWS chart27 (1.10.2); FILE MERGED
2008/06/23 09:01:16 iha 1.10.2.1: #i90976# wrong default value for property CharEscapementHeight
Diffstat (limited to 'chart2/source/tools/CharacterProperties.cxx')
| -rw-r--r-- | chart2/source/tools/CharacterProperties.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index f1527e80c3a5..253c9966a501 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CharacterProperties.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -131,7 +131,7 @@ void CharacterProperties::AddPropertiesToVector( PROP_CHAR_ESCAPEMENT, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEVOID )); // CharHeight rOutProperties.push_back( Property( C2U( "CharHeight" ), @@ -219,7 +219,7 @@ void CharacterProperties::AddPropertiesToVector( PROP_CHAR_ESCAPEMENT_HEIGHT, ::getCppuType( reinterpret_cast< const sal_Int8 * >(0)), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEVOID )); // CharCrossedOut // rOutProperties.push_back( @@ -479,7 +479,6 @@ void CharacterProperties::AddDefaultsToMap( ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_CHAR_SET, sal_Int16(aFont.GetCharSet()) );//use awt::CharSet::DONTKNOW instead of SYSTEM to avoid assertion issue 50249 ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_PITCH, sal_Int16(aFont.GetPitch()) );//awt::FontPitch::VARIABLE ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_CHAR_COLOR, -1 ); //automatic color (COL_AUTO) - ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_ESCAPEMENT, 0 ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CHAR_HEIGHT, fDefaultFontHeight ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_UNDERLINE, awt::FontUnderline::NONE ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_CHAR_UNDERLINE_COLOR, -1 ); //automatic color (COL_AUTO) @@ -492,7 +491,6 @@ void CharacterProperties::AddDefaultsToMap( // ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CASE_MAPPING, style::CaseMap::NONE ); // ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_ROTATION, 0 ); // ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_SCALE_WIDTH, 71 ); - ::chart::PropertyHelper::setPropertyValueDefault< sal_Int8 >( rOutMap, PROP_CHAR_ESCAPEMENT_HEIGHT, 0 ); // ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CROSSED_OUT, false ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_STRIKE_OUT, awt::FontStrikeout::NONE ); |