ooo-build r13608 - in trunk: . patches/dev300

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13608 - in trunk: . patches/dev300
Date: Mon, 18 Aug 2008 13:20:36 +0000 (UTC)
Author: szalaik
Date: Mon Aug 18 13:20:36 2008
New Revision: 13608
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13608&view=rev

Log:
2008-08-18  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/extensions_configure.diff
	* patches/dev300/extensions_packinfo.diff
	* patches/dev300/scp2_extensions.diff
	* patches/dev300/extensions_deliver.diff:
	Make packages from all extensions delivered by SUN.

	* patches/dev300/scp2_accessories.diff:
	Fixes in accessories.

	* patches/dev300/apply:
	Move scp2-3layer-nicer-paths.diff to Defaults section.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/extensions_deliver.diff
   trunk/patches/dev300/extensions_packinfo.diff
   trunk/patches/dev300/scp2_accessories.diff
   trunk/patches/dev300/scp2_extensions.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 18 13:20:36 2008
@@ -258,9 +258,6 @@
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
-# flatten the structure of the 3 layer OOo a bit
-scp2-3layer-nicer-paths.diff, i#90430, jholesov
-
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua
@@ -1045,6 +1042,9 @@
 # no Help->registration dialog by default
 default-no-registration-menu.diff, michael
 
+# flatten the structure of the 3 layer OOo a bit
+scp2-3layer-nicer-paths.diff, i#90430, jholesov
+
 [ DefaultSettings ]
 
 # default to anti-alias at point size of 1 point

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Mon Aug 18 13:20:36 2008
@@ -4,7 +4,7 @@
  else
     AC_MSG_RESULT([no])
     ENABLE_MINIMIZER=NO
-+   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_SDEXT"
++   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
  fi
  AC_SUBST(ENABLE_MINIMIZER)
  
@@ -32,3 +32,11 @@
  fi
  AC_SUBST(ENABLE_MEDIAWIKI)
  AC_SUBST(SYSTEM_APACHE_COMMONS)
+@@ -5663,6 +5663,7 @@
+ else
+   AC_MSG_RESULT([no])
+   ENABLE_REPORTDESIGN=NO
++  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
+   SYSTEM_JFREEREPORT=NO
+ fi
+ AC_SUBST(ENABLE_REPORTDESIGN)

Modified: trunk/patches/dev300/extensions_deliver.diff
==============================================================================
--- trunk/patches/dev300/extensions_deliver.diff	(original)
+++ trunk/patches/dev300/extensions_deliver.diff	Mon Aug 18 13:20:36 2008
@@ -1,7 +1,25 @@
 --- sdext/prj/d.lst.orig	2007-10-11 14:10:27.000000000 +0200
 +++ sdext/prj/d.lst	2008-04-01 22:11:56.000000000 +0200
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,5 @@
  mkdir: %_DEST%\bin%_EXT%\minimizer
  ..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt
 +..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\sun-presentation-minimizer.oxt
++..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
  
+--- filter/prj/d.lst.orig	2008-07-07 10:56:23.000000000 +0200
++++ filter/prj/d.lst	2008-08-18 10:24:48.000000000 +0200
+@@ -47,5 +47,6 @@
+ ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
+ ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
+ ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
++..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
+ ..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu %_DEST%\xml%_EXT%\registry\spool\fcfg_*.xcu
+ ..\%COMMON_OUTDIR%\bin\fcfg_langpack_*.zip %_DEST%\pck%_EXT%\fcfg_langpack_*.zip
+--- swext/prj/d.lst.orig	2007-10-11 14:10:27.000000000 +0200
++++ swext/prj/d.lst	2008-04-01 22:11:56.000000000 +0200
+@@ -1,3 +1,4 @@
+ mkdir: %_DEST%\bin%_EXT%\swext
+ ..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt
++..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\wiki-publisher.oxt
+ ..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip
+

