[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

2012-03-05 Thread Michael Meeks
 scp2/source/ooo/common_brand.scp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f0865c76cb372a704728704923058c61dba32a4f
Author: Thorsten Behrens tbehr...@suse.com
Date:   Mon Mar 5 12:00:48 2012 +

Package the credits etc. in the right place on Mac

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 19f560f..a76b8b8 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1526,7 +1526,7 @@ End
 File gid_License_Odt
 BIN_FILE_BODY;
 #if defined MACOSX
-Dir = gid_Brand_Dir_BasisLink;
+Dir = gid_Dir_Bundle_Contents;
 #else
 Dir = gid_Dir_Brand_Root;
 #endif
@@ -1537,7 +1537,7 @@ End
 File gid_Credits_Odt
 BIN_FILE_BODY;
 #if defined MACOSX
-Dir = gid_Brand_Dir_BasisLink;
+Dir = gid_Dir_Bundle_Contents;
 #else
 Dir = gid_Dir_Brand_Root;
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

2012-02-07 Thread Andras Timar
 scp2/source/xsltfilter/module_xsltfilter.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3654d261f25a46b908aa7a927699456a606e3eb3
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 2 11:42:01 2012 +0100

Chose xslt filters for default install, not for minimal though

Signed-off-by: Andras Timar ati...@suse.com

diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp 
b/scp2/source/xsltfilter/module_xsltfilter.scp
index 7854ce7..a3206b0 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples
 gid_File_Xsl_Export_Xhtml_Table,
 gid_File_Share_Registry_Xsltfilter_Xcd );
 Minimal = NO;
-Default = NO;
+Default = YES;
 Styles = ( );
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

2011-11-25 Thread Fridrich Strba
 scp2/source/ooo/common_brand.scp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5a5fd169cb471192cc9d1602b1bd88107af9280b
Author: Andras Timar ati...@suse.com
Date:   Wed Nov 23 13:40:17 2011 +0100

create this dir so uninstall can remove it

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2557f0d..19f560f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -413,6 +413,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache
 Styles = (CREATE);
 End
 
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
+ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache;
+DosName = uno_packages;
+Styles = (CREATE);
+End
+
 Directory gid_Brand_Dir_Share_Registry
 ParentID = gid_Brand_Dir_Share;
 DosName = registry;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

2011-11-24 Thread Andras Timar
 scp2/source/impress/registryitem_impress.scp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4e8524bdf3d4cec373bf0d1eb7295d8963a7bcdd
Author: Tor Lillqvist tlillqv...@novell.com
Date:   Thu Aug 25 15:25:35 2011 +0300

Add .ppsx fdo#39963

Signed-off-by: Andras Timar ati...@suse.com

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 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits