diff options
| author | Carsten Driesner <cd@openoffice.org> | 2010-11-04 09:48:52 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2010-11-04 09:48:52 +0100 |
| commit | 7076ac3e2986bcb936817222fd5b5c92d6ec6b8b (patch) | |
| tree | def818c8ecce59764f5e4ac4d4d52fc8554ea140 /framework/inc | |
| parent | a0bdf86f82010dd59133970ee1f46ea848b70d98 (diff) | |
| parent | 3c21373571fd0cf89391502aa132c5f420cd75c6 (diff) | |
dockingwindows: Merge changes from DEV300m92
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 |