diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 21:53:02 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 21:53:02 -0600 |
| commit | f30f134bbf481e197d1f5d3b5d4ff7117cafbed9 (patch) | |
| tree | a80523e092a4ff514d0d8c8988843e9cb590d67d /sfx2/inc/sfx2/sfxsids.hrc | |
| parent | 732d55e3e871cf44ff461701f36ea1c11bc0d0b6 (diff) | |
merge non-conflicting changes in sfx2
Diffstat (limited to 'sfx2/inc/sfx2/sfxsids.hrc')
| -rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index d6ab79d2a1..1239a9ed76 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -75,6 +75,7 @@ #define SID_VERSION_VISIBLE (SID_SFX_START + 313) #define SID_PASTE_UNFORMATTED (SID_SFX_START + 314) +#define SID_DIALOG_RETURN (SID_SFX_START + 318) #define SID_PRINTER_NOTFOUND_WARN (SID_SFX_START + 320) #define SID_PRINTER_USETHREAD (SID_SFX_START + 321) #define SID_PRINTER_NAME (SID_SFX_START + 322) @@ -126,7 +127,8 @@ #define SID_HELP_ZOOMOUT (SID_SFX_START + 418) #define SID_HELP_HELPFILEBOX (SID_SFX_START + 419) #define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420) -#define SID_HELP_SUPPORTPAGE (SID_SFX_START + 1683) +#define SID_SHOW_LICENSE (SID_SFX_START + 1683) +#define SID_SHOW_CREDITS (SID_SFX_START + 1711) #define SID_HELP_TUTORIALS (SID_SFX_START + 1695) // default-ids for document @@ -368,6 +370,7 @@ #define SID_OPENCOPY (SID_SFX_START + 674) #define SID_SOURCEVIEW (SID_SFX_START + 675) #define SID_DOC_STARTPRESENTATION (SID_SFX_START + 695) +#define SID_DDE_RECONNECT_ONLOAD (SID_SFX_START + 696) #define SID_PLUGFRAMEARG (SID_SFX_START + 666) #define SID_NEWWINDOWFOREDIT (SID_SFX_START + 667) |