diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
| commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
| tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /basctl/inc/basidesh.hrc | |
| parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
| parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'basctl/inc/basidesh.hrc')
| -rw-r--r-- | basctl/inc/basidesh.hrc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index 8bf7d3316cd0..f3a1e641b8bb 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -27,15 +27,10 @@ #ifndef _BASIDESH_HRC #define _BASIDESH_HRC -#ifndef _SVTOOLS_IMAGEMGR_HRC -#include <svtools/imagemgr.hrc> -#endif - #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif - // Resource-ID's... #ifndef _SVX_NOIDERESIDS @@ -57,29 +52,16 @@ #define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 ) #define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 ) -#define RID_IMG_LOCKED_HC ( RID_BASICIDE_START + 6 ) #define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 ) -#define RID_IMGBTN_GOTOCALL ( RID_BASICIDE_START + 9 ) -#define RID_IMGLST_LAYOUT_HC ( RID_BASICIDE_START + 14 ) -#define RID_IMG_REMOVEWATCH_HC ( RID_BASICIDE_START + 15 ) #define RID_IMG_INSTALLATION ( RID_BASICIDE_START + 20 ) -#define RID_IMG_INSTALLATION_HC ( RID_BASICIDE_START + 21 ) #define RID_IMG_DOCUMENT ( RID_BASICIDE_START + 22 ) -#define RID_IMG_DOCUMENT_HC ( RID_BASICIDE_START + 23 ) #define RID_IMG_MODLIB ( RID_BASICIDE_START + 24 ) -#define RID_IMG_MODLIB_HC ( RID_BASICIDE_START + 25 ) #define RID_IMG_MODLIBNOTLOADED ( RID_BASICIDE_START + 26 ) -#define RID_IMG_MODLIBNOTLOADED_HC ( RID_BASICIDE_START + 27 ) #define RID_IMG_MODULE ( RID_BASICIDE_START + 28 ) -#define RID_IMG_MODULE_HC ( RID_BASICIDE_START + 29 ) #define RID_IMG_MACRO ( RID_BASICIDE_START + 30 ) -#define RID_IMG_MACRO_HC ( RID_BASICIDE_START + 31 ) #define RID_IMG_DLGLIB ( RID_BASICIDE_START + 32 ) -#define RID_IMG_DLGLIB_HC ( RID_BASICIDE_START + 33 ) #define RID_IMG_DLGLIBNOTLOADED ( RID_BASICIDE_START + 34 ) -#define RID_IMG_DLGLIBNOTLOADED_HC ( RID_BASICIDE_START + 35 ) #define RID_IMG_DIALOG ( RID_BASICIDE_START + 36 ) -#define RID_IMG_DIALOG_HC ( RID_BASICIDE_START + 37 ) #define RID_IMG_LOCKED ( RID_BASICIDE_START + 41 ) #define RID_IMGLST_LAYOUT ( RID_BASICIDE_START + 49 ) |