[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sd/prj sd/util

[Jan Holesovsky]

 sd/prj/d.lst             |    1 +
 sd/util/makefile.mk      |    8 +++++++-
 sd/util/sdfilt.component |    7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit e46599a115f82ddbd6b43c595d883ea367aa1da7
Author: Radek Doulik <rodo at novell.com>
Date:   Fri May 20 10:35:14 2011 +0200

    fix sdfilt component generation
    
    Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Fridrich Strba <fstrba at novell.com>

diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 8eda79e..1d25951 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -297,5 +297,5 @@ $(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
 $(MISC)/sdfilt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
         sdfilt.component
     $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt sdfilt.component
commit 13c95c52670c7d2756dd76c81612288f7fdc723b
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Apr 8 14:42:14 2011 +0200

    added sdfilt.component for pptx export
    
    Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Fridrich Strba <fstrba at novell.com>

diff --git a/sd/prj/d.lst b/sd/prj/d.lst
index 0ebbb9a..ad4a52a 100644
--- a/sd/prj/d.lst
+++ b/sd/prj/d.lst
@@ -57,3 +57,4 @@ mkdir: %_DEST%\inc%_EXT%\sd
 
 ..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
 ..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component
+..\%__SRC%\misc\sdfilt.component %_DEST%\xml%_EXT%\sdfilt.component
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 702cc27..8eda79e 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -280,7 +280,7 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo Making: $@
     @$(TYPE) sd.flt > $@
 
-ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component
+ALLTAR : $(MISC)/sd.component $(MISC)/sdd.component $(MISC)/sdfilt.component
 
 $(MISC)/sd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
         sd.component
@@ -293,3 +293,9 @@ $(MISC)/sdd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt sdd.component
+
+$(MISC)/sdfilt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sdfilt.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sdfilt.component
diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component
new file mode 100644
index 0000000..397d31c
--- /dev/null
+++ b/sd/util/sdfilt.component
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport">
+    <service name="com.sun.star.comp.ooxpptx"/>
+  </implementation>
+</component>