Remove some obsolete stuff

* unused macro ENABLE_MISSINGKEYASSERTIONS
* don't bother with private/commercial use

Change-Id: I84af3ea909b20f0ab8295bbc0d0adc90e6d6f6e1

sfx2/inc/sfx2/sfxsids.hrc

@@ -209,19 +209,11 @@
 #define SID_DOCUMENT_COMPARE                (SID_SFX_START + 1586)
 #define SID_DOCUMENT_MERGE                  (SID_SFX_START + 1587)
 
-#define SID_OFFICE_PLK                      (SID_SFX_START + 1601)
-#define SID_OFFICE_PALK                     (SID_SFX_START + 1604)
-#define SID_CHECK_KEY                       (SID_SFX_START + 1605)
-#define SID_OFFICE_PRIVATE_USE                  (SID_SFX_START + 1606)
-#define SID_OFFICE_COMMERCIAL_USE               (SID_SFX_START + 1607)
 #define SID_OFFICE_CUSTOMERNUMBER               (SID_SFX_START + 1608)
 #define SID_OFFICE_CHECK_PLZ                (SID_SFX_START + 1610)
-#define SID_INTERNET_SEARCH                 (SID_SFX_START + 1611)
 #define SID_CURRENT_URL                     (SID_SFX_START + 1613)
-#define SID_OLD_PALK                        (SID_SFX_START + 1620)
 #define SID_GROUPVIEW                       (SID_SFX_START + 1621)
 
-
 #define SID_TIPWINDOW                           (SID_SFX_START + 1632)
 #define SID_CHARSET                         (SID_SFX_START + 1633)
 #define SID_OVERWRITE                           (SID_SFX_START + 1634)
@@ -363,8 +355,6 @@
 #define SID_STYLE_FAMILY4                   (SID_STYLE_FAMILY_START + 3)
 #define SID_STYLE_FAMILY5                   (SID_STYLE_FAMILY_START + 4)
 
-#define SID_ENABLE_METAFILEPRINT            (SID_SFX_START + 543)
-
 #define SID_STYLE_NEW                       (SID_SFX_START + 549)
 #define SID_STYLE_EDIT                      (SID_SFX_START + 550)
 #define SID_STYLE_DELETE                    (SID_SFX_START + 551)
@@ -578,8 +568,6 @@
 #define SID_INET_FTP_PROXY_NAME         (SID_OPTIONS_START + 40)
 #define SID_INET_FTP_PROXY_PORT         (SID_OPTIONS_START + 41)
 #define SID_INET_SOCKS_PROXY_PORT       (SID_OPTIONS_START + 43)
-#define SID_INET_SECURITY_PROXY_NAME    (SID_OPTIONS_START + 44)
-#define SID_INET_SECURITY_PROXY_PORT    (SID_OPTIONS_START + 45)
 
 #define SID_INET_EXE_PLUGIN             (SID_OPTIONS_START + 52)
 

sfx2/sdi/sfx.sdi

@@ -899,33 +899,6 @@ SfxTemplateItem CharStyle SID_STYLE_FAMILY1
     GroupId = GID_DOCUMENT;
 ]
 
-//--------------------------------------------------------------------------
-SfxStringItem CheckKey SID_CHECK_KEY
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = TRUE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_SPECIAL;
-]
-
 //--------------------------------------------------------------------------
 SfxStringItem ChooseMacro SID_BASICIDE_CHOOSEMACRO
 ()
@@ -1133,33 +1106,6 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS
     GroupId = ;
 ]
 
-//--------------------------------------------------------------------------
-SfxStringItem CommercialUse SID_OFFICE_COMMERCIAL_USE
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_SPECIAL;
-]
-
 //--------------------------------------------------------------------------
 SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION)
@@ -3205,31 +3151,6 @@ SfxBoolItem InternetOnline SID_INTERNET_ONLINE
     GroupId = GID_EXPLORER;
 ]
 
-//--------------------------------------------------------------------------
-SfxVoidItem InternetSearch SID_INTERNET_SEARCH
-(SfxStringItem SearchString SID_INTERNET_SEARCH)
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = TRUE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = ;
-]
-
 //--------------------------------------------------------------------------
 SfxBoolItem IsLoading SID_DOC_LOADING
 
