[Libreoffice-commits] core.git: uui/source

Stephan Bergmann sbergman at redhat.com
Thu Jul 25 08:15:44 PDT 2013


 uui/source/newerverwarn.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0d874ee2e452ea67c03a27bf1a7f26d0ffc617dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jul 25 17:11:29 2013 +0200

    Fix configuration access path for "URL" group member
    
    ...broken with 20430c74f391ceffd8a063c0b6b8a8fd615abac0 "fdo#46037: no more
    comphelper/configurationhelper.hxx in uui" (but note that
    NewerVersionWarningDialog is dead code anyway since
    718c0fe73251be083d032f0905880058128d4054 "Ported
    sfx2-remove-check-update-on-fileload.diff from ooo-build."
    
    Change-Id: I7095044b73888aad12704d76a39551158e6c6b33

diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index ac83576..8e4877a 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/setup/UpdateCheckConfig.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 
 #include <comphelper/processfactory.hxx>
@@ -105,10 +106,10 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
 
             // TODO: do we need to respect the bUpdateCheckEnabled flag? Finally, its meaning is "are automatic
             // updates enabled", but this here is not an automatic update, but one triggered explicitly by the user.
-            css::uno::Reference< css::container::XNameAccess > xOfficeHelp = officecfg::Office::Addons::AddonUI::OfficeHelp::get(xContext);
+            css::uno::Reference< css::container::XHierarchicalNameAccess > xOfficeHelp(officecfg::Office::Addons::AddonUI::OfficeHelp::get(xContext), css::uno::UNO_QUERY_THROW);
 
             util::URL aURL;
-            if ( xOfficeHelp->getByName("UpdateCheckJob") >>= aURL.Complete )
+            if ( xOfficeHelp->getByHierarchicalName("['UpdateCheckJob']/URL") >>= aURL.Complete )
             {
                 uno::Reference< util::XURLTransformer > xTransformer( util::URLTransformer::create(xContext) );
                 xTransformer->parseStrict( aURL );


More information about the Libreoffice-commits mailing list