summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-28 20:45:20 +0100
committerTor Lillqvist <tml@collabora.com>2014-06-02 13:28:08 +0000
commit3b41dc58dc3689d4506dec0825834fbec0d1ed60 (patch)
tree0766880bf59db6cdbf9d34d6daee1158f367f1ce /svx
parentce366b6763a2e71db9f83de0c33371955bc310ae (diff)
fix bad cast in SvxStyleBox_Impl::StateChanged()
This causes various JunitTest crashes on Windows, regression from 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec. Change-Id: Iab24e0d39375ac1e5ac63d32470dca1e54d518c5 Reviewed-on: https://gerrit.libreoffice.org/9621 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 91b6a66f3add..5621dc1f0a86 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -598,7 +598,10 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
Size aPixelSize( pDevice->LogicToPixel( aFontSize, pShell->GetMapUnit() ) );
// setup the font properties
- Font aFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), aPixelSize );
+ SvxFont aFont;
+ aFont.SetName(pFontItem->GetFamilyName());
+ aFont.SetStyleName(pFontItem->GetStyleName());
+ aFont.SetSize(aPixelSize);
const SfxPoolItem *pItem = aItemSet.GetItem( SID_ATTR_CHAR_WEIGHT );
if ( pItem )
@@ -634,7 +637,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
pItem = aItemSet.GetItem( SID_ATTR_CHAR_CASEMAP );
if ( pItem )
- ((SvxFont &)aFont).SetCaseMap( static_cast< const SvxCaseMapItem* >( pItem )->GetCaseMap() );
+ aFont.SetCaseMap(static_cast<const SvxCaseMapItem*>(pItem)->GetCaseMap());
pItem = aItemSet.GetItem( SID_ATTR_CHAR_EMPHASISMARK );
if ( pItem )