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

[Julien Nabet]

 framework/source/classes/taskcreator.cxx |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 04646443b3ee3baef0c3bdbaefad0eb66b71d33a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Jul 26 19:12:11 2013 +0200

    fdo#46037: no more comphelper/configurationhelper.hxx in framework/classes
    
    Thank you Stephan!
    
    Change-Id: I70a7f3dbbbe71c165f823ecc207bb5995a8e1376

diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index bff649c..49aebce 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -28,9 +28,10 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 
-#include <comphelper/configurationhelper.hxx>
 #include <vcl/svapp.hxx>
 
+#include <officecfg/Office/TabBrowse.hxx>
+
 namespace framework{
 
 /*-****************************************************************************************************//**
@@ -78,12 +79,9 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUStrin
             ( TargetHelper::matchSpecialTarget(sName, TargetHelper::E_DEFAULT) )
            )
         {
-            ::comphelper::ConfigurationHelper::readDirectKey(
-                xContext,
-                "org.openoffice.Office.TabBrowse",
-                "TaskCreatorService",
-                "ImplementationName",
-                ::comphelper::ConfigurationHelper::E_READONLY) >>= sCreator;
+
+            boost::optional<OUString> x(officecfg::Office::TabBrowse::TaskCreatorService::ImplementationName::get(xContext));
+            if (x) sCreator = x.get();
         }
 
         xCreator = css::uno::Reference< css::lang::XSingleServiceFactory >(