cf7c9599e7
See aebf5bf223 "fdo#52232 ConfigurationSet wrapper
unusable for localized properties" for a discussion of the problems with the
original design.
1 Redesigned configmgr's localized property access to understand ['*<locale>']
paths that select the best existing value match for the requested <locale>.
Adapted ConfigurationWrapper::getLocalizedPropertyValue accordingly.
2 Redesigned ConfigurationChanges to fix the locale at instantiation time.
That takes care of ConfigurationWrapper::setLocalizedPropertyValue,
ConfigurationWrapper::getGroupReadWrite, and
ConfigurationWrapper::getSetReadWrite. (This required an additional constructor
parameter for the ReadWriteAccess service, to specify a locale at instantiation
time.)
3 Redesigned ReadOnlyAccess to be a service that fixes the locale at
instantiation time. That allows to take care of
ConfigurationWrapper::getGroupReadOnly and ConfigurationWrapper::getSetReadOnly.
Change-Id: I2ae7342b278b6f4222a0189a1deb2a53e204059f
247 lines
8.4 KiB
C++
247 lines
8.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
|
*
|
|
* The contents of this file are subject to the Mozilla Public License Version
|
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
* the License or as specified alternatively below. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
* for the specific language governing rights and limitations under the
|
|
* License.
|
|
*
|
|
* Major Contributor(s):
|
|
* Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
|
|
* (initial developer)
|
|
*
|
|
* All Rights Reserved.
|
|
*
|
|
* For minor contributions see the git repository.
|
|
*
|
|
* Alternatively, the contents of this file may be used under the terms of
|
|
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
|
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
|
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
|
* instead of those above.
|
|
*/
|
|
|
|
#include "sal/config.h"
|
|
|
|
#include <cassert>
|
|
|
|
#include "boost/shared_ptr.hpp"
|
|
#include "com/sun/star/configuration/ReadOnlyAccess.hpp"
|
|
#include "com/sun/star/configuration/ReadWriteAccess.hpp"
|
|
#include "com/sun/star/configuration/XReadWriteAccess.hpp"
|
|
#include "com/sun/star/configuration/theDefaultProvider.hpp"
|
|
#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
|
|
#include "com/sun/star/container/XHierarchicalNameReplace.hpp"
|
|
#include "com/sun/star/container/XNameAccess.hpp"
|
|
#include "com/sun/star/container/XNameContainer.hpp"
|
|
#include "com/sun/star/lang/Locale.hpp"
|
|
#include "com/sun/star/lang/XLocalizable.hpp"
|
|
#include "com/sun/star/uno/Any.hxx"
|
|
#include "com/sun/star/uno/Reference.hxx"
|
|
#include "com/sun/star/uno/XComponentContext.hpp"
|
|
#include "comphelper/configuration.hxx"
|
|
#include "rtl/instance.hxx"
|
|
#include "rtl/oustringostreaminserter.hxx"
|
|
#include "rtl/ustrbuf.hxx"
|
|
#include "rtl/ustring.h"
|
|
#include "rtl/ustring.hxx"
|
|
#include "sal/log.hxx"
|
|
|
|
namespace {
|
|
|
|
namespace css = com::sun::star;
|
|
|
|
struct TheConfigurationWrapper:
|
|
public rtl::StaticWithArg<
|
|
comphelper::detail::ConfigurationWrapper,
|
|
css::uno::Reference< css::uno::XComponentContext >,
|
|
TheConfigurationWrapper >
|
|
{};
|
|
|
|
OUString getDefaultLocale(
|
|
css::uno::Reference< css::uno::XComponentContext > const & context)
|
|
{
|
|
css::lang::Locale locale(
|
|
css::uno::Reference< css::lang::XLocalizable >(
|
|
css::configuration::theDefaultProvider::get(context),
|
|
css::uno::UNO_QUERY_THROW)->
|
|
getLocale());
|
|
OUStringBuffer buf;
|
|
SAL_WARN_IF(
|
|
locale.Language.indexOf('-') != -1, "comphelper",
|
|
"Locale language \"" << locale.Language << "\" contains \"-\"");
|
|
buf.append(locale.Language);
|
|
SAL_WARN_IF(
|
|
locale.Country.isEmpty() && !locale.Variant.isEmpty(), "comphelper",
|
|
"Locale has empty country but non-empty variant \"" << locale.Variant
|
|
<< '"');
|
|
if (!locale.Country.isEmpty()) {
|
|
buf.append('-');
|
|
SAL_WARN_IF(
|
|
locale.Country.indexOf('-') != -1, "comphelper",
|
|
"Locale language \"" << locale.Country << "\" contains \"-\"");
|
|
buf.append(locale.Country);
|
|
if (!locale.Variant.isEmpty()) {
|
|
buf.append('-');
|
|
buf.append(locale.Variant);
|
|
}
|
|
}
|
|
return buf.makeStringAndClear();
|
|
}
|
|
|
|
OUString extendLocalizedPath(OUString const & path, OUString const & locale) {
|
|
rtl::OUStringBuffer buf(path);
|
|
buf.append("/['*");
|
|
SAL_WARN_IF(
|
|
locale.match("*"), "comphelper",
|
|
"Locale \"" << locale << "\" starts with \"-\"");
|
|
assert(locale.indexOf('&') == -1);
|
|
assert(locale.indexOf('"') == -1);
|
|
assert(locale.indexOf('\'') == -1);
|
|
buf.append(locale);
|
|
buf.append("']");
|
|
return buf.makeStringAndClear();
|
|
}
|
|
|
|
}
|
|
|
|
boost::shared_ptr< comphelper::ConfigurationChanges >
|
|
comphelper::ConfigurationChanges::create(
|
|
css::uno::Reference< css::uno::XComponentContext > const & context)
|
|
{
|
|
return TheConfigurationWrapper::get(context).createChanges();
|
|
}
|
|
|
|
|
|
comphelper::ConfigurationChanges::~ConfigurationChanges() {}
|
|
|
|
void comphelper::ConfigurationChanges::commit() const {
|
|
access_->commitChanges();
|
|
}
|
|
|
|
comphelper::ConfigurationChanges::ConfigurationChanges(
|
|
css::uno::Reference< css::uno::XComponentContext > const & context):
|
|
access_(
|
|
css::configuration::ReadWriteAccess::create(
|
|
context, getDefaultLocale(context)))
|
|
{}
|
|
|
|
void comphelper::ConfigurationChanges::setPropertyValue(
|
|
rtl::OUString const & path, css::uno::Any const & value) const
|
|
{
|
|
access_->replaceByHierarchicalName(path, value);
|
|
}
|
|
|
|
css::uno::Reference< css::container::XHierarchicalNameReplace >
|
|
comphelper::ConfigurationChanges::getGroup(rtl::OUString const & path) const
|
|
{
|
|
return css::uno::Reference< css::container::XHierarchicalNameReplace >(
|
|
access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW);
|
|
}
|
|
|
|
css::uno::Reference< css::container::XNameContainer >
|
|
comphelper::ConfigurationChanges::getSet(rtl::OUString const & path) const
|
|
{
|
|
return css::uno::Reference< css::container::XNameContainer >(
|
|
access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW);
|
|
}
|
|
|
|
comphelper::detail::ConfigurationWrapper const &
|
|
comphelper::detail::ConfigurationWrapper::get(
|
|
css::uno::Reference< css::uno::XComponentContext > const & context)
|
|
{
|
|
return TheConfigurationWrapper::get(context);
|
|
}
|
|
|
|
comphelper::detail::ConfigurationWrapper::ConfigurationWrapper(
|
|
css::uno::Reference< css::uno::XComponentContext > const & context):
|
|
context_(context),
|
|
access_(css::configuration::ReadOnlyAccess::create(context, "*"))
|
|
{}
|
|
|
|
comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {}
|
|
|
|
css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue(
|
|
rtl::OUString const & path) const
|
|
{
|
|
return access_->getByHierarchicalName(path);
|
|
}
|
|
|
|
void comphelper::detail::ConfigurationWrapper::setPropertyValue(
|
|
boost::shared_ptr< ConfigurationChanges > const & batch,
|
|
rtl::OUString const & path, com::sun::star::uno::Any const & value) const
|
|
{
|
|
assert(batch.get() != 0);
|
|
batch->setPropertyValue(path, value);
|
|
}
|
|
|
|
css::uno::Any
|
|
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(
|
|
rtl::OUString const & path) const
|
|
{
|
|
return access_->getByHierarchicalName(
|
|
extendLocalizedPath(path, getDefaultLocale(context_)));
|
|
}
|
|
|
|
void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(
|
|
boost::shared_ptr< ConfigurationChanges > const & batch,
|
|
rtl::OUString const & path, com::sun::star::uno::Any const & value) const
|
|
{
|
|
assert(batch.get() != 0);
|
|
batch->setPropertyValue(path, value);
|
|
}
|
|
|
|
css::uno::Reference< css::container::XHierarchicalNameAccess >
|
|
comphelper::detail::ConfigurationWrapper::getGroupReadOnly(
|
|
rtl::OUString const & path) const
|
|
{
|
|
return css::uno::Reference< css::container::XHierarchicalNameAccess >(
|
|
(css::configuration::ReadOnlyAccess::create(
|
|
context_, getDefaultLocale(context_))->
|
|
getByHierarchicalName(path)),
|
|
css::uno::UNO_QUERY_THROW);
|
|
}
|
|
|
|
css::uno::Reference< css::container::XHierarchicalNameReplace >
|
|
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(
|
|
boost::shared_ptr< ConfigurationChanges > const & batch,
|
|
rtl::OUString const & path) const
|
|
{
|
|
assert(batch.get() != 0);
|
|
return batch->getGroup(path);
|
|
}
|
|
|
|
css::uno::Reference< css::container::XNameAccess >
|
|
comphelper::detail::ConfigurationWrapper::getSetReadOnly(
|
|
rtl::OUString const & path) const
|
|
{
|
|
return css::uno::Reference< css::container::XNameAccess >(
|
|
(css::configuration::ReadOnlyAccess::create(
|
|
context_, getDefaultLocale(context_))->
|
|
getByHierarchicalName(path)),
|
|
css::uno::UNO_QUERY_THROW);
|
|
}
|
|
|
|
css::uno::Reference< css::container::XNameContainer >
|
|
comphelper::detail::ConfigurationWrapper::getSetReadWrite(
|
|
boost::shared_ptr< ConfigurationChanges > const & batch,
|
|
rtl::OUString const & path) const
|
|
{
|
|
assert(batch.get() != 0);
|
|
return batch->getSet(path);
|
|
}
|
|
|
|
boost::shared_ptr< comphelper::ConfigurationChanges >
|
|
comphelper::detail::ConfigurationWrapper::createChanges() const {
|
|
return boost::shared_ptr< ConfigurationChanges >(
|
|
new ConfigurationChanges(context_));
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|