[Libreoffice-commits] .: 2 commits - configure.in scp2/source

[Tor Lillqvist]

 configure.in                                 |   18 ++++++++++--------
 scp2/source/impress/registryitem_impress.scp |    1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit b5b75ea9764c2e91c824fb8f5f5e6fcb6edfb4ea
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 25 15:25:35 2011 +0300

    Add .ppsx

diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 063bcf9..ead0603 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -1034,6 +1034,7 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
commit db0ea8a309a7fdc45b5d4a0b7049df5be5b4f649
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 25 15:07:59 2011 +0300

    Copy also productversion.mk to the build platform sub-configure

diff --git a/configure.in b/configure.in
index 4f949a5..9d40041 100755
--- a/configure.in
+++ b/configure.in
@@ -2023,18 +2023,20 @@ if test "$cross_compiling" = "yes"; then
     rm -rf CONF-FOR-BUILD Env.Build.sh
     mkdir CONF-FOR-BUILD
     tar cf - \
-        configure \
+        Makefile.in \
+        bin/repo-list.in \
+        bootstrap.1 \
         config.guess \
+        configure \
+        ooo.lst.in \
         oowintool \
+        post_download.in \
+        set_soenv.in \
+        solenv/inc/langlist.mk \
         solenv/inc/minor.mk \
         solenv/inc/postset.mk \
-        solenv/inc/langlist.mk \
-        set_soenv.in \
-        bootstrap.1 \
-        post_download.in \
-        ooo.lst.in \
-        Makefile.in \
-        bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
+        solenv/inc/productversion.mk \
+    | (cd CONF-FOR-BUILD && tar xf -)
     (
     unset COM GUI GUIBASE OS CPU CPUNAME
     unset CC CXX SYSBASE CFLAGS