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

[Peter Jentsch]

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 
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 @@
   
 
   
+  
+
+  
 
-- 
1.7.1

>From 43e3435f60e1d056cf47f7f7293f4092282bfcac Mon Sep 17 00:00:00 2001
From: Peter Jentsch 
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 000..35238af
--- /dev/null
+++ b/filter/source/odfflatxml/odfflatxml.component
@@ -0,0 +1,37 @@
+
+
+http://openoffice.org/2010/uno-components";>
+  
+
+
+  
+
-- 
1.7.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Meeks]

Hi Peter,

On Fri, 2011-03-25 at 22:59 +0100, Peter Jentsch wrote:
> the component registration seems to have changed recently, which broke
> the new odf flat xml export and the libxslt based xslt transformation
> service.

Right ! :-) nice catch, and well done unwinding the new scheme which is
rather different.

> I'm unsure how to reliably get the service.rdb rebuilt after changing
> the component definitions, just rebuilding postprocess 

It is quite possible that we don't linkoo 'services.rdb' and we
probably should - perhaps we didn't do this in the past since it was
built at install time; hacks to solenv/bin/linkoo to improve that
appreciated :-)

I added the component name to postprocess/packcomponents/makefile.mk -
perhaps that was the missing piece (unless you didn't deliver?).

Thanks muchly !

Michael.

-- 
 michael.me...@novell.com  <><, Pseudo Engineer, itinerant idiot


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice