[ooo-build-commit] .: 3 commits - desktop/scripts framework/source framework/uiconfig officecfg/registry svx/inc

[Jan Holesovsky]

 desktop/scripts/soffice.sh                             |    5 +++++
 framework/source/services/backingwindow.cxx            |    8 --------
 framework/uiconfig/startmodule/menubar/menubar.xml     |    1 -
 officecfg/registry/data/org/openoffice/Office/Jobs.xcu |    9 ---------
 svx/inc/globlmn_tmpl.hrc                               |    4 ----
 5 files changed, 5 insertions(+), 22 deletions(-)

New commits:
commit 06305328f46e5775f3f5337ece71f22adaa259c2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Sep 15 11:31:55 2010 +0200

    Source ooenv in the soffice wrapper if it exists (for linked builds).

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index e2031c2..53c39d4 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -55,6 +55,11 @@ fi
 sd_prog=`pwd`
 cd "$sd_cwd"
 
+# linked build needs additional settings
+if [ -e ooenv ] ; then
+    source ooenv
+fi
+
 sd_binary=`basename "$0"`.bin
 
 #collect all bootstrap variables specified on the command line
commit b25ed8d91223afcd81f07108504aa3ad2a86fa9c
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Sep 15 10:52:08 2010 +0200

    default-no-registration-menu.diff: Remove registration from menu.

diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 8817e60..a7d8709 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -185,7 +185,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     }
 
     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-    String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
     String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
 
@@ -214,12 +213,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() );
-    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() );
     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
     maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
@@ -431,7 +424,6 @@ void BackingWindow::initBackground()
         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 a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index b5e52e7..e9a0f33 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/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 a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 22dc0b1..2a3c5c4 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1110,10 +1110,6 @@
                 };\
                 MenuItem\
                 {\
-                    ITEM_HELP_ONLINE_REGISTRATION\
-                };\
-                MenuItem\
-                {\
                     Separator = TRUE ; \
                 };\
                 MenuItem\
commit a5f6da09fccd47c0bb6d7a6b39fb67d774446d69
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Sep 15 10:51:18 2010 +0200

    default-no-registration.diff: Do not force to register.

diff --git a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
index 4a9c56c..2e2fdc4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
@@ -35,14 +35,5 @@
     </node>
   </node>
   <node oor:name="Events">
-    <node oor:name="onFirstVisibleTask" oor:op="fuse">
-      <node oor:name="JobList">
-        <node oor:name="RegistrationRequest" oor:op="replace">
-            <prop oor:name="UserTime">
-                <value>2003-01-01T00:00:00+00:01</value>
-            </prop>
-        </node>
-      </node>
-    </node>
   </node>
 </oor:component-data>