Modified: trunk/patches/dev300/extensions_packinfo.diff
==============================================================================
--- trunk/patches/dev300/extensions_packinfo.diff	(original)
+++ trunk/patches/dev300/extensions_packinfo.diff	Mon Aug 18 13:20:36 2008
@@ -1,14 +1,14 @@
 --- setup_native/source/packinfo/packinfo_office.txt.orig	2008-01-14 20:09:47.000000000 +0100
 +++ setup_native/source/packinfo/packinfo_office.txt	2008-03-29 11:00:24.000000000 +0100
-@@ -63,6 +63,39 @@
+@@ -63,6 +63,86 @@
  End
  
  Start
-+module = "gid_Module_Optional_Extensions_SDEXT"
++module = "gid_Module_Optional_Extensions_MINIMIZER"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%UNIXPRODUCTNAME-extension-presentation-minimizer"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presentation-minimizer"
 +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
 +linuxpatchrequires = ""
 +copyright = "1999-2008 by OpenOffice.org"
@@ -24,7 +24,7 @@
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-report-builder"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-report-builder"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-report-builder"
 +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
 +linuxpatchrequires = ""
 +copyright = "1999-2008 by OpenOffice.org"
@@ -36,6 +36,54 @@
 +End
 +
 +Start
++module = "gid_Module_Optional_Extensions_MEDIAWIKI"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mediawiki-publisher"
++solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mediawiki-publisher"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "1999-2008 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "MediaWiki publisher extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
++module = "gid_Module_Optional_Extensions_PRESENTER_SCREEN"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presenter-screen"
++solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presenter-screen"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "1999-2008 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Presenter Screen extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
++module = "gid_Module_Optional_Extensions_PDFIMPORT"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-pdf-import"
++solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-pdf-import"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "1999-2008 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
  module = "gid_Module_Prg_Wrt_Bin"
  script = "shellscripts_module.txt"
  solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer"

Modified: trunk/patches/dev300/scp2_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_accessories.diff	Mon Aug 18 13:20:36 2008
@@ -1431,7 +1431,7 @@
 diff -Naur scp2/source/accessories/module_accessories.scp scp2/source/accessories/module_accessories.scp
 --- scp2/source/accessories/module_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_accessories.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,52 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1472,7 +1472,8 @@
 +Module gid_Module_Optional_Accessories
 +    ParentID = gid_Module_Optional;
 +    Files = (
-+        gid_File_Basic_Premium  ); 
++        gid_File_Basic_Premium,
++	 	 gid_File_Basic_OOoWikipedia  ); 
 +    XPDParentID = "root";
 +    Sortkey = "300";
 +    Minimal = NO;

Modified: trunk/patches/dev300/scp2_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_extensions.diff	Mon Aug 18 13:20:36 2008
@@ -1,7 +1,7 @@
 diff -Naur scp2/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
 --- scp2/source/extensions/file_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/file_extensions.scp	2008-03-29 07:50:21.000000000 +0100
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,104 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@
 +
 +/* ** SUN Presentation Minimizer ** */
 +
-+#ifndef WITHOUT_EXTENSION_SDEXT
++#ifndef WITHOUT_EXTENSION_MINIMIZER
 +
 +File gid_File_Oxt_Sun_Presentation_Minimizer
 +    TXT_FILE_BODY;
@@ -56,7 +56,7 @@
 +
 +/* ** SUN Report Builder ** */
 +
-+#ifndef DISABLE_REPORTDESIGN
++#ifndef WITHOUT_EXTENSION_REPORTDESIGN
 +
 +File gid_File_Oxt_Sun_Report_Builder
 +    TXT_FILE_BODY;
@@ -67,6 +67,45 @@
 +
 +#endif
 +
