diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /basctl/inc/basidesh.hrc | |
| parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
| parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'basctl/inc/basidesh.hrc')
| -rw-r--r-- | basctl/inc/basidesh.hrc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index b8fa629b896a..5c551b311083 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -69,10 +69,10 @@ #define RID_STR_RUNTIMEERROR ( RID_BASICIDE_START + 22 ) #define RID_STR_COMPILEERROR ( RID_BASICIDE_START + 23 ) #define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 ) -#define RID_STR_STDMACRONAME ( RID_BASICIDE_START + 25 ) + #define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 ) #define RID_STR_ALL ( RID_BASICIDE_START + 28 ) -#define RID_STR_CLOSE ( RID_BASICIDE_START + 29 ) + #define RID_STR_PAGE ( RID_BASICIDE_START + 30 ) #define RID_STR_BADSBXNAME ( RID_BASICIDE_START + 31 ) #define RID_STR_STDLIBNAME ( RID_BASICIDE_START + 32 ) |