From 0f47ff69835e4419eca174435d711b8490081d5f Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 9 Jan 2009 12:44:15 +0000 Subject: #i1000#: resolve merge conflicts from CWS frmdlg --- reportdesign/inc/RptResId.hrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'reportdesign/inc') diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 34f6f337bb51..10723d4c66b8 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -263,10 +263,10 @@ #define IMG_CONDFORMAT_DLG_LCH (RID_IMAGELIST_START + 3) #define RID_SVXIMGLIST_RPTEXPL (RID_IMAGELIST_START + 4) #define RID_SVXIMGLIST_RPTEXPL_HC (RID_IMAGELIST_START + 5) -#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 6) -#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 7) -#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 8) -#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 9) +#define IMG_ADDFIELD_DLG_SC (RID_IMAGELIST_START + 6) +#define IMG_ADDFIELD_DLG_SCH (RID_IMAGELIST_START + 7) +#define IMG_ADDFIELD_DLG_LC (RID_IMAGELIST_START + 8) +#define IMG_ADDFIELD_DLG_LCH (RID_IMAGELIST_START + 9) // untyped #define RID_STR_BOOL (RID_UNTYPED_START + 0 ) -- cgit