From 9551bf5a1ee5c9275a26f8ec4021e0b7f5665176 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

---
 xmlscript/prj/d.lst                   |  1 +
 xmlscript/source/misc/unoservices.cxx |  9 -------
 xmlscript/util/makefile.mk            |  8 ++++++
 xmlscript/util/xcr.component          | 46 +++++++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 xmlscript/util/xcr.component

(limited to 'xmlscript')

diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst
index 51b2891e4926..2f1ff7e37785 100644
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@ -11,3 +11,4 @@ mkdir: %_DEST%\inc%_EXT%\xmlscript
 ..\inc\xmlscript\xmlns.h %_DEST%\inc%_EXT%\xmlscript\xmlns.h
 
 ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.dtd
+..\%__SRC%\misc\xcr.component %_DEST%\xml%_EXT%\xcr.component
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index b95665eef01e..0d4d8db169ac 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -115,15 +115,6 @@ extern "C"
 
     // -----------------------------------------------------------------------------
 
-    sal_Bool SAL_CALL component_writeInfo(
-        void * pServiceManager, void * pRegistryKey )
-    {
-        return ::cppu::component_writeInfoHelper(
-            pServiceManager, pRegistryKey, ::xmlscript::s_entries );
-    }
-
-    // -----------------------------------------------------------------------------
-
     void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
index 3ccf63dc3b89..ba731470b2e4 100644
--- a/xmlscript/util/makefile.mk
+++ b/xmlscript/util/makefile.mk
@@ -74,3 +74,11 @@ $(MISC)$/$(SHL1TARGET).flt : makefile.mk xcr.flt
     @echo ------------------------------
     @echo Making: $@
     $(TYPE) xcr.flt > $@
+
+ALLTAR : $(MISC)/xcr.component
+
+$(MISC)/xcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        xcr.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xcr.component
diff --git a/xmlscript/util/xcr.component b/xmlscript/util/xcr.component
new file mode 100644
index 000000000000..5ffe7f862fd7
--- /dev/null
+++ b/xmlscript/util/xcr.component
@@ -0,0 +1,46 @@
+<?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.xml.input.SaxDocumentHandler">
+    <service name="com.sun.star.xml.input.SaxDocumentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLBasicExporter">
+    <service name="com.sun.star.document.XMLBasicExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLBasicImporter">
+    <service name="com.sun.star.document.XMLBasicImporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicExporter">
+    <service name="com.sun.star.document.XMLOasisBasicExporter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.xmlscript.XMLOasisBasicImporter">
+    <service name="com.sun.star.document.XMLOasisBasicImporter"/>
+  </implementation>
+</component>
-- 
cgit 


From 1885dddbdd2382f95aef15df15d4cd110f8d7854 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 22 Oct 2010 10:37:46 +0200
Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt

---
 xmlscript/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xmlscript')

diff --git a/xmlscript/prj/build.lst b/xmlscript/prj/build.lst
index f3410c668633..388a59f134ff 100644
--- a/xmlscript/prj/build.lst
+++ b/xmlscript/prj/build.lst
@@ -1,4 +1,4 @@
-xt	xmlscript :	comphelper tools offapi NULL
+xt	xmlscript :	comphelper tools offapi LIBXSLT:libxslt NULL
 xt	xmlscript							usr1	-	all	xt_mkout NULL
 xt	xmlscript\inc						nmake	-	all	xt_inc NULL
 xt	xmlscript\source\xml_helper			nmake	-	all	xt_xml_helper xt_inc NULL
-- 
cgit 


From c703f03e506d6fd8c0d8e8fde6608a8b4cbab021 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Tue, 15 Mar 2011 11:52:49 +0100
Subject: Fix build in scripting

---
 xmlscript/inc/xmlscript/xmldlg_imexp.hxx         | 2 +-
 xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'xmlscript')

diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
index 30d92bfc1bd3..47d0d17e989f 100755
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -78,7 +78,7 @@ SAL_CALL exportDialogModel(
 //==============================================================================
 void SAL_CALL importDialogModel(
     ::com::sun::star::uno::Reference<
-    ::com::sun::star::io::XInputStream > xInput,
+    ::com::sun::star::io::XInputStream > const & xInput,
     ::com::sun::star::uno::Reference<
     ::com::sun::star::container::XNameContainer > const & xDialogModel,
     ::com::sun::star::uno::Reference<
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index f0e8a3dfd4ea..d435883ef8d3 100755
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -105,7 +105,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
 
 //==================================================================================================
 void SAL_CALL importDialogModel(
-    Reference< io::XInputStream > xInput,
+    Reference< io::XInputStream > const & xInput,
     Reference< container::XNameContainer > const & xDialogModel,
     Reference< XComponentContext > const & xContext,
     Reference< XModel > const & xDocument )
-- 
cgit