incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1240245 - in /incubator/ooo/trunk/main: ./ binfilter/bf_svtools/source/config/ binfilter/inc/bf_sfx2/ binfilter/inc/bf_svx/ chart2/uiconfig/menubar/ configmgr/qa/unit/ cui/source/options/ dbaccess/uiconfig/dbapp/menubar/ dbaccess/uiconfig/...
Date Fri, 03 Feb 2012 16:58:48 GMT
Author: jsc
Date: Fri Feb  3 16:58:45 2012
New Revision: 1240245

URL: http://svn.apache.org/viewvc?rev=1240245&view=rev
Log:
remove onlineregistration with dependencies

Removed:
    incubator/ooo/trunk/main/desktop/source/registration/
    incubator/ooo/trunk/main/helpcontent2/source/text/shared/01/08060100.xhp
    incubator/ooo/trunk/main/svtools/AllLangResTarget_productregistration.mk
    incubator/ooo/trunk/main/svtools/Library_productregistration.mk
    incubator/ooo/trunk/main/svtools/source/productregistration/
    incubator/ooo/trunk/main/unotools/inc/unotools/regoptions.hxx
    incubator/ooo/trunk/main/unotools/source/config/regoptions.cxx
Modified:
    incubator/ooo/trunk/main/Repository.mk
    incubator/ooo/trunk/main/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
    incubator/ooo/trunk/main/binfilter/inc/bf_sfx2/sfxsids.hrc
    incubator/ooo/trunk/main/binfilter/inc/bf_svx/globlmn.hrc
    incubator/ooo/trunk/main/chart2/uiconfig/menubar/menubar.xml
    incubator/ooo/trunk/main/configmgr/qa/unit/data.xcd
    incubator/ooo/trunk/main/cui/source/options/optgenrl.src
    incubator/ooo/trunk/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml
    incubator/ooo/trunk/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml
    incubator/ooo/trunk/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
    incubator/ooo/trunk/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml
    incubator/ooo/trunk/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
    incubator/ooo/trunk/main/desktop/prj/build.lst
    incubator/ooo/trunk/main/desktop/prj/d.lst
    incubator/ooo/trunk/main/desktop/source/app/app.cxx
    incubator/ooo/trunk/main/desktop/source/migration/pages.cxx
    incubator/ooo/trunk/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
    incubator/ooo/trunk/main/framework/source/fwe/classes/addonmenu.cxx
    incubator/ooo/trunk/main/framework/source/uielement/menubarmanager.cxx
    incubator/ooo/trunk/main/framework/uiconfig/startmodule/menubar/menubar.xml
    incubator/ooo/trunk/main/helpcontent2/helpers/help_hid.lst
    incubator/ooo/trunk/main/helpcontent2/helpers/longnames_commands.csv
    incubator/ooo/trunk/main/helpcontent2/helpers/uno_hid.lst
    incubator/ooo/trunk/main/helpcontent2/helpers/unocmds.txt
    incubator/ooo/trunk/main/helpcontent2/source/text/shared/01/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/source/text/shared/autopi/startup.xhp
    incubator/ooo/trunk/main/helpcontent2/source/text/shared/main0108.xhp
    incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk
    incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk
    incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Common.xcu
    incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
    incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
    incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
    incubator/ooo/trunk/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml
    incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp
    incubator/ooo/trunk/main/scripting/workben/bindings/calcmenubar.xml
    incubator/ooo/trunk/main/scripting/workben/bindings/drawmenubar.xml
    incubator/ooo/trunk/main/scripting/workben/bindings/impressmenubar.xml
    incubator/ooo/trunk/main/scripting/workben/bindings/writermenubar.xml
    incubator/ooo/trunk/main/sd/uiconfig/sdraw/menubar/menubar.xml
    incubator/ooo/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml
    incubator/ooo/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx
    incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxcommands.h
    incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxsids.hrc
    incubator/ooo/trunk/main/sfx2/sdi/appslots.sdi
    incubator/ooo/trunk/main/sfx2/sdi/sfx.sdi
    incubator/ooo/trunk/main/sfx2/source/appl/appserv.cxx
    incubator/ooo/trunk/main/starmath/uiconfig/smath/menubar/menubar.xml
    incubator/ooo/trunk/main/svtools/Module_svtools.mk
    incubator/ooo/trunk/main/svx/inc/globlmn_tmpl.hrc
    incubator/ooo/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml
    incubator/ooo/trunk/main/sw/uiconfig/swform/menubar/menubar.xml
    incubator/ooo/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml
    incubator/ooo/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml
    incubator/ooo/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_basic.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_calc.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_draw.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_htmldokument.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_impress.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_insight.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_masterdoc.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_math.txt
    incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_writer.txt
    incubator/ooo/trunk/main/testautomation/global/sid/all.sid
    incubator/ooo/trunk/main/toolkit/src2xml/src.lst
    incubator/ooo/trunk/main/unotools/source/config/itemholder1.cxx
    incubator/ooo/trunk/main/unotools/source/config/makefile.mk

Modified: incubator/ooo/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/Repository.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/Repository.mk (original)
+++ incubator/ooo/trunk/main/Repository.mk Fri Feb  3 16:58:45 2012
@@ -124,7 +124,6 @@ $(eval $(call gb_Helper_register_librari
 	fsstorage \
 	hatchwindowfactory \
 	passwordcontainer \
-	productregistration \
 	vbaswobj \
     msforms \
 ))

Modified: incubator/ooo/trunk/main/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_svtools/source/config/svt_itemholder1.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_svtools/source/config/svt_itemholder1.cxx (original)
+++ incubator/ooo/trunk/main/binfilter/bf_svtools/source/config/svt_itemholder1.cxx Fri Feb  3 16:58:45 2012
@@ -57,7 +57,7 @@
 #include <bf_svtools/options3d.hxx>
 #include <bf_svtools/pathoptions.hxx>
 #include <bf_svtools/printwarningoptions.hxx>
-#include <regoptions.hxx>
+//#include <regoptions.hxx>
 #include <bf_svtools/optionsdlg.hxx>
 #include <bf_svtools/saveopt.hxx>
 #include <searchopt.hxx>
