[Libreoffice-commits] .: cui/source

Miklos Vajna vmiklos at kemper.freedesktop.org
Thu Jul 12 07:21:01 PDT 2012


 cui/source/dialogs/about.cxx |   28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

New commits:
commit 28d8b54c142df38b94079cf0d93f09c2a008459b
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Thu Jul 12 16:19:37 2012 +0200

    about dialog: use new configmgr api
    
    Change-Id: Ife65c0d9417c31e80d11e2e97ffd06765d90fb1e

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 21e4592..6dc820d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -56,6 +56,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/rendergraphicrasterizer.hxx>
+#include <officecfg/Office/Common.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -124,31 +125,8 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
         sURL = m_aCreditsLinkStr;
     else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
     {
-        try
-        {
-            Reference<lang::XMultiServiceFactory> xConfig( comphelper::getProcessServiceFactory()->createInstance(rtl::OUString( "com.sun.star.configuration.ConfigurationProvider" )),UNO_QUERY);
-            if( xConfig.is() )
-            {
-                Sequence<Any> args(1);
-                PropertyValue val(
-                    rtl::OUString( "nodepath" ),
-                    0,
-                    Any(rtl::OUString( "/org.openoffice.Office.Common/Help/StartCenter" )),
-                    PropertyState_DIRECT_VALUE);
-                args.getArray()[0] <<= val;
-                Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" ),args), UNO_QUERY);
-                if( xNameAccess.is() )
-                {
-                    //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
-                    Any value( xNameAccess->getByName(rtl::OUString( "InfoURL" )) );
-                    sURL = value.get<rtl::OUString> ();
-                    localizeWebserviceURI(sURL);
-                }
-            }
-        }
-        catch (const Exception&)
-        {
-        }
+        sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
+        localizeWebserviceURI(sURL);
     }
 
     // If the URL is empty, don't do anything


More information about the Libreoffice-commits mailing list