diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-07-24 14:06:10 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-24 20:20:32 +0000 |
| commit | 20430c74f391ceffd8a063c0b6b8a8fd615abac0 (patch) | |
| tree | c490dede784c1fccdf8a1b672467dafce4b01859 | |
| parent | c9d037c3e814eafb6db1fbafa2d3f9d097886873 (diff) | |
fdo#46037: no more comphelper/configurationhelper.hxx in uui
Change-Id: Ie7f42eb02f38d5cac2eff7b434ca369ea28b4ed1
Reviewed-on: https://gerrit.libreoffice.org/5065
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | uui/Library_uui.mk | 4 | ||||
| -rw-r--r-- | uui/source/newerverwarn.cxx | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index 06d1dfb9e15b..66e38796127b 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -13,6 +13,10 @@ $(eval $(call gb_Library_set_componentfile,uui,uui/util/uui)) $(eval $(call gb_Library_use_external,uui,boost_headers)) +$(eval $(call gb_Library_use_custom_headers,uui,\ + officecfg/registry \ +)) + $(eval $(call gb_Library_use_sdk_api,uui)) $(eval $(call gb_Library_use_libraries,uui,\ diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index afa21bd75f0f..ac835762bb6c 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -31,11 +31,11 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/configurationhelper.hxx> #include <rtl/bootstrap.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <osl/process.h> +#include <officecfg/Office/Addons.hxx> using namespace com::sun::star; @@ -105,15 +105,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); - uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( - xContext, - "org.openoffice.Office.Addons/", - "AddonUI/OfficeHelp/UpdateCheckJob", - "URL", - ::comphelper::ConfigurationHelper::E_READONLY ); util::URL aURL; - if ( aVal >>= aURL.Complete ) + if ( xOfficeHelp->getByName("UpdateCheckJob") >>= aURL.Complete ) { uno::Reference< util::XURLTransformer > xTransformer( util::URLTransformer::create(xContext) ); xTransformer->parseStrict( aURL ); |