incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1371686 - /incubator/ooo/branches/AOO34/main/cui/source/options/treeopt.cxx
Date Fri, 10 Aug 2012 12:27:50 GMT
Author: af
Date: Fri Aug 10 12:27:50 2012
New Revision: 1371686

URL: http://svn.apache.org/viewvc?rev=1371686&view=rev
Log:
#i120518# Hide "Browser Plug-in" tab page in options dialog.

          Patch by: Ariel Constenla-Haile
          Review by: Andre Fischer

Modified:
    incubator/ooo/branches/AOO34/main/cui/source/options/treeopt.cxx

Modified: incubator/ooo/branches/AOO34/main/cui/source/options/treeopt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/cui/source/options/treeopt.cxx?rev=1371686&r1=1371685&r2=1371686&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/cui/source/options/treeopt.cxx (original)
+++ incubator/ooo/branches/AOO34/main/cui/source/options/treeopt.cxx Fri Aug 10 12:27:50 2012
@@ -2178,33 +2178,10 @@ void OfaTreeOptionsDialog::Initialize( c
             if ( nPageId == RID_SVXPAGE_INET_MAIL )
                 continue;
 #endif
-#if defined MACOSX
-            // Disable Mozilla Plug-in tab-page on Mac
+            // Disable Mozilla Plug-in tab-page on every platform until completely removed
             if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
                 continue;
-#endif
-#ifdef LINUX                                                                  
-            // Disable Mozilla Plug-in tab-page on Linux if we find a         
-            // globally installed plugin                                      
-            if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) {                     
-                struct stat sb;                                               
-                char *p;                                                       
-                bool bHaveSystemWidePlugin = false;                           
-                char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so";
 
-                                                                               
-                p = strtok(mozpaths, ":");                                     
-                while (p != NULL) {                                            
-                    if (stat(p, &sb) != -1) {                                  
-                         bHaveSystemWidePlugin = true;                         
-                         break;                                                
-                    }                                                          
-                    p = strtok(NULL, ":");                                     
-                }                                                             
-                                                                               
-                if (bHaveSystemWidePlugin == true)                            
-                    continue;                                                  
-            }                                                                   
-#endif
+
             AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
         }
     }



Mime
View raw message