[Libreoffice] [PATCH] fix odfflatxml and xsltfilter component registration

Hi, 

the component registration seems to have changed recently, which broke
the new odf flat xml export and the libxslt based xslt transformation
service.

Attached are two patches to fix those. 

I'm unsure how to reliably get the service.rdb rebuilt after changing
the component definitions, just rebuilding postprocess didn't seem to
suffice and I manually edited services.input in the output tree there,
so there might be some bit missing. 

Cheers, 

Peter

From 4eb7bfef439865c44eeaa60e34ebc29b885ae55b Mon Sep 17 00:00:00 2001
From: Peter Jentsch <pjotr@guineapics.de>
Date: Fri, 25 Mar 2011 08:02:31 +0100
Subject: [PATCH 1/2] add missing component registration for libxslttransformer

---
 filter/source/xsltfilter/xsltfilter.component |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/filter/source/xsltfilter/xsltfilter.component 
b/filter/source/xsltfilter/xsltfilter.component
index 25a4797..5fb985c 100644
--- a/filter/source/xsltfilter/xsltfilter.component
+++ b/filter/source/xsltfilter/xsltfilter.component
@@ -31,4 +31,7 @@
   <implementation name="com.sun.star.comp.documentconversion.XSLTFilter">
     <service name="com.sun.star.documentconversion.XSLTFilter"/>
   </implementation>
+  <implementation name="com.sun.star.comp.documentconversion.LibXSLTTransformer">
+    <service name="com.sun.star.documentconversion.LibXSLTTransformer"/>
+  </implementation>
 </component>
-- 
1.7.1

From 43e3435f60e1d056cf47f7f7293f4092282bfcac Mon Sep 17 00:00:00 2001
From: Peter Jentsch <pjotr@guineapics.de>
Date: Fri, 25 Mar 2011 22:51:51 +0100
Subject: [PATCH 2/2] fix odfflatxml export broken after merge

---
 filter/prj/d.lst                              |    1 +
 filter/source/odfflatxml/makefile.mk          |    8 +++++
 filter/source/odfflatxml/odfflatxml.component |   37 +++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 0 deletions(-)
 create mode 100644 filter/source/odfflatxml/odfflatxml.component

diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 8957db6..160c266 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -63,6 +63,7 @@ mkdir: %_DEST%\inc%_EXT%\filter\msfilter
 ..\%__SRC%\misc\filterconfig1.component %_DEST%\xml%_EXT%\filterconfig1.component
 ..\%__SRC%\misc\flash.component %_DEST%\xml%_EXT%\flash.component
 ..\%__SRC%\misc\msfilter.component %_DEST%\xml%_EXT%\msfilter.component
+..\%__SRC%\misc\odfflatxml.component %_DEST%\xml%_EXT%\odfflatxml.component
 ..\%__SRC%\misc\pdffilter.component %_DEST%\xml%_EXT%\pdffilter.component
 ..\%__SRC%\misc\placeware.component %_DEST%\xml%_EXT%\placeware.component
 ..\%__SRC%\misc\svgfilter.component %_DEST%\xml%_EXT%\svgfilter.component
diff --git a/filter/source/odfflatxml/makefile.mk b/filter/source/odfflatxml/makefile.mk
index aaffb35..0783bd9 100644
--- a/filter/source/odfflatxml/makefile.mk
+++ b/filter/source/odfflatxml/makefile.mk
@@ -54,3 +54,11 @@ SHL1STDLIBS= \
 
 # --- Targets ------------------------------------------------------
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/odfflatxml.component
+
+$(MISC)/odfflatxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        odfflatxml.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt odfflatxml.component
diff --git a/filter/source/odfflatxml/odfflatxml.component 
b/filter/source/odfflatxml/odfflatxml.component
new file mode 100644
index 0000000..35238af
--- /dev/null
+++ b/filter/source/odfflatxml/odfflatxml.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Peter Jentsch <pjotr@guineapics.de>
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+-->
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components";>
+  <implementation name="com.sun.star.comp.filter.OdfFlatXml">
+    <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+</component>
-- 
1.7.1