@@ -257,10 +257,6 @@ void ItemHolder1::impl_newItem(TItemInfo
             rItem.pItem = new SvtPrintWarningOptions();
             break;
 
-        case E_REGOPTIONS :
-// no ref count            rItem.pItem = new ::svt::RegOptions();
-            break;
-
         case E_SAVEOPTIONS :
             rItem.pItem = new SvtSaveOptions();
             break;

Modified: incubator/ooo/trunk/main/binfilter/inc/bf_sfx2/sfxsids.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/inc/bf_sfx2/sfxsids.hrc?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/inc/bf_sfx2/sfxsids.hrc (original)
+++ incubator/ooo/trunk/main/binfilter/inc/bf_sfx2/sfxsids.hrc Fri Feb  3 16:58:45 2012
@@ -408,9 +408,7 @@
 #define SID_LOCKALL  						(SID_SFX_START + 1534)
 #define SID_WAITPOINTER                     (SID_SFX_START + 1535)
 
-#define SID_ONLINE_REGISTRATION				(SID_SFX_START + 1537)
 #define SID_CHANNELS						(SID_SFX_START + 1538)
-#define SID_ONLINE_REGISTRATION_DLG			(SID_SFX_START + 1540)
 #define SID_CONTENTTYPE                     (SID_SFX_START + 1541)
 #define SID_DOC_IGNOREINFORMATIONLOST       (SID_SFX_START + 1544)
 

Modified: incubator/ooo/trunk/main/binfilter/inc/bf_svx/globlmn.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/inc/bf_svx/globlmn.hrc?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/inc/bf_svx/globlmn.hrc (original)
+++ incubator/ooo/trunk/main/binfilter/inc/bf_svx/globlmn.hrc Fri Feb  3 16:58:45 2012
@@ -4717,39 +4717,6 @@
 	Text[ he ] = "~Support";\
 	
 
-#define ITEM_HELP_ONLINE_REGISTRATION \
-    Identifier = SID_ONLINE_REGISTRATION ; \
-	Command = ".uno:OnlineRegistrationDlg" ; \
-    HelpID = SID_ONLINE_REGISTRATION ; \
-    Text [ de ] = "~Registrierung..." ; \
-    Text [ en-US ] = "~Registration..." ; \
-	Text [ x-comment ] = " ";	\
-	Text[ pt ] = "~Registo...";\
-	Text[ ru ] = "Регистрация...";\
-	Text[ el ] = "Δή~λωση...";\
-	Text[ nl ] = "~Registratie...";\
-	Text[ fr ] = "Enregistrement...";\
-	Text[ es ] = "~Registro...";\
-	Text[ fi ] = "~Rekisteröityminen...";\
-	Text[ ca ] = "~Registre...";\
-	Text[ it ] = "~Registrazione...";\
-	Text[ cs ] = "Registrace...";\
-	Text[ sk ] = "Re~gistrácia...";\
-	Text[ da ] = "~Registrering...";\
-	Text[ sv ] = "~Registrering...";\
-	Text[ pl ] = "~Rejestracja...";\
-	Text[ pt-BR ] = "~Registro..";\
-	Text[ th ] = "~ลงทะเบียน...";\
-	Text[ ja ] = "登録(~R)...";\
-	Text[ ko ] = "Suite 웹 등록(~R)...";\
-	Text[ zh-CN ] = "注册(~R)...";\
-	Text[ zh-TW ] = "註冊(~R)...";\
-	Text[ tr ] = "Kayıt...";\
-	Text[ hi-IN ] = "~रिजिस्टरी...";\
-	Text[ ar ] = "...تسجيل";\
-	Text[ he ] = "‮הרשמה...‬";\
-	
-
 #define ITEM_HELP_CHANNELS \
     Identifier = SID_CHANNELS ; \
     HelpID = SID_CHANNELS ; \
@@ -4855,10 +4822,6 @@
                 {\
 					ITEM_HELP_SUPPORTPAGE\
 				};\
-				MenuItem\
-                {\
-					ITEM_HELP_ONLINE_REGISTRATION\
-				};\
                 MenuItem\
                 {\
                     Separator = TRUE ; \

Modified: incubator/ooo/trunk/main/chart2/uiconfig/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/chart2/uiconfig/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/chart2/uiconfig/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/chart2/uiconfig/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/configmgr/qa/unit/data.xcd
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configmgr/qa/unit/data.xcd?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configmgr/qa/unit/data.xcd (original)
+++ incubator/ooo/trunk/main/configmgr/qa/unit/data.xcd Fri Feb  3 16:58:45 2012
@@ -3582,11 +3582,6 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:OnlineRegistrationDlg" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Registration...</value>
-        </prop>
-      </node>
       <node oor:name=".uno:GoToStartSel" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Select to File Begin</value>

Modified: incubator/ooo/trunk/main/cui/source/options/optgenrl.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optgenrl.src?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/optgenrl.src (original)
+++ incubator/ooo/trunk/main/cui/source/options/optgenrl.src Fri Feb  3 16:58:45 2012
@@ -286,7 +286,7 @@ QueryBox RID_SVXQB_CHANGEDATA
 {
 	BUTTONS = WB_YES_NO ;
 	DEFBUTTON = WB_DEF_NO ;
-	Message [ en-US ] = "The User Data have been changed.\nNote that, if you continue, the registration key will become invalid.\nTherefore, a new registration key is needed within 30 days.\nYou can find the registration form in the menu Help - Registration...\nDo you really want to change your User Data?";
+	Message [ en-US ] = "The User Data have been changed.\nDo you really want to change your User Data?";
 };
 
  // ********************************************************************** EOF

Modified: incubator/ooo/trunk/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/dbaccess/uiconfig/dbapp/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/dbaccess/uiconfig/dbquery/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/dbaccess/uiconfig/dbrelation/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/dbaccess/uiconfig/dbtable/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/dbaccess/uiconfig/dbtdata/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -67,7 +67,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>

Modified: incubator/ooo/trunk/main/desktop/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/prj/build.lst?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/prj/build.lst (original)
+++ incubator/ooo/trunk/main/desktop/prj/build.lst Fri Feb  3 16:58:45 2012
@@ -13,7 +13,7 @@ dt	desktop\win32\source					nmake	-	w	dt
 dt	desktop\win32\source\setup				nmake	-	w	dt_setup dt_inc NULL
 dt	desktop\win32\source\officeloader		nmake	-	w	dt_officeloader dt_inc NULL
 dt	desktop\win32\source\guiloader			nmake	-	w	dt_guiloader dt_wrapper.w dt_inc NULL
-dt  desktop\win32\source\guistdio           nmake   -   w   dt_guistdio dt_inc NULL
+dt  	desktop\win32\source\guistdio           nmake   -   w   dt_guistdio dt_inc NULL
 dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
 dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
 dt	desktop\win32\source\rebase				nmake	-	w	dt_rebase dt_inc NULL
@@ -40,11 +40,8 @@ dt	desktop\source\deployment\registry\ex
 dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
 dt	desktop\util							nmake	-	all	dt_util dt_app dt_pagein.u dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w dt_win32_quickstart_so.w NULL
 dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
-dt  desktop\registry\data\org\openoffice\Office                     nmake   -  all sn_regconfig NULL
-dt  desktop\source\registration\com\sun\star\servicetag\resources   get     -  all sn_svctagres NULL
-dt  desktop\source\registration\com\sun\star\servicetag             nmake   -  all sn_svctag NULL
-dt  desktop\source\registration\com\sun\star\registration           nmake   -  all sn_regjob sn_svctag NULL
-dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
-dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
-dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
-dt desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL
+dt  	desktop\registry\data\org\openoffice\Office                     nmake   -  all sn_regconfig NULL
+dt 	desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
+dt 	desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
+dt 	desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
+dt 	desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL

Modified: incubator/ooo/trunk/main/desktop/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/prj/d.lst?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/prj/d.lst (original)
+++ incubator/ooo/trunk/main/desktop/prj/d.lst Fri Feb  3 16:58:45 2012
@@ -145,6 +145,5 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
 ..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component
 ..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component
 ..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component
-..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml%_EXT%\productregistration.jar.component
 ..\%__SRC%\misc\socomp.component %_DEST%\xml%_EXT%\socomp.component
 ..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component

Modified: incubator/ooo/trunk/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/app/app.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/app/app.cxx (original)
+++ incubator/ooo/trunk/main/desktop/source/app/app.cxx Fri Feb  3 16:58:45 2012
@@ -155,7 +155,7 @@
 #include <svtools/apearcfg.hxx>
 #include <unotools/misccfg.hxx>
 #include <svtools/filter.hxx>
-#include <unotools/regoptions.hxx>
+//#include <unotools/regoptions.hxx>
 
 #include "langselect.hxx"
 
@@ -197,9 +197,6 @@ static SalMainPipeExchangeSignalHandler*
 static sal_Bool _bCrashReporterEnabled = sal_True;
 
 static const ::rtl::OUString CFG_PACKAGE_COMMON_HELP   ( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Help"));
-static const ::rtl::OUString CFG_PATH_REG              ( RTL_CONSTASCII_USTRINGPARAM( "Registration"                     ));
-static const ::rtl::OUString CFG_ENTRY_REGURL          ( RTL_CONSTASCII_USTRINGPARAM( "URL"                              ));
-static const ::rtl::OUString CFG_ENTRY_TEMPLATEREGURL  ( RTL_CONSTASCII_USTRINGPARAM( "TemplateURL"                      ));
 
 static ::rtl::OUString getBrandSharePreregBundledPathURL();
 // ----------------------------------------------------------------------------
@@ -1747,7 +1744,6 @@ void Desktop::Main()
 
             if (IsFirstStartWizardNeeded())
             {
-                ::utl::RegOptions().removeReminder(); // remove patch registration reminder
                 Reference< XJob > xFirstStartJob( xSMgr->createInstance(
                     DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
                 if (xFirstStartJob.is())

Modified: incubator/ooo/trunk/main/desktop/source/migration/pages.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/source/migration/pages.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/source/migration/pages.cxx (original)
+++ incubator/ooo/trunk/main/desktop/source/migration/pages.cxx Fri Feb  3 16:58:45 2012
@@ -36,7 +36,6 @@
 #include <osl/file.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
-#include <unotools/regoptions.hxx>
 #include <unotools/useroptions.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <comphelper/processfactory.hxx>

Modified: incubator/ooo/trunk/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -85,7 +85,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>

Modified: incubator/ooo/trunk/main/framework/source/fwe/classes/addonmenu.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/fwe/classes/addonmenu.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/fwe/classes/addonmenu.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/fwe/classes/addonmenu.cxx Fri Feb  3 16:58:45 2012
@@ -61,7 +61,7 @@ using namespace ::com::sun::star::beans;
 // Please look at sfx2/inc/sfxsids.hrc the values are defined there. Due to build dependencies
 // we cannot include the header file.
 const sal_uInt16 SID_HELPMENU            = (SID_SFX_START + 410);
-const sal_uInt16 SID_ONLINE_REGISTRATION = (SID_SFX_START + 1537);
+const sal_uInt16 SID_HELP_SUPPORTPAGE = (SID_SFX_START + 1683);
 
 namespace framework
 {
@@ -208,33 +208,33 @@ void AddonMenuManager::MergeAddonHelpMen
 
         if ( pHelpMenu )
         {
-            static const char REFERENCECOMMAND_AFTER[]  = ".uno:OnlineRegistrationDlg";
+            static const char REFERENCECOMMAND_AFTER[]  = ".uno:HelpSupport";
             static const char REFERENCECOMMAND_BEFORE[] = ".uno:About";
 
             // Add-Ons help menu items should be inserted after the "registration" menu item
             bool   bAddAfter        = true;
             sal_uInt16 nItemCount       = pHelpMenu->GetItemCount();
-            sal_uInt16 nRegPos          = pHelpMenu->GetItemPos( SID_ONLINE_REGISTRATION );
-            sal_uInt16 nInsPos          = nRegPos;
+            sal_uInt16 nSupPos          = pHelpMenu->GetItemPos( SID_HELP_SUPPORTPAGE );
+            sal_uInt16 nInsPos          = nSupPos;
             sal_uInt16 nInsSepAfterPos  = MENU_APPEND;
             sal_uInt16 nUniqueMenuId    = ADDONMENU_ITEMID_START;
             AddonsOptions aOptions;
 
-            if ( nRegPos == USHRT_MAX )
+            if ( nSupPos == USHRT_MAX )
             {
                 // try to detect the online registration dialog menu item with the command URL
                 sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_AFTER ));
-                nRegPos    = pHelpMenu->GetItemPos( nId );
-                nInsPos    = nRegPos;
+                nSupPos    = pHelpMenu->GetItemPos( nId );
+                nInsPos    = nSupPos;
             }
 
-            if ( nRegPos == USHRT_MAX )
+            if ( nSupPos == USHRT_MAX )
             {
                 // second try:
                 // try to detect the about menu item with the command URL
                 sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
-                nRegPos    = pHelpMenu->GetItemPos( nId );
-                nInsPos    = nRegPos;
+                nSupPos    = pHelpMenu->GetItemPos( nId );
+                nInsPos    = nSupPos;
                 bAddAfter  = false;
             }
 
@@ -256,8 +256,8 @@ void AddonMenuManager::MergeAddonHelpMen
 	                if ( pHelpMenu->GetItemType( nInsSepAfterPos ) != MENUITEM_SEPARATOR )
 	                    pHelpMenu->InsertSeparator( nInsSepAfterPos );
 	            }
-	            if ( nRegPos < MENU_APPEND )
-	                pHelpMenu->InsertSeparator( nRegPos+1 );
+	            if ( nSupPos < MENU_APPEND )
+	                pHelpMenu->InsertSeparator( nSupPos+1 );
 	            else
 	                pHelpMenu->InsertSeparator( nItemCount );
 	        }

Modified: incubator/ooo/trunk/main/framework/source/uielement/menubarmanager.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/source/uielement/menubarmanager.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/source/uielement/menubarmanager.cxx (original)
+++ incubator/ooo/trunk/main/framework/source/uielement/menubarmanager.cxx Fri Feb  3 16:58:45 2012
@@ -795,7 +795,7 @@ void SAL_CALL MenuBarManager::disposing(
 void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CheckAndAddMenuExtension" );
-    static const char REFERENCECOMMAND_AFTER[]          = ".uno:OnlineRegistrationDlg";
+    static const char REFERENCECOMMAND_AFTER[]          = ".uno:HelpSupport";
     static const char REFERENCECOMMAND_BEFORE[]         = ".uno:About";
 
     // retrieve menu extension item

Modified: incubator/ooo/trunk/main/framework/uiconfig/startmodule/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/uiconfig/startmodule/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/uiconfig/startmodule/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/framework/uiconfig/startmodule/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/helpcontent2/helpers/help_hid.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/helpers/help_hid.lst?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/helpers/help_hid.lst (original)
+++ incubator/ooo/trunk/main/helpcontent2/helpers/help_hid.lst Fri Feb  3 16:58:45 2012
@@ -5622,8 +5622,6 @@ SID_OLE_ACTIVATE,26607,.uno:ActivateOLE
 SID_OLE_DEACTIVATE,26608,.uno:Deactivate
 SID_OLE_OBJECT,26606,.uno:OleObject
 SID_OLE_SELECT,26621,.uno:SelectOLE
-SID_ONLINE_REGISTRATION,6537,.uno:OnlineRegistrationDlg
-SID_ONLINE_REGISTRATION_DLG,6540,.uno:StartRegistrationDialog
 SID_OPENDLG_CONDFRMT,26159,.uno:ConditionalFormatDialog
 SID_OPENDLG_CONSOLIDATE,26150,.uno:DataConsolidate
 SID_OPENDLG_EDIT_PRINTAREA,26605,.uno:EditPrintArea

Modified: incubator/ooo/trunk/main/helpcontent2/helpers/longnames_commands.csv
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/helpers/longnames_commands.csv?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/helpers/longnames_commands.csv (original)
+++ incubator/ooo/trunk/main/helpcontent2/helpers/longnames_commands.csv Fri Feb  3 16:58:45 2012
@@ -1445,8 +1445,6 @@ SID_OLE_ACTIVATE,.uno:ActivateOLE
 SID_OLE_DEACTIVATE,.uno:Deactivate
 SID_OLE_OBJECT,.uno:OleObject
 SID_OLE_SELECT,.uno:SelectOLE
-SID_ONLINE_REGISTRATION,.uno:OnlineRegistrationDlg
-SID_ONLINE_REGISTRATION_DLG,.uno:StartRegistrationDialog
 SID_OPENDLG_CHART,.uno:StarChartDialog
 SID_OPENDLG_CONDFRMT,.uno:ConditionalFormatDialog
 SID_OPENDLG_CONSOLIDATE,.uno:DataConsolidate

Modified: incubator/ooo/trunk/main/helpcontent2/helpers/uno_hid.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/helpers/uno_hid.lst?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/helpers/uno_hid.lst (original)
+++ incubator/ooo/trunk/main/helpcontent2/helpers/uno_hid.lst Fri Feb  3 16:58:45 2012
@@ -1440,8 +1440,6 @@ SID_OLE_ACTIVATE,26607,.uno:ActivateOLE
 SID_OLE_DEACTIVATE,26608,.uno:Deactivate
 SID_OLE_OBJECT,26606,.uno:OleObject
 SID_OLE_SELECT,26621,.uno:SelectOLE
-SID_ONLINE_REGISTRATION,6537,.uno:OnlineRegistrationDlg
-SID_ONLINE_REGISTRATION_DLG,6540,.uno:StartRegistrationDialog
 SID_OPENDLG_CHART,26155,.uno:StarChartDialog
 SID_OPENDLG_CONDFRMT,26159,.uno:ConditionalFormatDialog
 SID_OPENDLG_CONSOLIDATE,26150,.uno:DataConsolidate

Modified: incubator/ooo/trunk/main/helpcontent2/helpers/unocmds.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/helpers/unocmds.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/helpers/unocmds.txt (original)
+++ incubator/ooo/trunk/main/helpcontent2/helpers/unocmds.txt Fri Feb  3 16:58:45 2012
@@ -730,7 +730,6 @@
 .uno:ObjectPosition;shared/01/05250000.xhp
 .uno:Objects3DToolbox;simpress/02/10090000.xhp
 .uno:OnlineAutoFormat;swriter/01/05150100.xhp
-.uno:OnlineRegistrationDlg;shared/01/08060100.xhp
 .uno:Open;shared/01/01020000.xhp
 .uno:OpenHyperlinkOnCursor;shared/02/09070000.xhp
 .uno:OpenReadOnly;shared/02/01171000.xhp

Modified: incubator/ooo/trunk/main/helpcontent2/source/text/shared/01/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/shared/01/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/shared/01/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/shared/01/makefile.mk Fri Feb  3 16:58:45 2012
@@ -307,7 +307,6 @@ XHPFILES = \
    06990000.xhp \
    07010000.xhp \
    07080000.xhp \
-   08060100.xhp \
    about_meta_tags.xhp \
    digitalsignatures.xhp \
    extensionupdate.xhp \
@@ -334,7 +333,7 @@ XHPFILES = \
    xformsdatachange.xhp \
    xformsdataname.xhp \
    xformsdatatab.xhp 
-	
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk

Modified: incubator/ooo/trunk/main/helpcontent2/source/text/shared/autopi/startup.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/shared/autopi/startup.xhp?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/shared/autopi/startup.xhp (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/shared/autopi/startup.xhp Fri Feb  3 16:58:45 2012
@@ -51,6 +51,5 @@
 <paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
 <paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The user name is used for the document properties, templates, and when you record changes made to documents. This page is only displayed if a previous installation of %PRODUCTNAME is not found on your computer.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your personal data into the text boxes.</ahelp></paragraph>
-<embed href="text/shared/01/08060100.xhp#registrierung"/>
 </body>
 </helpdocument>

Modified: incubator/ooo/trunk/main/helpcontent2/source/text/shared/main0108.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/shared/main0108.xhp?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/shared/main0108.xhp (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/shared/main0108.xhp Fri Feb  3 16:58:45 2012
@@ -57,7 +57,6 @@
 <embed href="text/shared/main0201.xhp#whatsthis"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelpSupport" id="bm_id3159176" localize="false"/><paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="15">Support</paragraph>
 <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
-<embed href="text/shared/01/08060100.xhp#registrierung"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
 <paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>

Modified: incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk Fri Feb  3 16:58:45 2012
@@ -658,7 +658,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk Fri Feb  3 16:58:45 2012
@@ -671,7 +671,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk Fri Feb  3 16:58:45 2012
@@ -359,7 +359,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk Fri Feb  3 16:58:45 2012
@@ -357,7 +357,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk Fri Feb  3 16:58:45 2012
@@ -592,7 +592,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk Fri Feb  3 16:58:45 2012
@@ -594,7 +594,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk Fri Feb  3 16:58:45 2012
@@ -437,7 +437,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk Fri Feb  3 16:58:45 2012
@@ -749,7 +749,6 @@ LINKLINKFILES= \
    text$/shared$/01$/06990000.xhp \
    text$/shared$/01$/07010000.xhp \
    text$/shared$/01$/07080000.xhp \
-   text$/shared$/01$/08060100.xhp \
    text$/shared$/01$/about_meta_tags.xhp \
    text$/shared$/01$/digitalsignatures.xhp \
    text$/shared$/01$/extensionupdate.xhp \

Modified: incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Common.xcu
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Common.xcu?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Common.xcu (original)
+++ incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Common.xcu Fri Feb  3 16:58:45 2012
@@ -134,19 +134,6 @@
             <value>${STARTCENTER_LAYOUT_STYLE}</value>
         </prop>
     </node>
-    <node oor:name="Registration">
-      <prop oor:name="TemplateURL">
-        <value/>
-      </prop>
-      <prop oor:name="URL" install:module="brand">
-        <value>${REGISTRATIONURL}</value>
-      </prop>
-      <prop oor:name="ReminderDate">
-        <value>Patch</value>
-      </prop>
-	  <node oor:name="ProductVersions">
-	  </node>
-	</node>
     <prop oor:name="System">
       <value install:module="unx">UNIX</value>
       <value install:module="macosx">MAC</value>

Modified: incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Jobs.xcu
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Jobs.xcu?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Jobs.xcu (original)
+++ incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/Jobs.xcu Fri Feb  3 16:58:45 2012
@@ -24,11 +24,6 @@
 <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
 <oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <node oor:name="Jobs">
-    <node oor:name="RegistrationRequest" oor:op="replace">
-      <prop oor:name="Service">
-        <value>com.sun.star.setup.ProductRegistration</value>
-      </prop>
-    </node>
   </node>
   <node oor:name="Events">
     <node oor:name="onFirstVisibleTask" oor:op="fuse">

Modified: incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu (original)
+++ incubator/ooo/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu Fri Feb  3 16:58:45 2012
@@ -3555,11 +3555,6 @@
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:OnlineRegistrationDlg" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Registration...</value>
-                </prop>
-            </node>
             <node oor:name=".uno:GoToStartSel" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Select to File Begin</value>

Modified: incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs (original)
+++ incubator/ooo/trunk/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs Fri Feb  3 16:58:45 2012
@@ -3526,59 +3526,6 @@
 					<value>0</value>
 				</prop>
             </group>
-			<group oor:name="Registration">
-				<info>
-					<author>FS</author>
-					<desc>Contains various settings regarding the product registration feature.</desc>
-				</info>
-				<prop oor:name="TemplateURL" oor:type="xs:string">
-					<info>
-						<desc>Contains a string specifying the URL with placeholders to be used for online registration.</desc>
-					</info>
-					<value/>
-					<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
-				</prop>
-				<prop oor:name="URL" oor:type="xs:string">
-					<info>
-						<desc>Contains a string specifying the real URL to be used for online registration.</desc>
-					</info>
-					<value/>
-					<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
-				</prop>
-				<prop oor:name="ReminderDate" oor:type="xs:string">
-					<info>
-						<desc>Contains a string representation of the date on which the user receives a reminder (e.g. "13.02.2002").</desc>
-					</info>
-					<value/>
-					<!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
-				</prop>
-				<prop oor:name="RequestDialog" oor:type="xs:int">
-					<info>
-						<desc>Contains the number used internally to determine when the dialog should be started.</desc>
-					</info>
-					<value>1</value>
-				</prop>
-				<prop oor:name="ShowMenuItem" oor:type="xs:boolean">
-					<info>
-						<desc>Contains a Boolean that specifies if the "Registration..." menu item is available.</desc>
-					</info>
-					<value>true</value>
-				</prop>
-				<prop oor:name="ProductVersionID" oor:type="xs:string">
-					<info>
-						<author>CD/OBR</author>
-						<desc>Current product ID.</desc>
-						<deprecated>This data is saved in a dedicated file since OOo 3.0 FCS</deprecated>
-					</info>
-				</prop>
-				<set oor:name="ProductVersions" oor:node-type="ProductVersionID">
-					<info>
-						<author>CD/OBR</author>
-						<desc>Specifies product specific IDs and associated instance UUIDs</desc>
-						<deprecated>This data is saved in a dedicated file since OOo 3.0 FCS</deprecated>
-					</info>
-				</set>
-			</group>
 		</group>
 		<group oor:name="Java">
 			<info>

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Fri Feb  3 16:58:45 2012
@@ -64,7 +64,6 @@ my_components = \
     component/svl/source/passwordcontainer/passwordcontainer \
     component/svl/util/svl \
     component/svtools/source/hatchwindow/hatchwindowfactory \
-    component/svtools/source/productregistration/productregistration.uno \
     component/svtools/util/svt \
     component/svx/util/svx \
     component/svx/util/svxcore \
@@ -252,10 +251,6 @@ my_components += kde4be1
 my_components += ogltrans
 .END
 
-.IF "$(ENABLE_SVCTAGS)" == "YES"
-my_components += productregistration.jar
-.END
-
 .IF "$(SOLAR_JAVA)" == "TRUE"
 my_components += \
     LuceneHelpWrapper \

Modified: incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt (original)
+++ incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt Fri Feb  3 16:58:45 2012
@@ -206,7 +206,6 @@ placewaremi.dll  0x0000000060bd0000 0x00
 plmi.dll         0x0000000060b90000 0x00030000
 pptimportermi.dll 0x0000000060b70000 0x00010000
 preloadmi.dll    0x0000000060b40000 0x00020000
-productregistration.uno.dll 0x0000000060b20000 0x00010000
 protocolhandlermi.dll 0x0000000060b00000 0x00010000
 proxyfac.uno.dll 0x0000000060ae0000 0x00010000
 purpenvhelper3msc.dll 0x0000000060ac0000 0x00010000

Modified: incubator/ooo/trunk/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/reportdesign/uiconfig/dbreport/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -409,7 +409,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>

Modified: incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -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>

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Feb  3 16:58:45 2012
@@ -1039,8 +1039,6 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl)
 
 STD_LIB_FILE( gid_File_Lib_Preload, preload)
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
-
 #if defined(UNX) && ! defined(QUARTZ)
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Fri Feb  3 16:58:45 2012
@@ -1757,15 +1757,6 @@ End
 #endif
 #endif
 
-#ifdef ENABLE_SVCTAGS
-File gid_File_Jar_Productregistration
-    TXT_FILE_BODY;
-    Name = "productregistration.jar";
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Images_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_resource_ooo.scp Fri Feb  3 16:58:45 2012
@@ -64,8 +64,6 @@ STD_RES_FILE( gid_File_Res_Pdffilter, pd
 
 STD_RES_FILE( gid_File_Res_Preload, preload)
 
-STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
-
 #ifdef UNX
 
 STD_RES_FILE( gid_File_Res_San, san )

Modified: incubator/ooo/trunk/main/scripting/workben/bindings/calcmenubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/workben/bindings/calcmenubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/workben/bindings/calcmenubar.xml (original)
+++ incubator/ooo/trunk/main/scripting/workben/bindings/calcmenubar.xml Fri Feb  3 16:58:45 2012
@@ -311,7 +311,6 @@
    <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-   <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
   </menu:menupopup>

Modified: incubator/ooo/trunk/main/scripting/workben/bindings/drawmenubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/workben/bindings/drawmenubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/workben/bindings/drawmenubar.xml (original)
+++ incubator/ooo/trunk/main/scripting/workben/bindings/drawmenubar.xml Fri Feb  3 16:58:45 2012
@@ -346,7 +346,6 @@
    <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-   <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
   </menu:menupopup>

Modified: incubator/ooo/trunk/main/scripting/workben/bindings/impressmenubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/workben/bindings/impressmenubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/workben/bindings/impressmenubar.xml (original)
+++ incubator/ooo/trunk/main/scripting/workben/bindings/impressmenubar.xml Fri Feb  3 16:58:45 2012
@@ -320,7 +320,6 @@
    <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-   <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
   </menu:menupopup>

Modified: incubator/ooo/trunk/main/scripting/workben/bindings/writermenubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/workben/bindings/writermenubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/workben/bindings/writermenubar.xml (original)
+++ incubator/ooo/trunk/main/scripting/workben/bindings/writermenubar.xml Fri Feb  3 16:58:45 2012
@@ -273,7 +273,6 @@
    <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:6683" menu:helpid="6683" menu:label="~Support"/>
-   <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
   </menu:menupopup>

Modified: incubator/ooo/trunk/main/sd/uiconfig/sdraw/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/uiconfig/sdraw/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/uiconfig/sdraw/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sd/uiconfig/sdraw/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -324,7 +324,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>

Modified: incubator/ooo/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sd/uiconfig/simpress/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -298,7 +298,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>

Modified: incubator/ooo/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx (original)
+++ incubator/ooo/trunk/main/sfx2/inc/pch/precompiled_sfx2.hxx Fri Feb  3 16:58:45 2012
@@ -543,7 +543,6 @@
 #include "svtools/printoptions.hxx"
 #include "unotools/printwarningoptions.hxx"
 #include "svl/rectitem.hxx"
-#include "unotools/regoptions.hxx"
 #include "unotools/saveopt.hxx"
 #include "unotools/searchopt.hxx"
 #include "unotools/securityoptions.hxx"

Modified: incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxcommands.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxcommands.h?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxcommands.h (original)
+++ incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxcommands.h Fri Feb  3 16:58:45 2012
@@ -304,7 +304,6 @@
 #define CMD_SID_ADDONHELP                           ".uno:AddonHelp"
 #define CMD_SID_FORMATMENUSTATE                     ".uno:FormatMenuState"
 #define CMD_SID_INET_DLG                            ".uno:InternetDialog"
-#define CMD_SID_ONLINE_REGISTRATION                 ".uno:OnlineRegistrationDlg"
 #define CMD_SID_OFFICE_CHECK_PLZ                    ".uno:CheckPLZ"
 #define CMD_SID_ADDRESS_DATA_SOURCE                 ".uno:AutoPilotAddressDataSource"
 #define CMD_FN_BUSINESS_CARD                        ".uno:InsertBusinessCard"

Modified: incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxsids.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxsids.hrc?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxsids.hrc (original)
+++ incubator/ooo/trunk/main/sfx2/inc/sfx2/sfxsids.hrc Fri Feb  3 16:58:45 2012
@@ -200,9 +200,6 @@
 #define SID_BASEURL					        (SID_SFX_START + 1518)
 #define SID_TEMPLATE                        (SID_SFX_START + 1519)
 
-#define SID_ONLINE_REGISTRATION				(SID_SFX_START + 1537)
-
-#define SID_ONLINE_REGISTRATION_DLG			(SID_SFX_START + 1540)
 #define SID_CONTENTTYPE                     (SID_SFX_START + 1541)
 
 #define SID_SAVETO                          (SID_SFX_START + 1546)

Modified: incubator/ooo/trunk/main/sfx2/sdi/appslots.sdi
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/sdi/appslots.sdi?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/sdi/appslots.sdi (original)
+++ incubator/ooo/trunk/main/sfx2/sdi/appslots.sdi Fri Feb  3 16:58:45 2012
@@ -221,14 +221,6 @@ shell SfxApplication
 		ExecMethod = OfaExec_Impl;
 	]
 
-    //----------------------------------------------------------------------
-
-	SID_ONLINE_REGISTRATION
-	[
-		ExecMethod = OfaExec_Impl;
-		StateMethod = OfaState_Impl;
-	]
-
 	//----------------------------------------------------------------------
 
 	SID_OFFICE_CHECK_PLZ

Modified: incubator/ooo/trunk/main/sfx2/sdi/sfx.sdi
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/sdi/sfx.sdi?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/sdi/sfx.sdi (original)
+++ incubator/ooo/trunk/main/sfx2/sdi/sfx.sdi Fri Feb  3 16:58:45 2012
@@ -5963,31 +5963,6 @@ SfxBoolItem SourceView SID_SOURCEVIEW
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem StartRegistrationDialog SID_ONLINE_REGISTRATION_DLG
-()
-[
-	/* flags: */
-	AutoUpdate = FALSE,
-	Cachable = Cachable,
-	FastCall = FALSE,
-	HasCoreId = FALSE,
-	HasDialog = FALSE,
-	ReadOnlyDoc = TRUE,
-	Toggle = FALSE,
-	Container = TRUE,
-	RecordAbsolute = FALSE,
-	RecordPerSet;
-	Synchron;
-
-	/* config: */
-	AccelConfig = FALSE,
-	MenuConfig = FALSE,
-	StatusBarConfig = FALSE,
-	ToolBoxConfig = FALSE,
-	GroupId = GID_SPECIAL;
-]
-
-//--------------------------------------------------------------------------
 SfxStringItem StatusBar SID_STATUSBARTEXT
 
 [
@@ -7385,31 +7360,6 @@ SfxVoidItem InternetDialog SID_INET_DLG
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem OnlineRegistrationDlg SID_ONLINE_REGISTRATION
-()
-[
-	/* flags: */
-	AutoUpdate = FALSE,
-	Cachable = Cachable,
-	FastCall = FALSE,
-	HasCoreId = FALSE,
-	HasDialog = TRUE,
-	ReadOnlyDoc = TRUE,
-	Toggle = FALSE,
-	Container = FALSE,
-	RecordAbsolute = FALSE,
-	RecordPerSet;
-	Synchron;
-
-	/* config: */
-	AccelConfig = TRUE,
-	MenuConfig = TRUE,
-	StatusBarConfig = FALSE,
-	ToolBoxConfig = TRUE,
-	GroupId = GID_APPLICATION;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem CheckPLZ SID_OFFICE_CHECK_PLZ
 (SfxStringItem PLZ SID_OFFICE_CHECK_PLZ)
 [

Modified: incubator/ooo/trunk/main/sfx2/source/appl/appserv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/appserv.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/appl/appserv.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/appl/appserv.cxx Fri Feb  3 16:58:45 2012
@@ -69,7 +69,6 @@
 
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/regoptions.hxx>
 #include <svtools/helpopt.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/shl.hxx>
@@ -650,12 +649,6 @@ void SfxApplication::MiscState_Impl(SfxI
 	}
 }
 
-static const ::rtl::OUString& getProductRegistrationServiceName( )
-{
-	static ::rtl::OUString s_sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.setup.ProductRegistration" );
-	return s_sServiceName;
-}
-
 typedef	rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, rtl_uString*);
 typedef	void (SAL_CALL *basicide_macro_organizer)( sal_Int16 );
 
@@ -894,30 +887,6 @@ void SfxApplication::OfaExec_Impl( SfxRe
             break;
         }
 
-		case SID_ONLINE_REGISTRATION:
-		{
-			try
-			{
-				// create the ProductRegistration component
-				Reference< com::sun::star::lang::XMultiServiceFactory > xORB( ::comphelper::getProcessServiceFactory() );
-				Reference< com::sun::star::task::XJobExecutor > xProductRegistration;
-				if ( xORB.is() )
-					xProductRegistration = xProductRegistration.query( xORB->createInstance( getProductRegistrationServiceName() ) );
-				DBG_ASSERT( xProductRegistration.is(), "OfficeApplication::ExecuteApp_Impl: could not create the service!" );
-
-				// tell it that the user wants to register
-				if ( xProductRegistration.is() )
-				{
-					xProductRegistration->trigger( ::rtl::OUString::createFromAscii( "RegistrationRequired" ) );
-				}
-			}
-			catch( const ::com::sun::star::uno::Exception& )
-			{
-				DBG_ERROR( "OfficeApplication::ExecuteApp_Impl(SID_ONLINE_REGISTRATION): caught an exception!" );
-			}
-		}
-		break;
-
 		case SID_BASICIDE_APPEAR:
 		{
             SfxViewFrame* pView = lcl_getBasicIDEViewFrame( NULL );
@@ -1235,25 +1204,6 @@ void SfxApplication::OfaExec_Impl( SfxRe
 
 void SfxApplication::OfaState_Impl(SfxItemSet &rSet)
 {
-	const sal_uInt16 *pRanges = rSet.GetRanges();
-	DBG_ASSERT(pRanges && *pRanges, "Set ohne Bereich");
-	while ( *pRanges )
-	{
-		for(sal_uInt16 nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
-		{
-			switch(nWhich)
-			{
-				case SID_ONLINE_REGISTRATION:
-				{
-					::utl::RegOptions aOptions;
-					if ( !aOptions.allowMenu() )
-						rSet.DisableItem( SID_ONLINE_REGISTRATION );
-				}
-				break;
-			}
-		}
-	}
-
 	SvtModuleOptions aModuleOpt;
 
     if( !aModuleOpt.IsWriter())

Modified: incubator/ooo/trunk/main/starmath/uiconfig/smath/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/starmath/uiconfig/smath/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/starmath/uiconfig/smath/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/starmath/uiconfig/smath/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -113,7 +113,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>

Modified: incubator/ooo/trunk/main/svtools/Module_svtools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/Module_svtools.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/Module_svtools.mk (original)
+++ incubator/ooo/trunk/main/svtools/Module_svtools.mk Fri Feb  3 16:58:45 2012
@@ -24,13 +24,11 @@
 $(eval $(call gb_Module_Module,svtools))
 
 $(eval $(call gb_Module_add_targets,svtools,\
-	AllLangResTarget_productregistration \
 	AllLangResTarget_svt \
 	Executable_bmp \
 	Executable_bmpsum \
 	Executable_g2g \
 	Library_hatchwindowfactory \
-	Library_productregistration \
 	Library_svt \
 	Package_inc \
 ))

Modified: incubator/ooo/trunk/main/svx/inc/globlmn_tmpl.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/inc/globlmn_tmpl.hrc?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/inc/globlmn_tmpl.hrc (original)
+++ incubator/ooo/trunk/main/svx/inc/globlmn_tmpl.hrc Fri Feb  3 16:58:45 2012
@@ -905,12 +905,6 @@
 	Command = ".uno:HelpSupport" ; \
     Text [ en-US ] = "~Support" ;	\
 
-#define ITEM_HELP_ONLINE_REGISTRATION \
-    Identifier = SID_ONLINE_REGISTRATION ; \
-	Command = ".uno:OnlineRegistrationDlg" ; \
-    Text [ en-US ] = "~Registration..." ; \
-	
-
 #define ITEM_HELP_ABOUT \
     Identifier = SID_ABOUT ; \
 	Command = ".uno:About" ; \
@@ -956,10 +950,6 @@
                 {\
 					ITEM_HELP_SUPPORTPAGE\
 				};\
-				MenuItem\
-                {\
-					ITEM_HELP_ONLINE_REGISTRATION\
-				};\
                 MenuItem\
                 {\
                     Separator = TRUE ; \

Modified: incubator/ooo/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/sglobal/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -451,7 +451,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>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swform/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swform/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swform/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swform/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -446,7 +446,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>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swreport/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -446,7 +446,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>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swriter/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -454,7 +454,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>

Modified: incubator/ooo/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sw/uiconfig/swxform/menubar/menubar.xml Fri Feb  3 16:58:45 2012
@@ -447,7 +447,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>

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_basic.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_basic.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_basic.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_basic.txt Fri Feb  3 16:58:45 2012
@@ -50,7 +50,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_calc.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_calc.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_calc.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_calc.txt Fri Feb  3 16:58:45 2012
@@ -170,7 +170,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_draw.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_draw.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_draw.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_draw.txt Fri Feb  3 16:58:45 2012
@@ -150,7 +150,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_htmldokument.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_htmldokument.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_htmldokument.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_htmldokument.txt Fri Feb  3 16:58:45 2012
@@ -165,7 +165,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_impress.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_impress.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_impress.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_impress.txt Fri Feb  3 16:58:45 2012
@@ -151,7 +151,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_insight.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_insight.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_insight.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_insight.txt Fri Feb  3 16:58:45 2012
@@ -75,7 +75,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_masterdoc.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_masterdoc.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_masterdoc.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_masterdoc.txt Fri Feb  3 16:58:45 2012
@@ -187,7 +187,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_math.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_math.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_math.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_math.txt Fri Feb  3 16:58:45 2012
@@ -78,7 +78,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_writer.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_writer.txt?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_writer.txt (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/input/menu/en-us_writer.txt Fri Feb  3 16:58:45 2012
@@ -188,7 +188,6 @@ StarOffice ~Help
 What's ~This?
 
 ~Support
-~Registration...
 
 Check for ~Updates...
 

Modified: incubator/ooo/trunk/main/testautomation/global/sid/all.sid
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/global/sid/all.sid?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/global/sid/all.sid (original)
+++ incubator/ooo/trunk/main/testautomation/global/sid/all.sid Fri Feb  3 16:58:45 2012
@@ -597,7 +597,6 @@ HilfeInhalt .uno:HelpIndex
 HilfeHelferlein .uno:HelperDialog
 HilfeTip .uno:HelpTip
 HilfeAktiveHilfe .uno:ActiveHelp
-HilfeOnlineregistrierung .uno:OnlineRegistrationDlg
 HilfeInfoUeber .uno:About
 
 

Modified: incubator/ooo/trunk/main/toolkit/src2xml/src.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/src2xml/src.lst?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/src2xml/src.lst (original)
+++ incubator/ooo/trunk/main/toolkit/src2xml/src.lst Fri Feb  3 16:58:45 2012
@@ -601,7 +601,6 @@
 ../../svtools/source/filter.vcl/filter/dlgejpg.src
 ../../svtools/source/filter.vcl/filter/strings.src
 ../../svtools/source/Accessibility/accessiblelistboxentry.src
-../../svtools/source/productregistration/registrationdlg.src
 ../../svtools/source/plugapp/commtest.src
 ../../svtools/source/plugapp/testtool.src
 ../../fpicker/source/office/OfficeFilePicker.src

Modified: incubator/ooo/trunk/main/unotools/source/config/itemholder1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unotools/source/config/itemholder1.cxx?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unotools/source/config/itemholder1.cxx (original)
+++ incubator/ooo/trunk/main/unotools/source/config/itemholder1.cxx Fri Feb  3 16:58:45 2012
@@ -53,7 +53,6 @@
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/printwarningoptions.hxx>
-#include <unotools/regoptions.hxx>
 #include <unotools/optionsdlg.hxx>
 #include <unotools/saveopt.hxx>
 #include <unotools/searchopt.hxx>

Modified: incubator/ooo/trunk/main/unotools/source/config/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unotools/source/config/makefile.mk?rev=1240245&r1=1240244&r2=1240245&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unotools/source/config/makefile.mk (original)
+++ incubator/ooo/trunk/main/unotools/source/config/makefile.mk Fri Feb  3 16:58:45 2012
@@ -44,43 +44,43 @@ SLOFILES=\
 		$(SLO)$/configmgr.obj  \
 		$(SLO)$/configpathes.obj  \
 		$(SLO)$/docinfohelper.obj  \
-                $(SLO)$/bootstrap.obj \
+		$(SLO)$/bootstrap.obj \
         $(SLO)$/accelcfg.obj                                \
         $(SLO)$/cacheoptions.obj            \
-	$(SLO)$/cmdoptions.obj				\
-	$(SLO)$/compatibility.obj           \
-	$(SLO)$/defaultoptions.obj			\
-	$(SLO)$/dynamicmenuoptions.obj		\
-	$(SLO)$/eventcfg.obj                \
-	$(SLO)$/extendedsecurityoptions.obj \
+		$(SLO)$/cmdoptions.obj				\
+		$(SLO)$/compatibility.obj           \
+		$(SLO)$/defaultoptions.obj			\
+		$(SLO)$/dynamicmenuoptions.obj		\
+		$(SLO)$/eventcfg.obj                \
+		$(SLO)$/extendedsecurityoptions.obj \
         $(SLO)$/fltrcfg.obj                             \
-	$(SLO)$/fontcfg.obj \
-	$(SLO)$/fontoptions.obj				\
+		$(SLO)$/fontcfg.obj \
+		$(SLO)$/fontoptions.obj				\
         $(SLO)$/historyoptions.obj                         \
-	$(SLO)$/inetoptions.obj				\
-	$(SLO)$/internaloptions.obj			\
+		$(SLO)$/inetoptions.obj				\
+		$(SLO)$/internaloptions.obj			\
         $(SLO)$/itemholder1.obj \
         $(SLO)$/javaoptions.obj             \
         $(SLO)$/lingucfg.obj                \
-	$(SLO)$/localisationoptions.obj		\
+		$(SLO)$/localisationoptions.obj		\
         $(SLO)$/misccfg.obj                             \
         $(SLO)$/moduleoptions.obj           \
         $(SLO)$/options.obj                     \
         $(SLO)$/optionsdlg.obj              \
         $(SLO)$/pathoptions.obj             \
-	$(SLO)$/printwarningoptions.obj		\
-	$(SLO)$/regoptions.obj				\
-	$(SLO)$/saveopt.obj					\
-	$(SLO)$/searchopt.obj				\
-	$(SLO)$/securityoptions.obj			\
-	$(SLO)$/sourceviewconfig.obj		\
-	$(SLO)$/startoptions.obj			\
+		$(SLO)$/printwarningoptions.obj		\
+		$(SLO)$/saveopt.obj					\
+		$(SLO)$/searchopt.obj				\
+		$(SLO)$/securityoptions.obj			\
+		$(SLO)$/sourceviewconfig.obj		\
+		$(SLO)$/startoptions.obj			\
         $(SLO)$/undoopt.obj                 \
         $(SLO)$/useroptions.obj      \
-	$(SLO)$/viewoptions.obj				\
-	$(SLO)$/workingsetoptions.obj		\
+		$(SLO)$/viewoptions.obj				\
+		$(SLO)$/workingsetoptions.obj		\
         $(SLO)$/xmlaccelcfg.obj
 
+
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk



Mime
View raw message