++/* ** SUN MediaWiki Publisher** */
++
++#ifndef WITHOUT_EXTENSION_MEDIAWIKI
++
++File gid_File_Oxt_Sun_MediaWiki
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Name = "wiki-publisher.oxt";
++End
++
++#endif
++
++/* ** SUN Presenter Screen ** */
++
++#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
++
++File gid_File_Oxt_Sun_Presenter_Screen
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Name = "presenter-screen.oxt";
++End
++
++#endif
++
++/* ** SUN PDF Import ** */
++
++#ifndef WITHOUT_EXTENSION_PDFIMPORT
++
++File gid_File_Oxt_Sun_PDF_Import
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Name = "pdfimport.oxt";
++End
++
++#endif
++
 diff -Naur scp2/source/extensions/makefile.mk scp2/source/extensions/makefile.mk
 --- scp2/source/extensions/makefile.mk	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/makefile.mk	2008-03-22 10:57:33.000000000 +0100
@@ -131,7 +170,7 @@
 diff -Naur scp2/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
 --- scp2/source/extensions/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.scp	2008-03-29 07:50:23.000000000 +0100
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,121 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -180,10 +219,10 @@
 +
 +/* ** SUN Presentation Minimizer ** */
 +
-+#ifndef WITHOUT_EXTENSION_SDEXT
-+Module gid_Module_Optional_Extensions_SDEXT
++#ifndef WITHOUT_EXTENSION_MINIMIZER
++Module gid_Module_Optional_Extensions_MINIMIZER
 +    PackageInfo = "packinfo_office.txt";
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SDEXT);
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
 +    ParentID = gid_Module_Optional_Extensions;
 +    Files = (
 +        gid_File_Oxt_Sun_Presentation_Minimizer );
@@ -195,7 +234,7 @@
 +
 +/* ** SUN Report Builder ** */
 +
-+#ifndef DISABLE_REPORTDESIGN
++#ifndef WITHOUT_EXTENSION_REPORTDESIGN
 +Module gid_Module_Optional_Extensions_REPORTDESIGN
 +    PackageInfo = "packinfo_office.txt";
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
@@ -207,11 +246,56 @@
 +    Styles = ( );
 +End
 +#endif
++
++/* ** SUN MediaWiki Publisher** */
++
++#ifndef WITHOUT_EXTENSION_MEDIAWIKI
++Module gid_Module_Optional_Extensions_MEDIAWIKI
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
++    ParentID = gid_Module_Optional_Extensions;
++    Files = (
++        gid_File_Oxt_Sun_MediaWiki );
++    Minimal = NO;
++    Default = YES;
++    Styles = ( );
++End
++#endif
++					
++/* ** SUN Report Builder ** */
++
++#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
++Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
++    ParentID = gid_Module_Optional_Extensions;
++    Files = (
++        gid_File_Oxt_Sun_Presenter_Screen );
++    Minimal = NO;
++    Default = YES;
++    Styles = ( );
++End
++#endif
++										
++/* ** SUN PDF Import ** */
++
++#ifndef WITHOUT_EXTENSION_PDFIMPORT
++Module gid_Module_Optional_Extensions_PDFIMPORT
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
++    ParentID = gid_Module_Optional_Extensions;
++    Files = (
++        gid_File_Oxt_Sun_PDF_Import );
++    Minimal = NO;
++    Default = YES;
++    Styles = ( );
++End
++#endif
 +					
 diff -Naur scp2/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
 --- scp2/source/extensions/module_extensions.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.ulf	2008-03-29 07:50:27.000000000 +0100
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,71 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -253,10 +337,10 @@
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
 +en-US = "Useful %PRODUCTNAME extensions."
 +
-+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
 +en-US = "SUN Presentation Minimizer"
 +
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
 +en-US = "SUN Presentation Minimizer"
 +
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
@@ -265,3 +349,22 @@
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
 +en-US = "SUN Report Builder"
 +
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
++en-US = "SUN MediaWiki Publisher"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
++en-US = "SUN MediaWiki Publisher"
++
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
++en-US = "SUN Presenter Screen"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
++en-US = "SUN Presenter Screen"
++
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
++en-US = "SUN PDF Import"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
++en-US = "SUN PDF Import"
++
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]