[ooo-build-commit] .: patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Mon Apr 5 11:19:02 PDT 2010
patches/dev300/apply | 27 +
patches/dev300/default-no-registration-menu-m13.diff | 197 +++++++++++
patches/dev300/default-no-registration-menu.diff | 23 -
patches/dev300/helpcontent2-auxiliary-cfg-m13.diff | 336 +++++++++++++++++++
patches/dev300/helpcontent2-auxiliary-cfg.diff | 224 ++++++------
patches/dev300/redirect-extensions-m12.diff | 181 ++++++++++
patches/dev300/redirect-extensions.diff | 43 +-
7 files changed, 892 insertions(+), 139 deletions(-)
New commits:
commit 85200f66fa40955d8477281b0d8e561e930ba75f
Author: Rene Engelhard <rene at debian.org>
Date: Mon Apr 5 19:59:21 2010 +0200
more patches ported to ooo320-m14
* patches/dev300/default-no-registration-menu-m13.diff: rotate
* patches/dev300/default-no-registration-menu.diff: update
* patches/dev300/helpcontent2-auxiliary-cfg-m13.diff: rotate
* patches/dev300/helpcontent2-auxiliary-cfg.diff: update
* patches/dev300/redirect-extensions-m12.diff: rotate
* patches/dev300/redirect-extensions.diff: update
* patches/dev300/apply: adapt; (temporarily?) disable sdext-minimizer-docked.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 62dcd6f..f080478 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -391,15 +391,19 @@ uses-vfs.diff, i#43504, michael
# the -fvisibility-inlines-hidden
buildfix-x86-64-visibility-workaround.diff
-# re-direct to plugins via http://extensions.go-oo.org/
-redirect-extensions.diff
-
#upload a new libwpd + fix an exception with condensed paragraphs
libwpd.diff, fridrich
writerperfect-nocondensedparagraphs.diff, fridrich
offapi-typecheck-whitelist.diff, thorsten
+[ FixesNotForUpstream < ooo320-m13 ]
+# re-direct to plugins via http://extensions.go-oo.org/
+redirect-extensions-m12.diff
+[ FixesNotForUpstream >= ooo320-m13 ]
+# re-direct to plugins via http://extensions.go-oo.org/
+redirect-extensions.diff
+
[ ExtensionFixes < ooo320-m14]
reportdesigner-no-license-m13.diff
presenterscreen-no-license-m13.diff
@@ -418,7 +422,10 @@ wiki-publisher-no-license.diff
# Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
apache-commons-build-fix-invalid-chars.diff, kami
build-java-target-extensions.diff, i#93115, pmladek
-sdext-minimizer-docked.diff, thorsten
+
+[ ExtensionFixes < ooo320-m14 ]
+#FIXME# ooo320-m14 doesn't have that file anymore?
+#sdext-minimizer-docked.diff, thorsten
[ ExtensionFixes < ooo320-m14 ]
# Fix from Andre, allows to step back one animation effect
@@ -483,9 +490,16 @@ wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
# ooo-build only fix n#145906#
automation-testtool-oobuildfix.diff, n#145906, noelpwer
+[ Fixes < ooo320-m14 ]
+# fixes some .cfg files in helpcontent2/source/auxiliary to use right
+# lang code instead of en-US..
+helpcontent2-auxiliary-cfg-m13.diff, pmladek
+[ Fixes >= ooo320-m14 ]
# fixes some .cfg files in helpcontent2/source/auxiliary to use right
# lang code instead of en-US..
helpcontent2-auxiliary-cfg.diff, pmladek
+
+[ Fixes]
# .. and add eu
helpcontent2-auxiliary-eu.diff, i#108534
@@ -1354,8 +1368,13 @@ default-no-registration.diff, michael
# => Tango should be preferred over Industrial.
tango-prefer-over-industrial.diff, n#304615, pmladek
+[ Defaults < ooo320-m14 ]
+# no Help->registration dialog by default
+default-no-registration-menu-m13.diff, michael
+[ Defaults >= ooo320-m14 ]
# no Help->registration dialog by default
default-no-registration-menu.diff, michael
+[ Defaults ]
# CR line endings again...
default-no-registration-menu-sd.diff, michael/kohei
diff --git a/patches/dev300/default-no-registration-menu-m13.diff b/patches/dev300/default-no-registration-menu-m13.diff
new file mode 100644
index 0000000..ccc87c4
--- /dev/null
+++ b/patches/dev300/default-no-registration-menu-m13.diff
@@ -0,0 +1,197 @@
+diff --git basctl/uiconfig/basicide/menubar/menubar.xml basctl/uiconfig/basicide/menubar/menubar.xml
+index 974632f..8093ae4 100644
+--- basctl/uiconfig/basicide/menubar/menubar.xml
++++ basctl/uiconfig/basicide/menubar/menubar.xml
+@@ -82,7 +82,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git chart2/uiconfig/menubar/menubar.xml chart2/uiconfig/menubar/menubar.xml
+index dd7fcf4..ba3fe37 100644
+--- chart2/uiconfig/menubar/menubar.xml
++++ chart2/uiconfig/menubar/menubar.xml
+@@ -148,7 +148,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git dbaccess/uiconfig/dbapp/menubar/menubar.xml dbaccess/uiconfig/dbapp/menubar/menubar.xml
+index c35b3cb..1a5c7c7 100644
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml
++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
+@@ -134,7 +134,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git dbaccess/uiconfig/dbquery/menubar/menubar.xml dbaccess/uiconfig/dbquery/menubar/menubar.xml
+index f1b0042..c5b2b43 100644
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml
++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
+@@ -75,7 +75,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+index 31dbcdb..4f8f375 100644
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+@@ -58,7 +58,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git dbaccess/uiconfig/dbtable/menubar/menubar.xml dbaccess/uiconfig/dbtable/menubar/menubar.xml
+index eefcf17..60bfeb3 100644
+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml
++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
+@@ -59,7 +59,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git framework/source/services/backingwindow.cxx framework/source/services/backingwindow.cxx
+index b6b1624..a06cd06 100644
+--- framework/source/services/backingwindow.cxx
++++ framework/source/services/backingwindow.cxx
+@@ -157,8 +157,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
+
+ BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
+ String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
+- BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
+- String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
+ BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
+ String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
+ BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) );
+@@ -189,12 +187,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
+ maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
+ maToolbox.ShowItem( nItemId_Extensions );
+
+- maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
+- maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
+- maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
+- maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
+- maToolbox.ShowItem( nItemId_Reg );
+-
+ maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
+ maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
+ maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
+diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
+index fc1e520..f90a6f1 100644
+--- framework/uiconfig/startmodule/menubar/menubar.xml
++++ framework/uiconfig/startmodule/menubar/menubar.xml
+@@ -75,7 +75,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
+index 3e678b5..47850b2 100644
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
+@@ -164,7 +164,6 @@
+ <menu:menuitem menu:id=".uno:HelperDialog"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
+index d3e95d4..7f113f5 100644
+--- sc/uiconfig/scalc/menubar/menubar.xml
++++ sc/uiconfig/scalc/menubar/menubar.xml
+@@ -441,7 +441,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
+index b9b45c8..5d0a8fe 100644
+--- starmath/uiconfig/smath/menubar/menubar.xml
++++ starmath/uiconfig/smath/menubar/menubar.xml
+@@ -111,7 +111,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git svx/inc/globlmn_tmpl.hrc svx/inc/globlmn_tmpl.hrc
+index 22e5e58..5befa5b 100644
+--- svx/inc/globlmn_tmpl.hrc
++++ svx/inc/globlmn_tmpl.hrc
+@@ -1117,10 +1117,6 @@
+ {\
+ ITEM_HELP_SUPPORTPAGE\
+ };\
+- MenuItem\
+- {\
+- ITEM_HELP_ONLINE_REGISTRATION\
+- };\
+ MenuItem\
+ {\
+ Separator = TRUE ; \
+diff --git sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
+index bca4e89..76c9571 100644
+--- sw/uiconfig/sglobal/menubar/menubar.xml
++++ sw/uiconfig/sglobal/menubar/menubar.xml
+@@ -449,7 +449,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
+index b1892c8..9a03be2 100644
+--- sw/uiconfig/sweb/menubar/menubar.xml
++++ sw/uiconfig/sweb/menubar/menubar.xml
+@@ -378,7 +378,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
+diff --git sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
+index 057515d..590c9f5 100644
+--- sw/uiconfig/swriter/menubar/menubar.xml
++++ sw/uiconfig/swriter/menubar/menubar.xml
+@@ -452,7 +452,6 @@
+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:HelpSupport"/>
+- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:About"/>
+ </menu:menupopup>
diff --git a/patches/dev300/default-no-registration-menu.diff b/patches/dev300/default-no-registration-menu.diff
index ccc87c4..bb0026d 100644
--- a/patches/dev300/default-no-registration-menu.diff
+++ b/patches/dev300/default-no-registration-menu.diff
@@ -74,28 +74,35 @@ diff --git framework/source/services/backingwindow.cxx framework/source/services
index b6b1624..a06cd06 100644
--- framework/source/services/backingwindow.cxx
+++ framework/source/services/backingwindow.cxx
-@@ -157,8 +157,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
+@@ -181,7 +181,6 @@
+ loadImage( FwkResId( BMP_BACKING_FOLDER ), maTemplateButton );
- BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) );
String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-- BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) );
- String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
- BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
- BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) );
-@@ -189,12 +187,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
+ String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
+
+@@ -214,12 +213,6 @@
maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
maToolbox.ShowItem( nItemId_Extensions );
-- maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
+- maToolbox.InsertItem( nItemId_Reg, Image() );
- maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
- maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
- maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
- maToolbox.ShowItem( nItemId_Reg );
-
- maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
+ maToolbox.InsertItem( nItemId_Info, Image() );
maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
+@@ -308,7 +301,6 @@
+ maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
+ }
+ maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
+- maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) );
+ maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
+ maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) );
+
diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
index fc1e520..f90a6f1 100644
--- framework/uiconfig/startmodule/menubar/menubar.xml
diff --git a/patches/dev300/helpcontent2-auxiliary-cfg-m13.diff b/patches/dev300/helpcontent2-auxiliary-cfg-m13.diff
new file mode 100644
index 0000000..db226eb
--- /dev/null
+++ b/patches/dev300/helpcontent2-auxiliary-cfg-m13.diff
@@ -0,0 +1,336 @@
+diff -urN helpcontent2.orig/source/auxiliary/ca/sbasic.cfg helpcontent2/source/auxiliary/ca/sbasic.cfg
+--- helpcontent2.orig/source/auxiliary/ca/sbasic.cfg 2006-01-19 15:33:29.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/sbasic.cfg 2006-02-08 20:00:54.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Basic
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=7
+ Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/ca/scalc.cfg helpcontent2/source/auxiliary/ca/scalc.cfg
+--- helpcontent2.orig/source/auxiliary/ca/scalc.cfg 2006-01-19 15:33:42.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/scalc.cfg 2006-02-08 20:00:58.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Calc
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=3
+ Start=text%2Fscalc%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/ca/sdatabase.cfg helpcontent2/source/auxiliary/ca/sdatabase.cfg
+--- helpcontent2.orig/source/auxiliary/ca/sdatabase.cfg 2006-01-19 15:33:55.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/sdatabase.cfg 2006-02-08 20:01:02.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Base
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=7
+ Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/ca/sdraw.cfg helpcontent2/source/auxiliary/ca/sdraw.cfg
+--- helpcontent2.orig/source/auxiliary/ca/sdraw.cfg 2006-01-19 15:34:10.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/sdraw.cfg 2006-02-08 20:01:10.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Draw
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=4
+ Start=text%2Fsdraw%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/ca/simpress.cfg helpcontent2/source/auxiliary/ca/simpress.cfg
+--- helpcontent2.orig/source/auxiliary/ca/simpress.cfg 2006-01-19 15:34:27.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/simpress.cfg 2006-02-08 20:01:13.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Impress
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=5
+ Start=text%2Fsimpress%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/ca/smath.cfg helpcontent2/source/auxiliary/ca/smath.cfg
+--- helpcontent2.orig/source/auxiliary/ca/smath.cfg 2006-01-19 15:34:43.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/smath.cfg 2006-02-08 20:01:16.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Math
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=6
+ Start=text%2Fsmath%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/ca/swriter.cfg helpcontent2/source/auxiliary/ca/swriter.cfg
+--- helpcontent2.orig/source/auxiliary/ca/swriter.cfg 2006-01-19 15:34:55.000000000 +0100
++++ helpcontent2/source/auxiliary/ca/swriter.cfg 2006-02-08 20:01:18.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Writer
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=ca
+ Order=2
+ Start=text%2Fswriter%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/sbasic.cfg helpcontent2/source/auxiliary/fa/sbasic.cfg
+--- helpcontent2.orig/source/auxiliary/fa/sbasic.cfg 2006-01-19 15:36:23.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/sbasic.cfg 2006-02-08 19:59:57.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Basic
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=7
+ Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/scalc.cfg helpcontent2/source/auxiliary/fa/scalc.cfg
+--- helpcontent2.orig/source/auxiliary/fa/scalc.cfg 2006-01-19 15:36:35.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/scalc.cfg 2006-02-08 20:00:00.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Calc
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=3
+ Start=text%2Fscalc%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/sdatabase.cfg helpcontent2/source/auxiliary/fa/sdatabase.cfg
+--- helpcontent2.orig/source/auxiliary/fa/sdatabase.cfg 2006-01-19 15:36:51.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/sdatabase.cfg 2006-02-08 20:00:04.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Base
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=7
+ Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/sdraw.cfg helpcontent2/source/auxiliary/fa/sdraw.cfg
+--- helpcontent2.orig/source/auxiliary/fa/sdraw.cfg 2006-01-19 15:37:05.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/sdraw.cfg 2006-02-08 20:00:08.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Draw
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=4
+ Start=text%2Fsdraw%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/simpress.cfg helpcontent2/source/auxiliary/fa/simpress.cfg
+--- helpcontent2.orig/source/auxiliary/fa/simpress.cfg 2006-01-19 15:37:21.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/simpress.cfg 2006-02-08 20:00:11.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Impress
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=5
+ Start=text%2Fsimpress%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/smath.cfg helpcontent2/source/auxiliary/fa/smath.cfg
+--- helpcontent2.orig/source/auxiliary/fa/smath.cfg 2006-01-19 15:37:39.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/smath.cfg 2006-02-08 20:00:14.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Math
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=6
+ Start=text%2Fsmath%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/fa/swriter.cfg helpcontent2/source/auxiliary/fa/swriter.cfg
+--- helpcontent2.orig/source/auxiliary/fa/swriter.cfg 2006-01-19 15:37:53.000000000 +0100
++++ helpcontent2/source/auxiliary/fa/swriter.cfg 2006-02-08 20:00:17.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Writer
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=fa
+ Order=2
+ Start=text%2Fswriter%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/sbasic.cfg helpcontent2/source/auxiliary/mk/sbasic.cfg
+--- helpcontent2.orig/source/auxiliary/mk/sbasic.cfg 2006-01-19 15:39:24.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/sbasic.cfg 2006-02-08 19:59:26.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Basic
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=7
+ Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/scalc.cfg helpcontent2/source/auxiliary/mk/scalc.cfg
+--- helpcontent2.orig/source/auxiliary/mk/scalc.cfg 2006-01-19 15:39:37.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/scalc.cfg 2006-02-08 19:59:29.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Calc
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=3
+ Start=text%2Fscalc%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/sdatabase.cfg helpcontent2/source/auxiliary/mk/sdatabase.cfg
+--- helpcontent2.orig/source/auxiliary/mk/sdatabase.cfg 2006-01-19 15:39:55.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/sdatabase.cfg 2006-02-08 19:59:36.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Base
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=7
+ Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/sdraw.cfg helpcontent2/source/auxiliary/mk/sdraw.cfg
+--- helpcontent2.orig/source/auxiliary/mk/sdraw.cfg 2006-01-19 15:40:08.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/sdraw.cfg 2006-02-08 19:59:40.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Draw
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=4
+ Start=text%2Fsdraw%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/simpress.cfg helpcontent2/source/auxiliary/mk/simpress.cfg
+--- helpcontent2.orig/source/auxiliary/mk/simpress.cfg 2006-01-19 15:40:24.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/simpress.cfg 2006-02-08 19:59:43.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Impress
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=5
+ Start=text%2Fsimpress%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/smath.cfg helpcontent2/source/auxiliary/mk/smath.cfg
+--- helpcontent2.orig/source/auxiliary/mk/smath.cfg 2006-01-19 15:40:37.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/smath.cfg 2006-02-08 19:59:47.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Math
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=6
+ Start=text%2Fsmath%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/mk/swriter.cfg helpcontent2/source/auxiliary/mk/swriter.cfg
+--- helpcontent2.orig/source/auxiliary/mk/swriter.cfg 2006-01-19 15:40:52.000000000 +0100
++++ helpcontent2/source/auxiliary/mk/swriter.cfg 2006-02-08 19:59:50.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Writer
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=mk
+ Order=2
+ Start=text%2Fswriter%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/sbasic.cfg helpcontent2/source/auxiliary/xh/sbasic.cfg
+--- helpcontent2.orig/source/auxiliary/xh/sbasic.cfg 2006-01-19 15:42:27.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/sbasic.cfg 2006-02-08 19:58:48.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Basic
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=7
+ Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/scalc.cfg helpcontent2/source/auxiliary/xh/scalc.cfg
+--- helpcontent2.orig/source/auxiliary/xh/scalc.cfg 2006-01-19 15:42:43.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/scalc.cfg 2006-02-08 19:58:57.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Calc
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=3
+ Start=text%2Fscalc%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/sdatabase.cfg helpcontent2/source/auxiliary/xh/sdatabase.cfg
+--- helpcontent2.orig/source/auxiliary/xh/sdatabase.cfg 2006-01-19 15:42:55.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/sdatabase.cfg 2006-02-08 19:59:02.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Base
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=7
+ Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/sdraw.cfg helpcontent2/source/auxiliary/xh/sdraw.cfg
+--- helpcontent2.orig/source/auxiliary/xh/sdraw.cfg 2006-01-19 15:43:10.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/sdraw.cfg 2006-02-08 19:59:07.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Draw
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=4
+ Start=text%2Fsdraw%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/simpress.cfg helpcontent2/source/auxiliary/xh/simpress.cfg
+--- helpcontent2.orig/source/auxiliary/xh/simpress.cfg 2006-01-19 15:43:24.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/simpress.cfg 2006-02-08 19:59:10.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Impress
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=5
+ Start=text%2Fsimpress%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/smath.cfg helpcontent2/source/auxiliary/xh/smath.cfg
+--- helpcontent2.orig/source/auxiliary/xh/smath.cfg 2006-01-19 15:43:38.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/smath.cfg 2006-02-08 19:59:14.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Math
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=6
+ Start=text%2Fsmath%2Fmain0000.xhp
+ Heading=headingheading
+diff -urN helpcontent2.orig/source/auxiliary/xh/swriter.cfg helpcontent2/source/auxiliary/xh/swriter.cfg
+--- helpcontent2.orig/source/auxiliary/xh/swriter.cfg 2006-01-19 15:43:53.000000000 +0100
++++ helpcontent2/source/auxiliary/xh/swriter.cfg 2006-02-08 19:59:20.000000000 +0100
+@@ -1,7 +1,7 @@
+
+ Title=%PRODUCTNAME Writer
+ Copyright=Copyright 2004, Sun Microsystems, Inc.
+-Language=en-US
++Language=xh
+ Order=2
+ Start=text%2Fswriter%2Fmain0000.xhp
+ Heading=headingheading
diff --git a/patches/dev300/helpcontent2-auxiliary-cfg.diff b/patches/dev300/helpcontent2-auxiliary-cfg.diff
index db226eb..bd93ccd 100644
--- a/patches/dev300/helpcontent2-auxiliary-cfg.diff
+++ b/patches/dev300/helpcontent2-auxiliary-cfg.diff
@@ -1,334 +1,334 @@
-diff -urN helpcontent2.orig/source/auxiliary/ca/sbasic.cfg helpcontent2/source/auxiliary/ca/sbasic.cfg
---- helpcontent2.orig/source/auxiliary/ca/sbasic.cfg 2006-01-19 15:33:29.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/sbasic.cfg 2006-02-08 20:00:54.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/sbasic.cfg helpcontent2/source/auxiliary/ca/sbasic.cfg
+--- helpcontent2/source/auxiliary/ca/sbasic.cfg
++++ helpcontent2/source/auxiliary/ca/sbasic.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Basic
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=7
Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/ca/scalc.cfg helpcontent2/source/auxiliary/ca/scalc.cfg
---- helpcontent2.orig/source/auxiliary/ca/scalc.cfg 2006-01-19 15:33:42.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/scalc.cfg 2006-02-08 20:00:58.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/scalc.cfg helpcontent2/source/auxiliary/ca/scalc.cfg
+--- helpcontent2/source/auxiliary/ca/scalc.cfg
++++ helpcontent2/source/auxiliary/ca/scalc.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Calc
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=3
Start=text%2Fscalc%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/ca/sdatabase.cfg helpcontent2/source/auxiliary/ca/sdatabase.cfg
---- helpcontent2.orig/source/auxiliary/ca/sdatabase.cfg 2006-01-19 15:33:55.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/sdatabase.cfg 2006-02-08 20:01:02.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/sdatabase.cfg helpcontent2/source/auxiliary/ca/sdatabase.cfg
+--- helpcontent2/source/auxiliary/ca/sdatabase.cfg
++++ helpcontent2/source/auxiliary/ca/sdatabase.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Base
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=7
Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/ca/sdraw.cfg helpcontent2/source/auxiliary/ca/sdraw.cfg
---- helpcontent2.orig/source/auxiliary/ca/sdraw.cfg 2006-01-19 15:34:10.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/sdraw.cfg 2006-02-08 20:01:10.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/sdraw.cfg helpcontent2/source/auxiliary/ca/sdraw.cfg
+--- helpcontent2/source/auxiliary/ca/sdraw.cfg
++++ helpcontent2/source/auxiliary/ca/sdraw.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Draw
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=4
Start=text%2Fsdraw%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/ca/simpress.cfg helpcontent2/source/auxiliary/ca/simpress.cfg
---- helpcontent2.orig/source/auxiliary/ca/simpress.cfg 2006-01-19 15:34:27.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/simpress.cfg 2006-02-08 20:01:13.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/simpress.cfg helpcontent2/source/auxiliary/ca/simpress.cfg
+--- helpcontent2/source/auxiliary/ca/simpress.cfg
++++ helpcontent2/source/auxiliary/ca/simpress.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Impress
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=5
Start=text%2Fsimpress%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/ca/smath.cfg helpcontent2/source/auxiliary/ca/smath.cfg
---- helpcontent2.orig/source/auxiliary/ca/smath.cfg 2006-01-19 15:34:43.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/smath.cfg 2006-02-08 20:01:16.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/smath.cfg helpcontent2/source/auxiliary/ca/smath.cfg
+--- helpcontent2/source/auxiliary/ca/smath.cfg
++++ helpcontent2/source/auxiliary/ca/smath.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Math
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=6
Start=text%2Fsmath%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/ca/swriter.cfg helpcontent2/source/auxiliary/ca/swriter.cfg
---- helpcontent2.orig/source/auxiliary/ca/swriter.cfg 2006-01-19 15:34:55.000000000 +0100
-+++ helpcontent2/source/auxiliary/ca/swriter.cfg 2006-02-08 20:01:18.000000000 +0100
+diff --git helpcontent2/source/auxiliary/ca/swriter.cfg helpcontent2/source/auxiliary/ca/swriter.cfg
+--- helpcontent2/source/auxiliary/ca/swriter.cfg
++++ helpcontent2/source/auxiliary/ca/swriter.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Writer
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=ca
Order=2
Start=text%2Fswriter%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/sbasic.cfg helpcontent2/source/auxiliary/fa/sbasic.cfg
---- helpcontent2.orig/source/auxiliary/fa/sbasic.cfg 2006-01-19 15:36:23.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/sbasic.cfg 2006-02-08 19:59:57.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/sbasic.cfg helpcontent2/source/auxiliary/fa/sbasic.cfg
+--- helpcontent2/source/auxiliary/fa/sbasic.cfg
++++ helpcontent2/source/auxiliary/fa/sbasic.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Basic
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=7
Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/scalc.cfg helpcontent2/source/auxiliary/fa/scalc.cfg
---- helpcontent2.orig/source/auxiliary/fa/scalc.cfg 2006-01-19 15:36:35.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/scalc.cfg 2006-02-08 20:00:00.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/scalc.cfg helpcontent2/source/auxiliary/fa/scalc.cfg
+--- helpcontent2/source/auxiliary/fa/scalc.cfg
++++ helpcontent2/source/auxiliary/fa/scalc.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Calc
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=3
Start=text%2Fscalc%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/sdatabase.cfg helpcontent2/source/auxiliary/fa/sdatabase.cfg
---- helpcontent2.orig/source/auxiliary/fa/sdatabase.cfg 2006-01-19 15:36:51.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/sdatabase.cfg 2006-02-08 20:00:04.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/sdatabase.cfg helpcontent2/source/auxiliary/fa/sdatabase.cfg
+--- helpcontent2/source/auxiliary/fa/sdatabase.cfg
++++ helpcontent2/source/auxiliary/fa/sdatabase.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Base
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=7
Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/sdraw.cfg helpcontent2/source/auxiliary/fa/sdraw.cfg
---- helpcontent2.orig/source/auxiliary/fa/sdraw.cfg 2006-01-19 15:37:05.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/sdraw.cfg 2006-02-08 20:00:08.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/sdraw.cfg helpcontent2/source/auxiliary/fa/sdraw.cfg
+--- helpcontent2/source/auxiliary/fa/sdraw.cfg
++++ helpcontent2/source/auxiliary/fa/sdraw.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Draw
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=4
Start=text%2Fsdraw%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/simpress.cfg helpcontent2/source/auxiliary/fa/simpress.cfg
---- helpcontent2.orig/source/auxiliary/fa/simpress.cfg 2006-01-19 15:37:21.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/simpress.cfg 2006-02-08 20:00:11.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/simpress.cfg helpcontent2/source/auxiliary/fa/simpress.cfg
+--- helpcontent2/source/auxiliary/fa/simpress.cfg
++++ helpcontent2/source/auxiliary/fa/simpress.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Impress
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=5
Start=text%2Fsimpress%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/smath.cfg helpcontent2/source/auxiliary/fa/smath.cfg
---- helpcontent2.orig/source/auxiliary/fa/smath.cfg 2006-01-19 15:37:39.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/smath.cfg 2006-02-08 20:00:14.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/smath.cfg helpcontent2/source/auxiliary/fa/smath.cfg
+--- helpcontent2/source/auxiliary/fa/smath.cfg
++++ helpcontent2/source/auxiliary/fa/smath.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Math
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=6
Start=text%2Fsmath%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/fa/swriter.cfg helpcontent2/source/auxiliary/fa/swriter.cfg
---- helpcontent2.orig/source/auxiliary/fa/swriter.cfg 2006-01-19 15:37:53.000000000 +0100
-+++ helpcontent2/source/auxiliary/fa/swriter.cfg 2006-02-08 20:00:17.000000000 +0100
+diff --git helpcontent2/source/auxiliary/fa/swriter.cfg helpcontent2/source/auxiliary/fa/swriter.cfg
+--- helpcontent2/source/auxiliary/fa/swriter.cfg
++++ helpcontent2/source/auxiliary/fa/swriter.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Writer
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=fa
Order=2
Start=text%2Fswriter%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/sbasic.cfg helpcontent2/source/auxiliary/mk/sbasic.cfg
---- helpcontent2.orig/source/auxiliary/mk/sbasic.cfg 2006-01-19 15:39:24.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/sbasic.cfg 2006-02-08 19:59:26.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/sbasic.cfg helpcontent2/source/auxiliary/mk/sbasic.cfg
+--- helpcontent2/source/auxiliary/mk/sbasic.cfg
++++ helpcontent2/source/auxiliary/mk/sbasic.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Basic
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=7
Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/scalc.cfg helpcontent2/source/auxiliary/mk/scalc.cfg
---- helpcontent2.orig/source/auxiliary/mk/scalc.cfg 2006-01-19 15:39:37.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/scalc.cfg 2006-02-08 19:59:29.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/scalc.cfg helpcontent2/source/auxiliary/mk/scalc.cfg
+--- helpcontent2/source/auxiliary/mk/scalc.cfg
++++ helpcontent2/source/auxiliary/mk/scalc.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Calc
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=3
Start=text%2Fscalc%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/sdatabase.cfg helpcontent2/source/auxiliary/mk/sdatabase.cfg
---- helpcontent2.orig/source/auxiliary/mk/sdatabase.cfg 2006-01-19 15:39:55.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/sdatabase.cfg 2006-02-08 19:59:36.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/sdatabase.cfg helpcontent2/source/auxiliary/mk/sdatabase.cfg
+--- helpcontent2/source/auxiliary/mk/sdatabase.cfg
++++ helpcontent2/source/auxiliary/mk/sdatabase.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Base
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=7
Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/sdraw.cfg helpcontent2/source/auxiliary/mk/sdraw.cfg
---- helpcontent2.orig/source/auxiliary/mk/sdraw.cfg 2006-01-19 15:40:08.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/sdraw.cfg 2006-02-08 19:59:40.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/sdraw.cfg helpcontent2/source/auxiliary/mk/sdraw.cfg
+--- helpcontent2/source/auxiliary/mk/sdraw.cfg
++++ helpcontent2/source/auxiliary/mk/sdraw.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Draw
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=4
Start=text%2Fsdraw%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/simpress.cfg helpcontent2/source/auxiliary/mk/simpress.cfg
---- helpcontent2.orig/source/auxiliary/mk/simpress.cfg 2006-01-19 15:40:24.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/simpress.cfg 2006-02-08 19:59:43.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/simpress.cfg helpcontent2/source/auxiliary/mk/simpress.cfg
+--- helpcontent2/source/auxiliary/mk/simpress.cfg
++++ helpcontent2/source/auxiliary/mk/simpress.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Impress
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=5
Start=text%2Fsimpress%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/smath.cfg helpcontent2/source/auxiliary/mk/smath.cfg
---- helpcontent2.orig/source/auxiliary/mk/smath.cfg 2006-01-19 15:40:37.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/smath.cfg 2006-02-08 19:59:47.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/smath.cfg helpcontent2/source/auxiliary/mk/smath.cfg
+--- helpcontent2/source/auxiliary/mk/smath.cfg
++++ helpcontent2/source/auxiliary/mk/smath.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Math
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=6
Start=text%2Fsmath%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/mk/swriter.cfg helpcontent2/source/auxiliary/mk/swriter.cfg
---- helpcontent2.orig/source/auxiliary/mk/swriter.cfg 2006-01-19 15:40:52.000000000 +0100
-+++ helpcontent2/source/auxiliary/mk/swriter.cfg 2006-02-08 19:59:50.000000000 +0100
+diff --git helpcontent2/source/auxiliary/mk/swriter.cfg helpcontent2/source/auxiliary/mk/swriter.cfg
+--- helpcontent2/source/auxiliary/mk/swriter.cfg
++++ helpcontent2/source/auxiliary/mk/swriter.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Writer
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=mk
Order=2
Start=text%2Fswriter%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/sbasic.cfg helpcontent2/source/auxiliary/xh/sbasic.cfg
---- helpcontent2.orig/source/auxiliary/xh/sbasic.cfg 2006-01-19 15:42:27.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/sbasic.cfg 2006-02-08 19:58:48.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/sbasic.cfg helpcontent2/source/auxiliary/xh/sbasic.cfg
+--- helpcontent2/source/auxiliary/xh/sbasic.cfg
++++ helpcontent2/source/auxiliary/xh/sbasic.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Basic
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=7
Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/scalc.cfg helpcontent2/source/auxiliary/xh/scalc.cfg
---- helpcontent2.orig/source/auxiliary/xh/scalc.cfg 2006-01-19 15:42:43.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/scalc.cfg 2006-02-08 19:58:57.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/scalc.cfg helpcontent2/source/auxiliary/xh/scalc.cfg
+--- helpcontent2/source/auxiliary/xh/scalc.cfg
++++ helpcontent2/source/auxiliary/xh/scalc.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Calc
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=3
Start=text%2Fscalc%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/sdatabase.cfg helpcontent2/source/auxiliary/xh/sdatabase.cfg
---- helpcontent2.orig/source/auxiliary/xh/sdatabase.cfg 2006-01-19 15:42:55.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/sdatabase.cfg 2006-02-08 19:59:02.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/sdatabase.cfg helpcontent2/source/auxiliary/xh/sdatabase.cfg
+--- helpcontent2/source/auxiliary/xh/sdatabase.cfg
++++ helpcontent2/source/auxiliary/xh/sdatabase.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Base
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=7
Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/sdraw.cfg helpcontent2/source/auxiliary/xh/sdraw.cfg
---- helpcontent2.orig/source/auxiliary/xh/sdraw.cfg 2006-01-19 15:43:10.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/sdraw.cfg 2006-02-08 19:59:07.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/sdraw.cfg helpcontent2/source/auxiliary/xh/sdraw.cfg
+--- helpcontent2/source/auxiliary/xh/sdraw.cfg
++++ helpcontent2/source/auxiliary/xh/sdraw.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Draw
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=4
Start=text%2Fsdraw%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/simpress.cfg helpcontent2/source/auxiliary/xh/simpress.cfg
---- helpcontent2.orig/source/auxiliary/xh/simpress.cfg 2006-01-19 15:43:24.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/simpress.cfg 2006-02-08 19:59:10.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/simpress.cfg helpcontent2/source/auxiliary/xh/simpress.cfg
+--- helpcontent2/source/auxiliary/xh/simpress.cfg
++++ helpcontent2/source/auxiliary/xh/simpress.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Impress
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=5
Start=text%2Fsimpress%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/smath.cfg helpcontent2/source/auxiliary/xh/smath.cfg
---- helpcontent2.orig/source/auxiliary/xh/smath.cfg 2006-01-19 15:43:38.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/smath.cfg 2006-02-08 19:59:14.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/smath.cfg helpcontent2/source/auxiliary/xh/smath.cfg
+--- helpcontent2/source/auxiliary/xh/smath.cfg
++++ helpcontent2/source/auxiliary/xh/smath.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Math
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=6
Start=text%2Fsmath%2Fmain0000.xhp
Heading=headingheading
-diff -urN helpcontent2.orig/source/auxiliary/xh/swriter.cfg helpcontent2/source/auxiliary/xh/swriter.cfg
---- helpcontent2.orig/source/auxiliary/xh/swriter.cfg 2006-01-19 15:43:53.000000000 +0100
-+++ helpcontent2/source/auxiliary/xh/swriter.cfg 2006-02-08 19:59:20.000000000 +0100
+diff --git helpcontent2/source/auxiliary/xh/swriter.cfg helpcontent2/source/auxiliary/xh/swriter.cfg
+--- helpcontent2/source/auxiliary/xh/swriter.cfg
++++ helpcontent2/source/auxiliary/xh/swriter.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Writer
- Copyright=Copyright 2004, Sun Microsystems, Inc.
+
-Language=en-US
+Language=xh
Order=2
diff --git a/patches/dev300/redirect-extensions-m12.diff b/patches/dev300/redirect-extensions-m12.diff
new file mode 100644
index 0000000..3532d43
--- /dev/null
+++ b/patches/dev300/redirect-extensions-m12.diff
@@ -0,0 +1,181 @@
+--- dbaccess/source/ui/dlg/ExtensionNotPresent.cxx.old 2009-04-02 10:41:31.000000000 +0000
++++ dbaccess/source/ui/dlg/ExtensionNotPresent.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -201,7 +201,7 @@ IMPL_LINK( OExtensionNotPresentDialog, D
+ if (suDownloadURL.getLength() == 0)
+ {
+ // fallback
+- suDownloadURL = UNISTRING("http://extensions.services.openoffice.org");
++ suDownloadURL = UNISTRING("http://extensions.go-oo.org");
+ }
+
+ // open such URL in a browser
+--- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs.old 2009-04-02 10:35:53.000000000 +0000
++++ reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs 2009-04-06 16:41:41.000000000 +0000
+@@ -55,7 +55,7 @@
+ <author>LLA</author>
+ <desc>Direct download URL to the Sun(tm) Report Builder extension.</desc>
+ </info>
+- <value>http://extensions.services.openoffice.org</value>
++ <value>http://extensions.go-oo.org</value>
+ </prop>
+ <prop oor:name="Name" oor:type="xs:string">
+ <info>
+--- officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu.old 2009-04-02 11:02:04.000000000 +0000
++++ officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu 2009-04-06 16:41:41.000000000 +0000
+@@ -33,7 +33,7 @@
+ <oor:component-data oor:name="ExtensionManager" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry">
+ <node oor:name="ExtensionRepositories">
+ <prop oor:name="WebsiteLink">
+- <value>http://extensions.services.openoffice.org/getmore?cid=920794</value>
++ <value>http://extensions.go-oo.org/getmore?cid=920794</value>
+ </prop>
+ </node>
+ </oor:component-data>
+--- sfx2/source/appl/appserv.cxx.old 2009-04-02 10:44:02.000000000 +0000
++++ sfx2/source/appl/appserv.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -873,7 +873,7 @@ void SfxApplication::OfaExec_Impl( SfxRe
+ xSMGR->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ),
+ uno::UNO_QUERY_THROW );
+ if ( xSystemShell.is() )
+- xSystemShell->execute( DEFINE_CONST_UNICODE("http://extensions.services.openoffice.org/dictionary?cid=926385"), ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
++ xSystemShell->execute( DEFINE_CONST_UNICODE("http://extensions.go-oo.org/dictionary?cid=926385"), ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
+ }
+ catch( const ::com::sun::star::uno::Exception& )
+ {
+--- svx/source/options/optlingu.cxx.old 2009-04-02 11:03:06.000000000 +0000
++++ svx/source/options/optlingu.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -1177,7 +1177,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window
+ != SvtExtendedSecurityOptions::OPEN_NEVER )
+ {
+ aMoreDictsLink.SetURL( String(
+- RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) );
++ RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/dictionary?cid=926386" ) ) );
+ aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) );
+ }
+ else
+@@ -2065,7 +2065,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Win
+ != SvtExtendedSecurityOptions::OPEN_NEVER )
+ {
+ aMoreDictsLink.SetURL( String(
+- RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) );
++ RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/dictionary?cid=926386" ) ) );
+ aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) );
+ }
+ else
+--- svtools/source/contnr/templwin.cxx.old 2009-04-02 11:06:15.000000000 +0000
++++ svtools/source/contnr/templwin.cxx 2009-04-06 16:41:41.000000000 +0000
+@@ -1743,7 +1743,7 @@ void SvtDocumentTemplateDialog::InitImpl
+ if ( !bHideLink )
+ {
+ aMoreTemplatesLink.SetURL( String(
+- RTL_CONSTASCII_STRINGPARAM( "http://templates.services.openoffice.org/?cid=923508" ) ) );
++ RTL_CONSTASCII_STRINGPARAM( "http://templates.go-oo.org/?cid=923508" ) ) );
+ aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) );
+ }
+ else
+--- instsetoo_native/util/openoffice.lst.old 2009-04-02 10:36:19.000000000 +0000
++++ instsetoo_native/util/openoffice.lst 2009-04-06 16:41:41.000000000 +0000
+@@ -88,9 +88,9 @@ OpenOffice
+ DOWNLOADBITMAP ooobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
+@@ -152,9 +152,9 @@ OpenOffice_wJRE
+ DOWNLOADBITMAP ooobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
+@@ -223,9 +223,9 @@ OpenOffice_Dev
+ DOWNLOADSETUPICO ooosetup.ico
+ LOCALUSERDIR $ORIGIN/..
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
+@@ -265,9 +265,9 @@ URE
+ DONTUSESTARTMENUFOLDER 1
+ SERVICESPROJEKT 1
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+ PACKAGEMAP package_names_ext.txt
+ }
+@@ -309,9 +309,9 @@ OpenOffice_SDK
+ DOWNLOADSETUPICO ooosetup.ico
+ DONTUSESTARTMENUFOLDER 1
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ }
+ active 1
+ compression 5
+@@ -372,9 +372,9 @@ BrOffice
+ DOWNLOADBITMAP brobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
+@@ -440,9 +440,9 @@ BrOffice_wJRE
+ DOWNLOADBITMAP brobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
+@@ -514,9 +514,9 @@ BrOffice_Dev
+ DOWNLOADSETUPICO ooosetup.ico
+ LOCALUSERDIR $ORIGIN/..
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
diff --git a/patches/dev300/redirect-extensions.diff b/patches/dev300/redirect-extensions.diff
index 3532d43..5aa4f38 100644
--- a/patches/dev300/redirect-extensions.diff
+++ b/patches/dev300/redirect-extensions.diff
@@ -75,7 +75,7 @@
else
--- instsetoo_native/util/openoffice.lst.old 2009-04-02 10:36:19.000000000 +0000
+++ instsetoo_native/util/openoffice.lst 2009-04-06 16:41:41.000000000 +0000
-@@ -88,9 +88,9 @@ OpenOffice
+@@ -91,9 +91,9 @@
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
@@ -85,10 +85,10 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
- }
-@@ -152,9 +152,9 @@ OpenOffice_wJRE
+@@ -156,9 +156,9 @@
DOWNLOADBITMAP ooobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
@@ -98,10 +98,10 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
- }
-@@ -223,9 +223,9 @@ OpenOffice_Dev
+@@ -228,9 +228,9 @@
DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
@@ -111,10 +111,10 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
- }
-@@ -265,9 +265,9 @@ URE
+@@ -272,9 +272,9 @@
DONTUSESTARTMENUFOLDER 1
SERVICESPROJEKT 1
RELATIVE_PATHES_IN_DDF 1
@@ -124,10 +124,23 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
PACKAGEMAP package_names_ext.txt
+@@ -318,9 +318,9 @@
+ DOWNLOADSETUPICO ooosetup.ico
+ DONTUSESTARTMENUFOLDER 1
+ RELATIVE_PATHES_IN_DDF 1
+- STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+- STARTCENTER_INFO_URL http://www.openoffice.org
+- STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
++ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
++ STARTCENTER_INFO_URL http://www.go-oo.org
++ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
}
-@@ -309,9 +309,9 @@ OpenOffice_SDK
+ active 1
+@@ -368,9 +368,9 @@
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
@@ -137,10 +150,10 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
}
active 1
- compression 5
-@@ -372,9 +372,9 @@ BrOffice
+@@ -433,9 +433,9 @@
DOWNLOADBITMAP brobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
@@ -150,10 +163,10 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
- }
-@@ -440,9 +440,9 @@ BrOffice_wJRE
+@@ -503,9 +503,9 @@
DOWNLOADBITMAP brobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
@@ -163,10 +176,10 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
- }
-@@ -514,9 +514,9 @@ BrOffice_Dev
+@@ -579,9 +579,9 @@
DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
@@ -176,6 +189,6 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+ STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
+ STARTCENTER_LAYOUT_STYLE 0
REGISTRATION_PRODUCT OpenOffice.org
REGISTRATION_CID 926117
- }
More information about the ooo-build-commit
mailing list