mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix configuration access path for "URL" group member

Browse Source 
...broken with 20430c74f3 "fdo#46037: no more
comphelper/configurationhelper.hxx in uui" (but note that
NewerVersionWarningDialog is dead code anyway since
718c0fe732 "Ported
sfx2-remove-check-update-on-fileload.diff from ooo-build."

Change-Id: I7095044b73888aad12704d76a39551158e6c6b33
This commit is contained in:
Stephan Bergmann
2013-07-25 17:11:29 +02:00
parent ff14c3b595
commit 0d874ee2e4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uui/source/newerverwarn.cxx
View File

@@ -28,6 +28,7 @@
#include <com/sun/star/setup/UpdateCheckConfig.hpp> #include <com/sun/star/setup/UpdateCheckConfig.hpp>
#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/container/XNameReplace.hpp>
#include <comphelper/processfactory.hxx> #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 // 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. // 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; 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) ); uno::Reference< util::XURLTransformer > xTransformer( util::URLTransformer::create(xContext) );
xTransformer->parseStrict( aURL ); xTransformer->parseStrict( aURL );