diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-09 11:31:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-09 17:14:13 +0100 |
| commit | aa641600fcb81865217fe5db0a6ed79a71e45cd0 (patch) | |
| tree | e71a8ad697451184950bdaad7dae7223354d2c36 /cui/source | |
| parent | 293526165fcd236ba1742de2feec6ea06376e83f (diff) | |
Resolves: tdf#121290 Crash, if press F4 for a selected callout
Change-Id: Idf73b21ae2f27f4966705c8faf9fd38abc502ae4
Reviewed-on: https://gerrit.libreoffice.org/63178
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/tabpages/labdlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 778d4b869e5b..4d8331e05c0e 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -33,6 +33,7 @@ #include <svx/dlgutil.hxx> #include <labdlg.hxx> #include <transfrm.hxx> +#include <bitmaps.hlst> // define ---------------------------------------------------------------- @@ -110,11 +111,10 @@ SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rI for (int i = 0; i < 3; ++i) aLineTypes.push_back(m_xLineTypes->get_text(i)); - for(sal_uInt16 nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; ++nBitmap) - { - FixedImage *pImage = get<FixedImage>(OString("legtyp") + OString::number(nBitmap+1)); - m_aBmpCapTypes[nBitmap] = pImage->GetImage(); - } + static_assert(CAPTYPE_BITMAPS_COUNT == 3, "unexpected"); + m_aBmpCapTypes[0] = Image(BitmapEx(RID_SVXBMP_LEGTYP1)); + m_aBmpCapTypes[1] = Image(BitmapEx(RID_SVXBMP_LEGTYP2)); + m_aBmpCapTypes[2] = Image(BitmapEx(RID_SVXBMP_LEGTYP3)); //------------install ValueSet-------------------------- m_xCT_CAPTTYPE->SetStyle( m_xCT_CAPTTYPE->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD ); |