@@ -3475,33 +3396,6 @@ SfxStringItem LibSelector SID_BASICIDE_LIBSELECTOR
     GroupId = GID_MACRO;
 ]
 
-//--------------------------------------------------------------------------
-SfxStringItem LicenceKey SID_OFFICE_PLK
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = TRUE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = ;
-]
-
 //--------------------------------------------------------------------------
 SfxVoidItem LoadAccel SID_CONFIGACCEL
 (SfxStringItem FileName SID_CFGFILE)
@@ -4433,33 +4327,6 @@ SfxStringItem ObjectMenue SID_OBJECT
     GroupId = GID_EDIT;
 ]
 
-//--------------------------------------------------------------------------
-SfxStringItem OldPALK SID_OLD_PALK
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = TRUE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_SPECIAL;
-]
-
 //--------------------------------------------------------------------------
 SfxObjectItem Open SID_OPENDOC
 (SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem OpenFlags SID_OPTIONS,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION,SfxStringItem Referer SID_REFERER,SfxStringItem SuggestedSaveAsDir SID_DEFAULTFILEPATH,SfxStringItem SuggestedSaveAsName SID_DEFAULTFILENAME)
@@ -5129,33 +4996,6 @@ SfxBoolItem PrintPreview SID_PRINTPREVIEW
     GroupId = GID_VIEW;
 ]
 
-//--------------------------------------------------------------------------
-SfxStringItem PrivateUse SID_OFFICE_PRIVATE_USE
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_SPECIAL;
-]
-
 //--------------------------------------------------------------------------
 SfxVoidItem SetDocumentProperties SID_DOCINFO
 (SfxDocumentInfoItem Properties SID_DOCINFO)
@@ -6174,31 +6014,6 @@ SfxVoidItem SetOptions SID_SETOPTIONS
     GroupId = ;
 ]
 
-//--------------------------------------------------------------------------
-SfxBoolItem SetPALK SID_OFFICE_PALK
-(SfxStringItem PALK SID_OFFICE_PALK)
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_SPECIAL;
-]
-
 //--------------------------------------------------------------------------
 SfxBoolItem ShowBrowser SID_SHOW_BROWSER
 

sfx2/source/appl/appbas.cxx

@@ -242,13 +242,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
             break;
         }
 
-        case SID_OFFICE_PRIVATE_USE:
-        case SID_OFFICE_COMMERCIAL_USE:
-        {
-            DBG_ASSERT( sal_False, "SfxApplication::PropExec_Impl()\nSID_OFFICE_PRIVATE_USE & SID_OFFICE_COMMERCIAL_USE are obsolete!\n" );
-            break;
-        }
-
         case SID_OFFICE_CUSTOMERNUMBER:
         {
             SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, nSID, sal_False);

sfx2/source/appl/appcfg.cxx

@@ -390,11 +390,6 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
                         }
                     }
                     break;
-                case SID_ENABLE_METAFILEPRINT :
-#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
-                    DBG_ASSERT(sal_False, "SfxApplication::GetOptions()\nSoffice.ini key \"Common\\MetafilePrint\" is obsolete! .. How I can support SID_ENABLE_METAFILEPRINT any longer?\n");
-#endif
-                    break;
                 case SID_INET_PROXY_TYPE :
                     if (rSet.Put(
                             SfxUInt16Item(
@@ -445,12 +440,6 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
                         bRet = true;
                     }
                     break;
-                case SID_INET_SECURITY_PROXY_NAME :
-                case SID_INET_SECURITY_PROXY_PORT :
-#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
-                    DBG_ASSERT( sal_False, "SfxApplication::GetOptions()\nSome INET values no longer supported!\n" );
-#endif
-                    break;
                 case SID_INET_NOPROXY :
                     if (rSet.Put(
                             SfxStringItem(
@@ -809,14 +798,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         aSecurityOptions.SetConfirmationEnabled( ( (const SfxBoolItem *)pItem )->GetValue() );
     }
 
-    // EnableMetafilePrint
-    if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_ENABLE_METAFILEPRINT ), sal_True, &pItem ) )
-    {
-#ifdef ENABLE_MISSINGKEYASSERTIONS//MUSTINI
-        DBG_ASSERT(sal_False, "SfxApplication::SetOptions_Impl()\nsoffice.ini key \"MetafilPrint\" not supported any longer!\n");
-#endif
-    }
-
     // Store changed data
     batch->commit();
 }