diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
commit | c93f01621fa781108cf70e9a80d4c350dc7902c1 (patch) | |
tree | 4380e483fb87fd0a7c17d3c865fc8fcaab661b9f /basctl/util | |
parent | ef6cb67ff6f0549857408ea661acba5f298083e1 (diff) | |
parent | 76039bc52fe8ffba5349dcac5993e207e1f8d352 (diff) |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'basctl/util')
-rw-r--r-- | basctl/util/basctl.component | 34 | ||||
-rwxr-xr-x | basctl/util/basctl.map | 1 | ||||
-rw-r--r-- | basctl/util/hidother.src | 1 | ||||
-rw-r--r-- | basctl/util/makefile.mk | 8 |
4 files changed, 42 insertions, 2 deletions
diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component new file mode 100644 index 000000000000..f101deaf28be --- /dev/null +++ b/basctl/util/basctl.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.basic.BasicIDE"> + <service name="com.sun.star.script.BasicIDE"/> + </implementation> +</component> diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map index 80359606ccc8..83193fe176fa 100755 --- a/basctl/util/basctl.map +++ b/basctl/util/basctl.map @@ -4,7 +4,6 @@ UDK_3_0_0 { basicide_macro_organizer; basicide_handle_basic_error; component_getImplementationEnvironment; - component_writeInfo; component_getFactory; local: *; diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src index cd8fe7b26bf5..ce2607b3296d 100644 --- a/basctl/util/hidother.src +++ b/basctl/util/hidother.src @@ -25,7 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -//#include "hidother.hrc" hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; }; hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; }; diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 59bfc51c0e49..e690a5a20a3b 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -101,3 +101,11 @@ RESLIB1SRSFILES= $(SRSFILELIST) .ENDIF # "$(header)" == "" + +ALLTAR : $(MISC)/basctl.component + +$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + basctl.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt basctl.component |