From 930e6cefb632d47b32f1a2e14c9adb30d2f08b4f Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 16 Apr 2010 23:02:51 +0200
Subject: CWS gnumake2: move delivered header files from sfx2/inc to
 sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver

---
 basctl/util/makefile.mk | 2 --
 1 file changed, 2 deletions(-)

(limited to 'basctl/util')

diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index 0f2a919ff655..70043bd969d9 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -94,8 +94,6 @@ SRSFILELIST=\
                 $(SRS)$/basicide.srs \
                 $(SRS)$/dlged.srs
 
-SRSFILELIST+=   $(SOLARCOMMONRESDIR)$/sfx.srs
-
 RESLIB1NAME=basctl
 RESLIB1IMAGES =$(PRJ)$/res
 RESLIB1SRSFILES= $(SRSFILELIST)
-- 
cgit 


From c737e5bb650e3efbb6bf08fa85a1474d80c8d558 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Mon, 19 Jul 2010 17:13:56 +0200
Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list
 for HIDs

---
 basctl/util/hidother.src | 1 -
 1 file changed, 1 deletion(-)

(limited to 'basctl/util')

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; };
-- 
cgit 


From 5dbc43ead1b7ff5fa0c1f6756a9ca6062c48d033 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 10 Sep 2010 13:10:07 +0200
Subject: sb129: #i113189# change UNO components to use passive registration

---
 basctl/util/basctl.component | 34 ++++++++++++++++++++++++++++++++++
 basctl/util/basctl.map       |  1 -
 basctl/util/makefile.mk      |  8 ++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 basctl/util/basctl.component

(limited to 'basctl/util')

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/makefile.mk b/basctl/util/makefile.mk
index 47de65cc58c0..b33fa3f1d721 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -103,3 +103,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
-- 
cgit 


From ea516d858b5f6aa283dac136fe32f3226764c507 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 4 Nov 2010 10:36:00 +0100
Subject: undoapi: attempt to fix broken Undo contexts after executing a script

---
 basctl/util/makefile.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'basctl/util')

diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index b33fa3f1d721..9401bbfb8d4d 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -54,6 +54,7 @@ SHL1STDLIBS= \
             $(SVXCORELIB) \
             $(SVXLIB) \
             $(SFX2LIB) \
+            $(FWELIB) \
             $(BASICLIB) \
             $(SVTOOLLIB) \
             $(TKLIB) \
-- 
cgit