Kill INetProtocol::News

Change-Id: I393edc816aaf189b1001e630c76f67dd53fd5be3

11 files changed, 89 insertions, 273 deletions

diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 5043af660d39..053196c25a5d 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -313,7 +313,6 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
             nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
             break;
         case INetProtocol::Mailto :
-        case INetProtocol::News :
             nPageId = RID_SVXPAGE_HYPERLINK_MAIL;
             break;
         default :
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index bb04adb1e675..068d412ce069 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -41,8 +41,6 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
 :   SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkMailPage", "cui/ui/hyperlinkmailpage.ui",
                               rItemSet )
 {
-    get(m_pRbtMail, "linktyp_mail");
-    get(m_pRbtNews, "linktyp_news");
     get(m_pCbbReceiver, "receiver");
     m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto);
     get(m_pBtAdrBook, "adressbook");
@@ -60,12 +58,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
 
     SetExchangeSupport ();
 
-    // set defaults
-    m_pRbtMail->Check ();
-
     // set handlers
-    m_pRbtMail->SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
-    m_pRbtNews->SetClickHdl        ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
     m_pBtAdrBook->SetClickHdl      ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
     m_pCbbReceiver->SetModifyHdl   ( LINK ( this, SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) );
 
@@ -141,7 +134,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
 
     if( aURL.GetProtocol() == INetProtocol::NotValid )
     {
-        aURL.SetSmartProtocol( GetSmartProtocolFromButtons() );
+        aURL.SetSmartProtocol( INetProtocol::Mailto );
         aURL.SetSmartURL(aStrURL);
     }
 
@@ -189,18 +182,11 @@ void SvxHyperlinkMailTp::SetInitFocus()
 
 void SvxHyperlinkMailTp::SetScheme(const OUString& rScheme)
 {
-    //if rScheme is empty or unknown the default beaviour is like it where MAIL
-    const sal_Char sNewsScheme[]   = INET_NEWS_SCHEME;
-
-    bool bMail = !rScheme.startsWith(sNewsScheme);
-
-    //update protocol button selection:
-    m_pRbtMail->Check(bMail);
-    m_pRbtNews->Check(!bMail);
+    const bool bMail = true;
 
     //update target:
     RemoveImproperProtocol(rScheme);
-    m_pCbbReceiver->SetSmartProtocol( GetSmartProtocolFromButtons() );
+    m_pCbbReceiver->SetSmartProtocol( INetProtocol::Mailto );
 
     //show/hide  special fields for MAIL:
     m_pBtAdrBook->Enable(bMail);
@@ -227,35 +213,6 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme)
     }
 }
 
