diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-14 16:17:48 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-14 16:17:48 +0100 |
| commit | 389c735d9cd02e142a1070e500c0f23971454454 (patch) | |
| tree | 83ce9b84d85a70ab35e2dfdbb5ed1db5bc72e77b /framework | |
| parent | dd2fff67ae5c59de36a36480b9f6968122077706 (diff) | |
warning for doubly defined symbol fixed
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index caa356d850fa..20d15d19b0b8 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -53,17 +53,13 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <tools/rcid.h> #include <vcl/image.hxx> #include <svtools/menuoptions.hxx> @@ -71,9 +67,6 @@ // Copied from svx // Function-Id's -#define SID_LIB_START 10000 -#define SID_SVX_START (SID_LIB_START + 0) - #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) #define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) |