include/svx/dialogs.hrc | 9 --------- sc/source/ui/inc/tbinsert.hxx | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-)
New commits: commit 9fac093b76811be99d390d5cec30c3f7cb2361ae Author: Maxim Monastirsky <[email protected]> Date: Fri Jun 19 16:44:03 2015 +0300 Unused defines since 853e9c00a359b93c546e2e8a5fcee9e8aebf49b8 Change-Id: I8b1bcaaff72ed73209e55011e006175356865811 diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index a57c68c..4f71027 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -939,19 +939,12 @@ #define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//? #define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//? #define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//? -#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS (RID_SVX_START + 1172) -#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_0 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 0) -#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_1 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 1) -#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_2 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 2) -#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_3 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 3) -#define RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_4 (RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS + 4) #define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178) #define RID_SVXSTR_FINDBAR_MATCHCASE (RID_SVX_START + 1189) #define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190) -#define RID_SVXSTR_NUMBULLET_NONE (RID_SVX_START + 1191) #define RID_SVXSTR_NUMBULLET_CURRENT_LIST_DESCRIPTION (RID_SVX_START + 1192) #define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START + 1193) #define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START + 1194) @@ -1011,8 +1004,6 @@ #define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1241) #define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0) #define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1) -#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 12) -#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 13) #define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21) #define IMG_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22) #define IMG_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23) commit bc3c7f2557a1871fb1e41fc9cac4426a6b208901 Author: Maxim Monastirsky <[email protected]> Date: Sun Jul 5 16:23:11 2015 +0300 Add 'virtual' Change-Id: I57511b62b578f897c15c6cbb23dedb1200db232f diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index be21a4e..07b6201 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.hxx @@ -25,7 +25,7 @@ class ScTbxInsertCtrl : public SfxToolBoxControl { sal_uInt16 nLastSlotId; - void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; + virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; public: SFX_DECL_TOOLBOX_CONTROL(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
