Do not use pattern::configuration::ConfigurationHelper.

Change-Id: I9cf913f085a2c6862e44803485ab63e2b4572eab

framework/source/accelerators/acceleratorconfiguration.cxx

@@ -19,7 +19,6 @@
 
 #include <accelerators/acceleratorconfiguration.hxx>
 
-#include <pattern/configuration.hxx>
 #include <accelerators/presethandler.hxx>
 
 #include <xml/saxnamespacefilter.hxx>
@@ -47,24 +46,16 @@
 #include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/util/XChangesNotifier.hpp>
 #include <comphelper/configurationhelper.hxx>
+#include <officecfg/Setup.hxx>
 #include <unotools/configpaths.hxx>
 #include <svtools/acceleratorexecute.hxx>
-#include <stdio.h>
-
 
 namespace framework
 {
     const char CFG_ENTRY_SECONDARY[] = "SecondaryKeys";
     const char CFG_PROP_COMMAND[] = "Command";
 
-#ifdef fpc
-    #error "Who exports this define? I use it as namespace alias ..."
-#else
-    namespace fpc = ::framework::pattern::configuration;
-#endif
-
     OUString lcl_getKeyString(salhelper::SingletonRef<framework::KeyMapping>& _rKeyMapping, const css::awt::KeyEvent& aKeyEvent)
     {
         const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier...
@@ -588,17 +579,7 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
 //-----------------------------------------------
 OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    // SAFE -> ----------------------------------
-    ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
-    aReadLock.unlock();
-    // <- SAFE ----------------------------------
-
-    css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig( xContext,
-        "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
-    css::uno::Reference< css::beans::XPropertySet > xProp     (xCFG, css::uno::UNO_QUERY_THROW);
-    OUString                                 sISOLocale;
-    xProp->getPropertyValue("ooLocale") >>= sISOLocale;
+    OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
 
     if (sISOLocale.isEmpty())
         return OUString("en-US");
@@ -1626,17 +1607,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 //-----------------------------------------------
 OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    // SAFE -> ----------------------------------
-    ReadGuard aReadLock(m_aLock);
-    css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
-    aReadLock.unlock();
-    // <- SAFE ----------------------------------
-
-    css::uno::Reference< css::uno::XInterface >     xCFG      = fpc::ConfigurationHelper::openConfig( xContext,
-        "/org.openoffice.Setup", "L10N", fpc::ConfigurationHelper::E_READONLY);
-    css::uno::Reference< css::beans::XPropertySet > xProp     (xCFG, css::uno::UNO_QUERY_THROW);
-    OUString                                 sISOLocale;
-    xProp->getPropertyValue("ooLocale") >>= sISOLocale;
+    OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
 
     if (sISOLocale.isEmpty())
         return OUString("en-US");

framework/source/inc/pattern/configuration.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_CONFIGURATION_HXX
-#define INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_CONFIGURATION_HXX
-
-#include <services.h>
-#include <general.h>
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Any.hxx>
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-#include <rtl/ustrbuf.hxx>
-
-namespace framework{
-    namespace pattern{
-        namespace configuration{
-
-//-----------------------------------------------
-class ConfigurationHelper
-{
-
-    public:
-
-        //---------------------------------------
-        /** @short  allow opening of a configuration access
-                    in different working modes.
-
-            @descr  All enum values must be useable as flags
-                    mapped into a int32 value!
-         */
-        enum EOpenMode
-        {
-            /// open it readonly (default=readwrite!)
-            E_READONLY = 1,
-            /// disable fallback handling for localized cfg nodes
-            E_ALL_LOCALES = 2
-        };
-
-    //-------------------------------------------
-    // interface
-    public:
-
-        //---------------------------------------
-        /**
-            @short  opens a configuration access.
-
-            @descr  TODO
-
-            @param  rxContext
-                    this method need an uno service manager for internal work.
-
-            @param  sPackage
-                    name the configuration file.
-                    e.g. "/.org.openoffice.Setup"
-                    Note: It must start with "/" but end without(!) "/"!
-
-            @param  sRelPath
-                    describe the relativ path of the requested key inside
-                    the specified package.
-                    e.g. "Office/Factories"
-                    Note: Its not allowed to start or end with a "/"!
-                    Further you must use encoded path elements if
-                    e.g. set nodes are involved.
-
-            @param  nOpenFlags
-                    force opening of the configuration access in special mode.
-                    see enum EOpenMode for further information.
-         */
-        static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >&     rxContext,
-                                                                      const OUString&                                        sPackage  ,
-                                                                      const OUString&                                        sRelPath  ,
-                                                                            sal_Int32                                               nOpenFlags)
-        {
-            css::uno::Reference< css::uno::XInterface > xCFG;
-
-            try
-            {
-                css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider =
-                    css::configuration::theDefaultProvider::get( rxContext );
-
-                OUStringBuffer sPath(1024);
-                sPath.append(sPackage      );
-                sPath.append(static_cast<sal_Unicode>('/'));
-                sPath.append(sRelPath      );
-
-                sal_Bool bReadOnly   = ((nOpenFlags & ConfigurationHelper::E_READONLY   ) == ConfigurationHelper::E_READONLY   );
-                sal_Bool bAllLocales = ((nOpenFlags & ConfigurationHelper::E_ALL_LOCALES) == ConfigurationHelper::E_ALL_LOCALES);
-
-                sal_Int32 c = 1;
-                if (bAllLocales)
-                    c = 2;
-
-                css::uno::Sequence< css::uno::Any > lParams(c);
-                css::beans::PropertyValue           aParam;
-
-                aParam.Name    = OUString("nodepath");
-                aParam.Value <<= sPath.makeStringAndClear();
-                lParams[0]   <<= aParam;
-
-                if (bAllLocales)
-                {
-                    aParam.Name    = OUString("*");
-                    aParam.Value <<= sal_True;
-                    lParams[1]   <<= aParam;
-                }
-
-                if (bReadOnly)
-                    xCFG = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS, lParams);
-                else
-                    xCFG = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGUPDATEACCESS, lParams);
-            }
-            catch(const css::uno::RuntimeException& exRun)
-                { throw exRun; }
-            catch(const css::uno::Exception&)
-                { xCFG.clear(); }
-
-            return xCFG;
-        }
-};
-
-        } // namespace configuration
-    } // namespace pattern
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_CONFIGURATION_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */