[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply             |    3 --
 patches/dev300/help-support.diff |   45 ---------------------------------------
 2 files changed, 48 deletions(-)

New commits:
commit 3cd5118c5752bb39598269f175466e4675c9ea6b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 20:29:50 2011 +0200

    git unused help-support.diff
    
    the support menu entry has been replaced by license

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5319824..3c3845c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -377,9 +377,6 @@ mdv-toolbariconstosmall.diff, cabral
 mdv-exceptcxx-include-string.diff, cabral
 
 [ NovellOnlyUnix ]
-# Help Support page
-# FIXME: there is not longer About/Support button in LibreOffice help-support.diff, michael
-
 # change user config dir name from ~/.openoffice.org3 to ~/.ooo3
 # FIXME: do we want another config dir for the Novell buidls?
 scp2-user-config-suse.diff, pmladek
diff --git a/patches/dev300/help-support.diff b/patches/dev300/help-support.diff
deleted file mode 100644
index b01d7f3..0000000
--- a/patches/dev300/help-support.diff
+++ /dev/null
@@ -1,45 +0,0 @@
----
- sfx2/source/appl/appserv.cxx |   19 ++++++++++++++++++-
- 1 files changed, 18 insertions(+), 1 deletions(-)
-
-diff --git sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
-index 3280dd1..d66dabb 100644
---- sfx2/source/appl/appserv.cxx
-+++ sfx2/source/appl/appserv.cxx
-@@ -68,6 +68,8 @@
- #include <tools/config.hxx>
- #include <tools/diagnose_ex.h>
- #include <vcl/msgbox.hxx>
-+#include <com/sun/star/system/XSystemShellExecute.hpp>
-+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
- #include <svl/intitem.hxx>
- #include <svl/eitem.hxx>
- #include <svl/stritem.hxx>
-@@ -343,8 +345,24 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
-             break;
-         }
- 
-+        case SID_HELP_SUPPORTPAGE:
-+        {
-+            try {
-+                Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
-+                    ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+                if ( xSystemShell.is()) {
-+                    rtl::OUString aURI( DEFINE_CONST_UNICODE( "http://www.novell.com/support" ) );
-+                    xSystemShell->execute( aURI, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+                }
-+
-+                break;
-+            } catch (const ::com::sun::star::uno::Exception &) {
-+            }
-+            /* drop through on exception */
-+        }
-+
-         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-         case SID_HELPINDEX:
-         {
-             Help* pHelp = Application::GetHelp();
-             if ( pHelp )
--- 
-1.7.0.1
-