diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:23:54 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 14:23:54 +0000 |
commit | d51e262ebdc485216b4e9783ea0b62eab61500e7 (patch) | |
tree | a11b3b065e337393fd4d4f884714c6b6e22bc5c2 /forms | |
parent | 9262d8c9d2c7c95a6d980a2950388feb3859be8d (diff) |
INTEGRATION: CWS dba30b (1.9.70); FILE MERGED
2008/04/15 21:53:09 fs 1.9.70.3: RESYNC: (1.10-1.11); FILE MERGED
2008/03/17 10:44:32 fs 1.9.70.2: RESYNC: (1.9-1.10); FILE MERGED
2008/02/26 08:28:59 fs 1.9.70.1: remove unused code
Issue number: #i86305#
Submitted by: cmc@openoffice.org
Reviewed by: frank.schoenheit@sun.com
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.cxx | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 2e9d41b2f8ed..7c5505d1d87d 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: richtextvclcontrol.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -177,44 +177,6 @@ namespace frm } //-------------------------------------------------------------------- - void RichTextControl::convert( const SfxPoolItem& _rItem, FontDescriptor& _rUnoFont ) - { - OSL_ENSURE( _rItem.ISA( SvxFontItem ), "RichTextControl::convert: invalid item type!" ); - - _rUnoFont.Name = static_cast< const SvxFontItem& >( _rItem ).GetFamilyName(); - _rUnoFont.Family = sal::static_int_cast< sal_Int16 >( static_cast< const SvxFontItem& >( _rItem ).GetFamily() ); - _rUnoFont.Pitch = sal::static_int_cast< sal_Int16 >( static_cast< const SvxFontItem& >( _rItem ).GetPitch() ); - _rUnoFont.CharSet = static_cast< const SvxFontItem& >( _rItem ).GetCharSet(); - } - - //-------------------------------------------------------------------- - void RichTextControl::convert( const FontDescriptor& _rUnoFont, SfxPoolItem*& _rpFontItem ) - { - SvxFontItem* pFontItem = new SvxFontItem( SID_ATTR_CHAR_FONT ); - pFontItem->GetFamilyName() = _rUnoFont.Name; - pFontItem->GetFamily() = (FontFamily)_rUnoFont.Family; - pFontItem->GetPitch() = (FontPitch)_rUnoFont.Pitch; - pFontItem->GetCharSet() = _rUnoFont.CharSet; - - _rpFontItem = pFontItem; - } - - //-------------------------------------------------------------------- - sal_uInt32 RichTextControl::convertFontHeight( const SfxPoolItem& _rItem ) - { - OSL_ENSURE( _rItem.ISA( SvxFontHeightItem ), "RichTextControl::convert: invalid item type!" ); - return static_cast< const SvxFontHeightItem& >( _rItem ).GetHeight(); - } - - //-------------------------------------------------------------------- - SfxPoolItem* RichTextControl::convertFontHeight( sal_uInt32 _nUnoFontHeight ) - { - SvxFontHeightItem* pItem = new SvxFontHeightItem( _nUnoFontHeight, 100, EE_CHAR_FONTHEIGHT ); - pItem->SetProp( 100, SFX_MAPUNIT_POINT ); - return pItem; - } - - //-------------------------------------------------------------------- void RichTextControl::Resize() { m_pImpl->layoutWindow(); |