diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-09 12:44:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-09 12:44:15 +0000 |
| commit | 0f47ff69835e4419eca174435d711b8490081d5f (patch) | |
| tree | 50c2192c28f95acd6ebe7c5ce03a6452ef03bd0c /reportdesign/inc | |
| parent | 783dbe2c1654c3579d23d7fde997b2bad83a167e (diff) | |
#i1000#: resolve merge conflicts from CWS frmdlg
Diffstat (limited to 'reportdesign/inc')
| -rw-r--r-- | reportdesign/inc/RptResId.hrc | 8 |
1 files changed, 4 insertions, 4 deletions
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 ) |