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
This commit is contained in:
Kurt Zenker 2008-05-05 14:23:54 +00:00
parent 9262d8c9d2
commit d51e262ebd

View file

@ -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.
*
@ -176,44 +176,6 @@ namespace frm
return false;
}
//--------------------------------------------------------------------
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()
{