[Libreoffice] [REVIEW] pptx export on 3-4[-0] branches

Radek Doulík rodo at novell.com
Thu May 19 09:04:52 PDT 2011


Hi,

I would like to push fixes for pptx export for 3-4 and 3-4-0 branches.
The pptx export is currently broken as the export component is not
instantiated.

I am looking for 3 reviews. It has 5 parts, 3 of them are cherry-picks
from master and 2 additional are necessary because build system changed
in master, so the fixes are different.

Cheers
Radek

http://cgit.freedesktop.org/libreoffice/impress/commit/?id=36a2e16e11f1f77847349ae2ec89ef61f2159343
http://cgit.freedesktop.org/libreoffice/filters/commit/?id=58cf0ba94346fe0762de0b9890dbc3c8a75ea1b3
http://cgit.freedesktop.org/libreoffice/filters/commit/?id=c4da44b1b637f731af0085aa07389f66c33890c1

commit bb34d3274709a5b0c66f366c6c1d2cbc2b2c2684
Author: Radek Doulik <rodo at novell.com>
Date:   Thu May 19 15:25:16 2011 +0200

    fix sdfilt component generation

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 1da375908436dffca50421280ef5004cfeb4474e
Author: Radek Doulik <rodo at novell.com>
Date:   Thu May 19 14:52:29 2011 +0200

    add sdfilt component

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1a60d20..82ff84d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -152,6 +152,7 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
+    sdfilt \
     simplecanvas \
     slideshow \
     $(SM_COMPONENTS)\




More information about the LibreOffice mailing list