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>
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 2cefabd..ae3516f 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -67,6 +67,10 @@
#define RID_SVXBMP_COLLAPSEDNODE "res/sx18002.png"
#define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
#define RID_SVXBMP_LEGTYP1 "svx/res/legtyp1.png"
#define RID_SVXBMP_LEGTYP2 "svx/res/legtyp2.png"
#define RID_SVXBMP_LEGTYP3 "svx/res/legtyp3.png"
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 778d4b8..4d8331e 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 );
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
index 766d5e5..518afbe 100644
--- a/cui/uiconfig/ui/calloutpage.ui
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -255,51 +255,6 @@
</packing>
</child>
<child>
<object class="GtkGrid" id="grid1">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="halign">center</property>
<child>
<object class="GtkImage" id="legtyp1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">svx/res/legtyp1.png</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkImage" id="legtyp2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">svx/res/legtyp2.png</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkImage" id="legtyp3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">svx/res/legtyp3.png</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="linetypes">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
