diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-06 17:02:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-07 00:48:36 +0100 |
| commit | 2523f32dc68d35b69a7b0ee9764e61f7d8efb3ce (patch) | |
| tree | 1292ca5c985e3ad7d917ceca2dc936c74a2b9315 /sd | |
| parent | 1ce72593df9ab690ae4666160ec47494d1cd9a07 (diff) | |
if the arg is true, the dialog dispatchs InsertSpecialChar itself
and GetOutputItemSet is unused and the args won't be there. While
they are there if the arg is false
Change-Id: I934e99479f8fdf4d5102e47f6082fbbda8ececcd
Reviewed-on: https://gerrit.libreoffice.org/50838
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fubullet.cxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index f4b2be0e45fa..e90da72220f5 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -198,22 +198,8 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) // If a character is selected, it can be shown // pDLg->SetFont( ); // pDlg->SetChar( ); - sal_uInt16 nResult = pDlg->Execute(); - if( nResult == RET_OK ) - { - const SfxStringItem* pCItem = SfxItemSet::GetItem<SfxStringItem>(pDlg->GetOutputItemSet(), SID_CHARMAP, false); - const SvxFontItem* pFItem = SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT, false); - if ( pFItem ) - { - aFont.SetFamilyName( pFItem->GetFamilyName() ); - aFont.SetStyleName( pFItem->GetStyleName() ); - aFont.SetCharSet( pFItem->GetCharSet() ); - aFont.SetPitch( pFItem->GetPitch() ); - } - - if ( pCItem ) - aChars = pCItem->GetValue(); - } + pDlg->Execute(); + return; } if (!aChars.isEmpty()) |