diff options
author | Jürgen Schmidt <jsc@apache.org> | 2012-02-03 15:58:45 +0000 |
---|---|---|
committer | Jürgen Schmidt <jsc@apache.org> | 2012-02-03 15:58:45 +0000 |
commit | 50ff2b5993e88113e4503fbcad5fab63e1c364fd (patch) | |
tree | c9bec518f29a9b611860d710cdc28191e8ec55ba /sfx2 | |
parent | 223ad0ef21e0b3bcdb90fd947a5532f0a47720e4 (diff) |
remove onlineregistration with dependencies
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/pch/precompiled_sfx2.hxx | 1 | ||||
-rwxr-xr-x | sfx2/inc/sfx2/sfxcommands.h | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 3 | ||||
-rw-r--r-- | sfx2/sdi/appslots.sdi | 8 | ||||
-rw-r--r-- | sfx2/sdi/sfx.sdi | 50 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 50 |
6 files changed, 0 insertions, 113 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index c059cbe0a4a5..9d2564c2af56 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -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" diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h index 2ff552424606..9cca34890f39 100755 --- a/sfx2/inc/sfx2/sfxcommands.h +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -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" diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 282940bc3178..62dae9f469ca 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -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) diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index 5a58fe54d921..bfb3be6d0575 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -223,14 +223,6 @@ shell SfxApplication //---------------------------------------------------------------------- - SID_ONLINE_REGISTRATION - [ - ExecMethod = OfaExec_Impl; - StateMethod = OfaState_Impl; - ] - - //---------------------------------------------------------------------- - SID_OFFICE_CHECK_PLZ [ ExecMethod = OfaExec_Impl; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index baff40e8b3ee..57e834030da7 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -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) [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 2dfdec6e0793..11770c34091a 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -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(SfxItemSet &rSet) } } -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( SfxRequest& rReq ) 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( SfxRequest& rReq ) 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()) |