[Libreoffice-commits] core.git: include/svtools sal/qa svtools/source

[Adolfo Jayme Barrientos]

 include/svtools/htmlkywd.hxx              |   10 --------
 sal/qa/osl/socket/osl_Socket_Const_orig.h |    1 
 svtools/source/svhtml/parhtml.cxx         |   34 ------------------------------
 3 files changed, 1 insertion(+), 44 deletions(-)

New commits:
commit ea7f16bf0b5e195d65e51c624b0fb37980bf2b95
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Fri Mar 13 22:32:14 2015 -0600

    tdf#89361 Remove remnants of Gopher support
    
    Change-Id: Ib2038a43b0d49a525199329a2c79d5779f5322fa
    Reviewed-on: https://gerrit.libreoffice.org/14471
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 4d52d02..54309a7 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -657,17 +657,7 @@
 
 // internal graphics names
 #define OOO_STRING_SVTOOLS_HTML_private_image "private:image/"
-#define OOO_STRING_SVTOOLS_HTML_internal_gopher "internal-gopher-"
 #define OOO_STRING_SVTOOLS_HTML_internal_icon "internal-icon-"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary "binary"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image "image"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index "index"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu "menu"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie "movie"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound "sound"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet "telnet"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text "text"
-#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown "unknown"
 #define OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata "baddata"
 #define OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed "delayed"
 #define OOO_STRING_SVTOOLS_HTML_INT_ICON_embed "embed"
diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h
index 28e2fdc..c59e8a2 100644
--- a/sal/qa/osl/socket/osl_Socket_Const_orig.h
+++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h
@@ -107,7 +107,6 @@ extern "C"
 
 OSLTEST_DECLARE( ServiceFTP,  "ftp" );
 OSLTEST_DECLARE( ServiceTELNET,  "telnet" );
-OSLTEST_DECLARE( ServiceGOPHER,  "gopher" );
 OSLTEST_DECLARE( ServiceIMAP,  "imap" );
 OSLTEST_DECLARE( ServiceHTTPS,  "https" );
 OSLTEST_DECLARE( ServiceNETBIOS,  "netbios-dgm" );
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index cfbb59b..11e173c 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1842,41 +1842,9 @@ int HTMLParser::FilterListing( int nToken )
 
 bool HTMLParser::InternalImgToPrivateURL( OUString& rURL )
 {
-    if( rURL.getLength() < 19 || 'i' != rURL[0] ||
-        rURL.compareTo( OOO_STRING_SVTOOLS_HTML_internal_gopher, 9 ) != 0 )
-        return false;
-
     bool bFound = false;
 
-    if( rURL.startsWith( OOO_STRING_SVTOOLS_HTML_internal_gopher ) )
-    {
-        OUString aName( rURL.copy(16) );
-        switch( aName[0] )
-        {
-        case 'b':
-            bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary;
-            break;
-        case 'i':
-            bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image ||
-                     aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index;
-            break;
-        case 'm':
-            bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu ||
-                     aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie;
-            break;
-        case 's':
-            bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound;
-            break;
-        case 't':
-            bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet ||
-                     aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text;
-            break;
-        case 'u':
-            bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown;
-            break;
-        }
-    }
-    else if( rURL.startsWith( OOO_STRING_SVTOOLS_HTML_internal_icon ) )
+    if( rURL.startsWith( OOO_STRING_SVTOOLS_HTML_internal_icon ) )
     {
         OUString aName( rURL.copy(14) );
         switch( aName[0] )