diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2014-07-23 16:38:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-24 15:08:11 +0000 |
| commit | be97f2f553bfb1a584646ad75bd932e686ba80c2 (patch) | |
| tree | 971ed8ebc6dd0d90371e9e0360ed1c418d7e34a6 /sw/inc/dbui.hrc | |
| parent | 27b7152609a336c95c86fe31eb075e1955f4818a (diff) | |
DLG_MAILMERGEWIZARD conversion to .ui
Conflicts:
sw/inc/dbui.hrc
Change-Id: Id224fd3a99abe8ec497a38c40b099dd7ae917890
Reviewed-on: https://gerrit.libreoffice.org/10494
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc/dbui.hrc')
| -rw-r--r-- | sw/inc/dbui.hrc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc index b4ec5bf9fa77..35f84c25f6f8 100644 --- a/sw/inc/dbui.hrc +++ b/sw/inc/dbui.hrc @@ -22,10 +22,6 @@ #include "rcid.hrc" -// Dialoge -------------------------------------------------------------------- - -#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3) - #define DLG_MAILMERGECHILD (RC_DBUI_BEGIN + 26) // Strings ------------------------------------------------------------------ @@ -79,9 +75,19 @@ #define ST_COMPLETED (RC_DBUI_BEGIN + 49) #define ST_FAILED (RC_DBUI_BEGIN + 50) #define ST_TERMINATEQUERY (RC_DBUI_BEGIN + 51) +#define ST_STARTING (RC_DBUI_BEGIN + 52) +#define ST_DOCUMETNTYPE (RC_DBUI_BEGIN + 53) +#define ST_ADDRESSBLOCK (RC_DBUI_BEGIN + 54) +#define ST_GREETINGSLINE (RC_DBUI_BEGIN + 55) +#define ST_LAYOUT (RC_DBUI_BEGIN + 56) +#define ST_PREPAREMERGE (RC_DBUI_BEGIN + 57) +#define ST_MERGE (RC_DBUI_BEGIN + 58) +#define ST_OUTPUT (RC_DBUI_BEGIN + 59) +#define ST_FINISH (RC_DBUI_BEGIN + 60) +#define ST_ADDRESSLIST (RC_DBUI_BEGIN + 61) // ImageList -#define ILIST (RC_DBUI_BEGIN + 52) +#define ILIST (RC_DBUI_BEGIN + 62) // Elements ----------------------------------------------------------------- #define MM_PART_TITLE 0 |