-OUString SvxHyperlinkMailTp::GetSchemeFromButtons() const
-{
-    if( m_pRbtNews->IsChecked() )
-        return OUString(INET_NEWS_SCHEME);
-    return OUString(INET_MAILTO_SCHEME);
-}
-
-INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
-{
-    if( m_pRbtNews->IsChecked() )
-    {
-        return INetProtocol::News;
-    }
-    return INetProtocol::Mailto;
-}
-
-/*************************************************************************
-|*
-|* Click on radiobutton : Type EMail
-|*
-|************************************************************************/
-
-IMPL_LINK_NOARG(SvxHyperlinkMailTp, Click_SmartProtocol_Impl)
-{
-    OUString aScheme = GetSchemeFromButtons();
-    SetScheme( aScheme );
-    return 0L;
-}
-
 /*************************************************************************
 |*
 |* Contens of editfield "receiver" modified
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 7aec01683018..293b04069896 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -401,10 +401,6 @@ OUString SvxHyperlinkTabPageBase::GetSchemeFromURL( const OUString& rStrURL )
         {
             aStrScheme = INET_MAILTO_SCHEME;
         }
-        else if ( rStrURL.startsWithIgnoreAsciiCase( INET_NEWS_SCHEME ) )
-        {
-            aStrScheme = INET_NEWS_SCHEME;
-        }
     }
     else
         aStrScheme = INetURLObject::GetScheme( aProtocol );
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 393c1182cb44..7ac2a43a76bd 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -60,11 +60,11 @@ String RID_SVXSTR_HYPERDLG_HLINETTP_HELP
 
 String RID_SVXSTR_HYPERDLG_HLMAILTP
 {
-    Text [ en-US ] = "Mail & News" ;
+    Text [ en-US ] = "Mail" ;
 };
 String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP
 {
-    Text [ en-US ] = "This is where you create a hyperlink to an e-mail address or newsgroup." ;
+    Text [ en-US ] = "This is where you create a hyperlink to an e-mail address." ;
 };
 
 String RID_SVXSTR_HYPERDLG_HLDOCTP
diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx
index 44aacc78453d..6f847976e16b 100644
--- a/cui/source/inc/hlmailtp.hxx
+++ b/cui/source/inc/hlmailtp.hxx
@@ -23,28 +23,23 @@
 
 /*************************************************************************
 |*
-|* Tabpage : Hyperlink - Mail & News
+|* Tabpage : Hyperlink - Mail
 |*
 \************************************************************************/
 
 class SvxHyperlinkMailTp : public SvxHyperlinkTabPageBase
 {
 private:
-    RadioButton         *m_pRbtMail;
-    RadioButton         *m_pRbtNews;
     SvxHyperURLBox      *m_pCbbReceiver;
     PushButton          *m_pBtAdrBook;
     FixedText           *m_pFtSubject;
     Edit                *m_pEdSubject;
 
-    DECL_LINK (Click_SmartProtocol_Impl, void * ); ///< Radiobutton clicked: Type EMAIl or News
     DECL_LINK (ClickAdrBookHdl_Impl  , void * ); ///< Button : Address book
     DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified
 
     void    SetScheme(const OUString& rScheme);
     void    RemoveImproperProtocol(const OUString& aProperScheme);
-    OUString  GetSchemeFromButtons() const;
-    INetProtocol GetSmartProtocolFromButtons() const;
 
     OUString  CreateAbsoluteURL() const;
 
diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui
index 15f988e317d2..9496365518d4 100644
--- a/cui/uiconfig/ui/hyperlinkmailpage.ui
+++ b/cui/uiconfig/ui/hyperlinkmailpage.ui
@@ -31,54 +31,6 @@
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkRadioButton" id="linktyp_mail">
-                        <property name="label" translatable="yes">_E-mail</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="linktyp_news">
-                        <property name="label" translatable="yes">_News</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">linktyp_mail</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkLabel" id="receiver_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -164,7 +116,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Mail &amp; News</property>
+            <property name="label" translatable="yes">Mail</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 23978fe42e4a..b2aa2b7784b8 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -40,7 +40,6 @@ namespace com { namespace sun { namespace star { namespace util {
 #define INET_HTTPS_SCHEME "https://"
 #define INET_FILE_SCHEME "file://"
 #define INET_MAILTO_SCHEME "mailto:"
-#define INET_NEWS_SCHEME "news:"
 #define INET_HID_SCHEME "hid:"
 
 #define URL_PREFIX_PRIV_SOFFICE "private:"
@@ -72,7 +71,6 @@ enum class INetProtocol
     File,
     Mailto,
     VndSunStarWebdav,
-    News,
     PrivSoffice,
     VndSunStarHelp,
     Https,
@@ -882,7 +880,6 @@ public:
         PART_UNAMBIGUOUS            = 0x08000,
         PART_URIC_NO_SLASH          = 0x10000,
         PART_HTTP_QUERY             = 0x20000, //TODO! unused?
-        PART_NEWS_ARTICLE_LOCALPART = 0x40000
     };
 
     enum EscapeType
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index a54dbaaeba3c..75fab085842a 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1240,7 +1240,7 @@ bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
         ( (bFileToFile && INetProtocol::File == aTargetUrl.GetProtocol()) ||
           (!bFileToFile && INetProtocol::File != aTargetUrl.GetProtocol() &&
                            INetProtocol::Ftp <= aTargetUrl.GetProtocol() &&
-                           INetProtocol::News >= aTargetUrl.GetProtocol()) ) )
+                           INetProtocol::Javascript >= aTargetUrl.GetProtocol()) ) )
     {
         if( pFileNameMap )
         {
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index db0f0e91b6c2..228900c661af 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2683,7 +2683,6 @@ void SfxMedium::SetIsRemote_Impl()
         case INetProtocol::Ftp:
         case INetProtocol::Http:
         case INetProtocol::Https:
-        case INetProtocol::News:
         case INetProtocol::Vim:
             pImp->m_bRemote = true;
         break;
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index b27cdc12d5c6..7161dae72993 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -191,7 +191,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
             // testen, ob es ein Protokoll-Typ ist, den ich anzeigen will
             INetProtocol aProtocol = aUrl.GetProtocol();
             static const INetProtocol s_aQuickHelpSupported[] =
-                {   INetProtocol::Ftp, INetProtocol::Http, INetProtocol::File, INetProtocol::Mailto, INetProtocol::News,
+                {   INetProtocol::Ftp, INetProtocol::Http, INetProtocol::File, INetProtocol::Mailto,
                     INetProtocol::Https, INetProtocol::Javascript,
                     INetProtocol::Vim, INetProtocol::Ldap
                 };
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 478a55b33f71..68fea5ce251b 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -115,13 +115,6 @@ using namespace css;
    segment = *(pchar / ";")
 
 
-   ; RFC 1738, RFC 2396, RFC 2732
-   news-url = "NEWS:" grouppart
-   grouppart = "*" / group / article
-   group = alpha *(alphanum / "+" / "-" / "." / "_")
-   article = 1*(escaped / alphanum / "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "?" / "_" / "~") "@" host
-
-
    ; private
    private-url = "PRIVATE:" path ["?" *uric]
    path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~")
@@ -352,9 +345,6 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme)
             "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, false,
             false, false, true, true, true, true},
         SchemeInfo{
-            "news", "news:", 0, false, false, false, false, false, false, false,
-            false},
-        SchemeInfo{
             "private", "private:", 0, false, false, false, false, false, false,
             false, true},
         SchemeInfo{
@@ -467,107 +457,106 @@ enum
     PP = INetURLObject::PART_UNAMBIGUOUS,
     PQ = INetURLObject::PART_URIC_NO_SLASH,
     PR = INetURLObject::PART_HTTP_QUERY,
-    PS = INetURLObject::PART_NEWS_ARTICLE_LOCALPART
 };
 
 static sal_uInt32 const aMustEncodeMap[128]
     = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 /*   */                                              PP,
-/* ! */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
+/* ! */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
 /* " */                                     PM+PN   +PP,
 /* # */                                     PM,
-/* $ */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
+/* $ */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
 /* % */                                     PM,
-/* & */ PA      +PD+PE+PF+PG+PH+PI   +PK+PL+PM+PN+PO   +PQ+PR+PS,
-/* ' */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* ( */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* ) */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* * */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* + */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO   +PQ+PR+PS,
-/* , */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN      +PQ+PR+PS,
-/* - */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* . */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* / */         +PD      +PG+PH+PI+PJ+PK   +PM+PN+PO         +PS,
-/* 0 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 1 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 2 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 3 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 4 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 5 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 6 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 7 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 8 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* 9 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* : */         +PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO   +PQ+PR+PS,
-/* ; */ PA         +PE+PF+PG+PH+PI+PJ+PK   +PM         +PQ+PR+PS,
+/* & */ PA      +PD+PE+PF+PG+PH+PI   +PK+PL+PM+PN+PO   +PQ+PR,
+/* ' */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* ( */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* ) */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* * */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* + */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO   +PQ+PR,
+/* , */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN      +PQ+PR,
+/* - */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* . */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* / */         +PD      +PG+PH+PI+PJ+PK   +PM+PN+PO,
+/* 0 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 1 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 2 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 3 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 4 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 5 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 6 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 7 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 8 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* 9 */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* : */         +PD+PE   +PG+PH+PI+PJ+PK+PL+PM+PN+PO   +PQ+PR,
+/* ; */ PA         +PE+PF+PG+PH+PI+PJ+PK   +PM         +PQ+PR,
 /* < */                        +PI         +PM+PN   +PP,
-/* = */ PA      +PD+PE+PF+PG+PH      +PK+PL+PM+PN      +PQ+PR+PS,
+/* = */ PA      +PD+PE+PF+PG+PH      +PK+PL+PM+PN      +PQ+PR,
 /* > */                        +PI         +PM+PN   +PP,
-/* ? */                  +PG               +PM   +PO   +PQ   +PS,
+/* ? */                  +PG               +PM   +PO   +PQ,
 /* @ */         +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
-/* A */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* B */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* C */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* D */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* E */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* F */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* G */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* H */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* I */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* J */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* K */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* L */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* M */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* N */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* O */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* P */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* Q */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* R */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* S */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* T */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* U */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* V */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* W */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* X */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* Y */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* Z */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
+/* A */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* B */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* C */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* D */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* E */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* F */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* G */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* H */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* I */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* J */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* K */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* L */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* M */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* N */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* O */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* P */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* Q */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* R */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* S */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* T */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* U */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* V */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* W */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* X */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* Y */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* Z */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
 /* [ */                   PG               +PM+PN+PO,
 /* \ */                                    +PM+PN   +PP,
 /* ] */                   PG               +PM+PN+PO,
 /* ^ */                                     PM+PN   +PP,
-/* _ */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
+/* _ */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
 /* ` */                                     PM+PN   +PP,
-/* a */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* b */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* c */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* d */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* e */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* f */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* g */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* h */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* i */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* j */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* k */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* l */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* m */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* n */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* o */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* p */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* q */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* r */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* s */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* t */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* u */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* v */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* w */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* x */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* y */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
-/* z */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR+PS,
+/* a */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* b */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* c */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* d */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* e */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* f */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* g */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* h */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* i */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* j */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* k */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* l */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* m */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* n */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* o */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* p */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* q */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* r */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* s */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* t */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* u */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* v */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* w */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* x */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* y */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
+/* z */ PA   +PC+PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ+PR,
 /* { */                                     PM+PN   +PP,
 /* | */                                    +PM+PN   +PP,
 /* } */                                     PM+PN   +PP,
-/* ~ */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ   +PS,
+/* ~ */ PA      +PD+PE+PF+PG+PH+PI+PJ+PK+PL+PM+PN+PO+PP+PQ,
         0 };
 
 inline bool mustEncode(sal_uInt32 nUTF32, INetURLObject::Part ePart)
@@ -2161,7 +2150,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *&
             { "macro:", "staroffice.macro:", INetProtocol::Macro,
               PrefixInfo::INTERNAL },
             { "mailto:", 0, INetProtocol::Mailto, PrefixInfo::OFFICIAL },
-            { "news:", 0, INetProtocol::News, PrefixInfo::OFFICIAL },
             { "out:", "staroffice.out:", INetProtocol::Out,
               PrefixInfo::INTERNAL },
             { "private:", "staroffice.private:", INetProtocol::PrivSoffice,
@@ -3063,73 +3051,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
             }
             break;
 
-        case INetProtocol::News:
-            if (pPos == pEnd || *pPos == nQueryDelimiter
-                || *pPos == nFragmentDelimiter)
-                return false;
-
-            // Match <"*">:
-            if (*pPos == '*'
-                && (pEnd - pPos == 1 || pPos[1] == nQueryDelimiter
-                    || pPos[1] == nFragmentDelimiter))
-            {
-                ++pPos;
-                aTheSynPath.append('*');
-                break;
-            }
-
-            // Match <group>:
-            if (rtl::isAsciiAlpha(*pPos))
-            {
-                for (sal_Unicode const * p = pPos + 1;; ++p)
-                {
-                    if (p == pEnd || *p == nQueryDelimiter
-                        || *p == nFragmentDelimiter)
-                    {
-                        aTheSynPath.setLength(0);
-                        aTheSynPath.append(pPos, p - pPos);
-                        pPos = p;
-                        goto done;
-                    }
-                    else if (!rtl::isAsciiAlphanumeric(*p) && *p != '+'
-                             && *p != '-' && *p != '.' && *p != '_')
-                    {
-                        break;
-                    }
-                }
-            }
-
-            // Match <article>:
-            for (;;)
-            {
-                if (pPos == pEnd || *pPos == nQueryDelimiter
-                    || *pPos == nFragmentDelimiter)
-                    return false;
-                if (*pPos == '@')
-                    break;
-                EscapeType eEscapeType;
-                sal_uInt32 nUTF32 = getUTF32(pPos, pEnd, bOctets, '%',
-                                             eMechanism, eCharset, eEscapeType);
-                appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
-                           PART_NEWS_ARTICLE_LOCALPART, '%', eCharset, true);
-            }
-            if (aTheSynPath.isEmpty())
-                return false;
-            ++pPos;
-            aTheSynPath.append('@');
-            {
-                sal_Unicode const * p = pPos;
-                while (p < pEnd && *pPos != nQueryDelimiter
-                       && *pPos != nFragmentDelimiter)
-                    ++p;
-                OUString aCanonic;
-                if (!parseHost(pPos, p, aCanonic))
-                    return false;
-                aTheSynPath.append(aCanonic);
-            }
-
-        done:
-            break;
 
         case INetProtocol::PrivSoffice:
         case INetProtocol::Slot: