diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-24 16:53:14 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-24 16:53:14 +0200 |
| commit | fc9171c1442b359d7e806767e90a18c5d6ca2e7e (patch) | |
| tree | 4794331a9c05fe2b05b2d1d201a3084e222f0280 /framework/inc | |
| parent | efaabab96ab8f6b1b866f26e7c4478b846ac4a1d (diff) | |
| parent | ba640a3477213a4d2f179f188fe80029969ef1bb (diff) | |
Merge commit 'ooo/OOO330_m12'
Conflicts:
desktop/source/app/app.cxx
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/framework.hrc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index eea91edeaa07..1817b60d90e9 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -35,9 +35,9 @@ #define RID_GROUPS_OFFSET 32000 #define RID_GROUPS_END 32767 -#define RID_FWK_DIALOG_START (RID_FWK_START + 2048) +#define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048) -#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START + 0) +#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) #define STR_FILTER_DOWNLOAD (RID_FWK_START+0) #define STR_FILTER_CHOOSER (RID_FWK_START+1) @@ -45,7 +45,7 @@ #define STR_FILTER_ZIPPED (RID_FWK_START+3) // ResIds for BackingWindow -#define DLG_BACKING (RID_FWK_DIALOG_START+100) +#define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100) #define STR_BACKING_WELCOME 1 #define STR_BACKING_WELCOMEPRODUCT 2 #define STR_BACKING_CREATE 3 @@ -78,7 +78,7 @@ #define BMP_BACKING_OPENTEMPLATE 17 // Ids of TabWindow -#define WIN_TABWINDOW (RID_FWK_DIALOG_START+101) +#define WIN_TABWINDOW (RID_FWK_DIALOG_START_CORRECT+101) #define TC_TABCONTROL 1 #endif |