[ooo-build-commit] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/help-support.diff        |    3 +--
 patches/dev300/novell-subscription.diff |    4 ++--
 patches/dev300/redirect-extensions.diff |   12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 45b22b1f218c3bac76d5cfe57a7d2529eb44bd52
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Sep 28 10:52:00 2010 +0200

    Fixed patches that didn't apply anymore

diff --git a/patches/dev300/help-support.diff b/patches/dev300/help-support.diff
index abf68b3..b01d7f3 100644
--- a/patches/dev300/help-support.diff
+++ b/patches/dev300/help-support.diff
@@ -15,7 +15,7 @@ index 3280dd1..d66dabb 100644
  #include <svl/intitem.hxx>
  #include <svl/eitem.hxx>
  #include <svl/stritem.hxx>
-@@ -343,9 +345,24 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
+@@ -343,8 +345,24 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
              break;
          }
  
@@ -37,7 +37,6 @@ index 3280dd1..d66dabb 100644
 +
          // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          case SID_HELPINDEX:
--        case SID_HELP_SUPPORTPAGE:
          {
              Help* pHelp = Application::GetHelp();
              if ( pHelp )
diff --git a/patches/dev300/novell-subscription.diff b/patches/dev300/novell-subscription.diff
index b9e0ffa..5f3f0c7 100644
--- a/patches/dev300/novell-subscription.diff
+++ b/patches/dev300/novell-subscription.diff
@@ -11,7 +11,7 @@ index 175867d..2eb3879 100644
 --- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 +++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 @@ -4160,6 +4160,11 @@
-                     <value xml:lang="en-US">~Support</value>
+                     <value xml:lang="en-US">License Information...</value>
                  </prop>
              </node>
 +            <node oor:name=".uno:GetSubscription" oor:op="replace">
@@ -42,7 +42,7 @@ index 9000359..69e8e4b 100644
 --- sfx2/inc/sfx2/sfxsids.hrc
 +++ sfx2/inc/sfx2/sfxsids.hrc
 @@ -127,6 +127,10 @@
- #define SID_HELP_SUPPORTPAGE				(SID_SFX_START + 1683)
+ #define SID_SHOW_LICENSE					(SID_SFX_START + 1683)
  #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
  
 +// default id for subscription
diff --git a/patches/dev300/redirect-extensions.diff b/patches/dev300/redirect-extensions.diff
index f3f7430..93cca40 100644
--- a/patches/dev300/redirect-extensions.diff
+++ b/patches/dev300/redirect-extensions.diff
@@ -42,7 +42,7 @@
 +            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_PRODUCT LibreOffice
              REGISTRATION_CID 926117
 @@ -160,9 +160,9 @@ OpenOffice_wJRE
  			DOWNLOADBITMAP	ooobitmap.bmp
@@ -55,7 +55,7 @@
 +            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_PRODUCT LibreOffice
              REGISTRATION_CID 926117
 @@ -232,9 +232,9 @@ OpenOffice_Dev
  			DOWNLOADSETUPICO	ooosetup.ico
@@ -68,7 +68,7 @@
 +            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_PRODUCT LibreOffice
              REGISTRATION_CID 926117
 @@ -276,9 +276,9 @@ URE
              DONTUSESTARTMENUFOLDER 1
@@ -120,7 +120,7 @@
 +            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_PRODUCT LibreOffice
              REGISTRATION_CID 926117
 @@ -513,9 +513,9 @@ BrOffice_wJRE
  			DOWNLOADSETUPICO	ooosetup.ico
@@ -133,7 +133,7 @@
 +            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_PRODUCT LibreOffice
              REGISTRATION_CID 926117
 @@ -585,9 +585,9 @@ BrOffice_Dev
  			WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
@@ -146,7 +146,7 @@
 +            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_PRODUCT LibreOffice
              REGISTRATION_CID 926117
 --- officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu.old	2010-07-26 15:06:38.000000000 +0200
 +++ officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu	2010-07-29 14:58:55.000000000 +0200