diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-08-31 23:36:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-31 23:45:58 +0200 |
| commit | 75c39b903f06b656293edf20ec4a5173a0755fb6 (patch) | |
| tree | fa9972a4f9e3553fda5307c4fe1d1f0807f46237 /sd/source/ui/view/viewshe3.cxx | |
| parent | fa8db4cb890ffbbd20790eff2e295dfbc048b7b4 (diff) | |
let's make Impress crash less - SfxStyleFamily edition
Commit bcb41235deaf4b7ca90522bda3ba21a686819e6e - in addition to
introducing the enum SfxStyleFamily - inconsistently converted one
call of DrawDocShell::SetStyleFamily to use enum SfxStyleFamily
instead of a mysterious "5", but did not adapt all of the code that
extracts the SfxUInt16Item that subsequently extracts this value and
expects a number 0-5.
Since it's clearly inexcusably stupid to have 2 different public sets
of integers identifying styles, make the usage of the second "array
index" integers private to templdlg.cxx; the SfxUInt16 item now always
contains enum SfxStyleFamily.
(regression from bcb41235deaf4b7ca90522bda3ba21a686819e6e)
Change-Id: I333575c504277c2046f8f5a6b36ae3f86b3b3201
Diffstat (limited to 'sd/source/ui/view/viewshe3.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index dbf6037a3165..8368cf74969a 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -90,7 +90,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { if( SfxItemState::DEFAULT == rSet.GetItemState( SID_STYLE_FAMILY ) ) { - sal_uInt16 nFamily = (sal_uInt16)GetDocSh()->GetStyleFamily(); + SfxStyleFamily const nFamily = GetDocSh()->GetStyleFamily(); SdrView* pDrView = GetDrawView(); @@ -109,7 +109,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) } } - rSet.Put(SfxUInt16Item(SID_STYLE_FAMILY, nFamily )); + rSet.Put(SfxUInt16Item(SID_STYLE_FAMILY, static_cast<sal_uInt16>(nFamily))); } if(SfxItemState::DEFAULT == rSet.GetItemState(SID_GETUNDOSTRINGS)) |