[Libreoffice-commits] .: configmgr/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 11 04:08:59 PST 2012
configmgr/source/access.cxx | 295 +++++++++++------------------
configmgr/source/access.hxx | 103 +++++-----
configmgr/source/broadcaster.cxx | 10
configmgr/source/childaccess.cxx | 24 --
configmgr/source/childaccess.hxx | 14 -
configmgr/source/components.cxx | 198 +++++++------------
configmgr/source/components.hxx | 49 ++--
configmgr/source/configurationprovider.cxx | 120 ++++-------
configmgr/source/configurationprovider.hxx | 9
configmgr/source/configurationregistry.cxx | 288 ++++++++++------------------
configmgr/source/configurationregistry.hxx | 5
configmgr/source/data.cxx | 85 +++-----
configmgr/source/data.hxx | 28 +-
configmgr/source/defaultprovider.cxx | 14 -
configmgr/source/defaultprovider.hxx | 5
configmgr/source/groupnode.cxx | 4
configmgr/source/groupnode.hxx | 8
configmgr/source/localizedpropertynode.hxx | 1
configmgr/source/localizedvaluenode.cxx | 4
configmgr/source/localizedvaluenode.hxx | 3
configmgr/source/modifications.hxx | 3
configmgr/source/node.cxx | 8
configmgr/source/node.hxx | 5
configmgr/source/nodemap.hxx | 3
configmgr/source/parsemanager.cxx | 2
configmgr/source/parsemanager.hxx | 5
configmgr/source/parser.hxx | 3
configmgr/source/partial.cxx | 20 -
configmgr/source/partial.hxx | 7
configmgr/source/path.hxx | 3
configmgr/source/propertynode.cxx | 6
configmgr/source/propertynode.hxx | 5
configmgr/source/readonlyaccess.cxx | 20 -
configmgr/source/readonlyaccess.hxx | 5
configmgr/source/readwriteaccess.cxx | 26 +-
configmgr/source/readwriteaccess.hxx | 5
configmgr/source/rootaccess.cxx | 34 +--
configmgr/source/rootaccess.hxx | 22 +-
configmgr/source/setnode.cxx | 20 -
configmgr/source/setnode.hxx | 20 -
configmgr/source/type.cxx | 10
configmgr/source/update.cxx | 43 +---
configmgr/source/update.hxx | 5
configmgr/source/valueparser.cxx | 29 +-
configmgr/source/valueparser.hxx | 4
configmgr/source/writemodfile.cxx | 43 +---
configmgr/source/writemodfile.hxx | 3
configmgr/source/xcdparser.cxx | 14 -
configmgr/source/xcdparser.hxx | 2
configmgr/source/xcsparser.cxx | 84 +++-----
configmgr/source/xcsparser.hxx | 8
configmgr/source/xcuparser.cxx | 190 ++++++------------
configmgr/source/xcuparser.hxx | 14 -
configmgr/source/xmldata.cxx | 13 -
configmgr/source/xmldata.hxx | 7
55 files changed, 816 insertions(+), 1142 deletions(-)
New commits:
commit 3e64874e7cd234ff563ac11450cfb2b6e2db4bf6
Author: Radu Ioan <ioan.radu.g at gmail.com>
Date: Mon Dec 10 23:06:10 2012 +0200
rtl:: prefix removal from configmgr
- removed rtl:: prefix
- removed RTL_CONSTASCII_USTRINGPARAM
- corrected some misspells
Change-Id: I88bb0beec718a7fe38c61220aa61401419f23b42
Reviewed-on: https://gerrit.libreoffice.org/1291
Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
Tested-by: Luboš Luňák <l.lunak at suse.cz>
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 6641273..c5f7d4b 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -139,7 +139,7 @@ void Access::markChildAsModified(rtl::Reference< ChildAccess > const & child) {
}
}
-void Access::releaseChild(rtl::OUString const & name) {
+void Access::releaseChild(OUString const & name) {
cachedChildren_.erase(name);
}
@@ -210,22 +210,21 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId()
return css::uno::Sequence< sal_Int8 >();
}
-rtl::OUString Access::getImplementationName() throw (css::uno::RuntimeException)
+OUString Access::getImplementationName() throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- return rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("org.openoffice-configmgr::Access"));
+ return OUString("org.openoffice-configmgr::Access");
}
-sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
+sal_Bool Access::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- css::uno::Sequence< rtl::OUString > names(getSupportedServiceNames());
+ css::uno::Sequence< OUString > names(getSupportedServiceNames());
for (sal_Int32 i = 0; i < names.getLength(); ++i) {
if (names[i] == ServiceName) {
return true;
@@ -234,64 +233,42 @@ sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
return false;
}
-css::uno::Sequence< rtl::OUString > Access::getSupportedServiceNames()
+css::uno::Sequence< OUString > Access::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- comphelper::SequenceAsVector< rtl::OUString > services;
+ comphelper::SequenceAsVector< OUString > services;
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationAccess")));
+ OUString("com.sun.star.configuration.ConfigurationAccess"));
if (getRootAccess()->isUpdate()) {
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationUpdateAccess")));
+ OUString("com.sun.star.configuration.ConfigurationUpdateAccess"));
}
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.HierarchyAccess")));
+ OUString("com.sun.star.configuration.HierarchyAccess"));
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.HierarchyElement")));
+ OUString("com.sun.star.configuration.HierarchyElement"));
if (getNode()->kind() == Node::KIND_GROUP) {
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.GroupAccess")));
+ OUString("com.sun.star.configuration.GroupAccess"));
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.PropertyHierarchy")));
+ OUString("com.sun.star.configuration.PropertyHierarchy"));
if (getRootAccess()->isUpdate()) {
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.GroupUpdate")));
+ OUString("com.sun.star.configuration.GroupUpdate"));
}
} else {
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.SetAccess")));
+ OUString("com.sun.star.configuration.SetAccess"));
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.SimpleSetAccess")));
+ OUString("com.sun.star.configuration.SimpleSetAccess"));
if (getRootAccess()->isUpdate()) {
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.SetUpdate")));
+ OUString("com.sun.star.configuration.SetUpdate"));
services.push_back(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.SimpleSetUpdate")));
+ OUString("com.sun.star.configuration.SimpleSetUpdate"));
}
}
addSupportedServiceNames(&services);
@@ -306,9 +283,7 @@ void Access::dispose() throw (css::uno::RuntimeException) {
checkLocalizedPropertyAccess();
if (getParentAccess().is()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr dispose inappropriate Access")),
+ OUString("configmgr dispose inappropriate Access"),
static_cast< cppu::OWeakObject * >(this));
}
if (disposed_) {
@@ -331,7 +306,7 @@ void Access::addEventListener(
checkLocalizedPropertyAccess();
if (!xListener.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+ OUString("null listener"),
static_cast< cppu::OWeakObject * >(this));
}
if (!disposed_) {
@@ -377,7 +352,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) {
default:
assert(false);
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
+ OUString("this cannot happen"),
static_cast< cppu::OWeakObject * >(this));
}
}
@@ -389,7 +364,7 @@ sal_Bool Access::hasElements() throw (css::uno::RuntimeException) {
return !getAllChildren().empty(); //TODO: optimize
}
-css::uno::Any Access::getByName(rtl::OUString const & aName)
+css::uno::Any Access::getByName(OUString const & aName)
throw (
css::container::NoSuchElementException,
css::lang::WrappedTargetException, css::uno::RuntimeException)
@@ -405,14 +380,14 @@ css::uno::Any Access::getByName(rtl::OUString const & aName)
return child->asValue();
}
-css::uno::Sequence< rtl::OUString > Access::getElementNames()
+css::uno::Sequence< OUString > Access::getElementNames()
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
- comphelper::SequenceAsVector< rtl::OUString > names;
+ comphelper::SequenceAsVector< OUString > names;
for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
children.begin());
i != children.end(); ++i)
@@ -422,7 +397,7 @@ css::uno::Sequence< rtl::OUString > Access::getElementNames()
return names.getAsConstList();
}
-sal_Bool Access::hasByName(rtl::OUString const & aName)
+sal_Bool Access::hasByName(OUString const & aName)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
@@ -431,7 +406,7 @@ sal_Bool Access::hasByName(rtl::OUString const & aName)
return getChild(aName).is();
}
-css::uno::Any Access::getByHierarchicalName(rtl::OUString const & aName)
+css::uno::Any Access::getByHierarchicalName(OUString const & aName)
throw (css::container::NoSuchElementException, css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
@@ -445,7 +420,7 @@ css::uno::Any Access::getByHierarchicalName(rtl::OUString const & aName)
return child->asValue();
}
-sal_Bool Access::hasByHierarchicalName(rtl::OUString const & aName)
+sal_Bool Access::hasByHierarchicalName(OUString const & aName)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
@@ -455,7 +430,7 @@ sal_Bool Access::hasByHierarchicalName(rtl::OUString const & aName)
}
void Access::replaceByHierarchicalName(
- rtl::OUString const & aName, css::uno::Any const & aElement)
+ OUString const & aName, css::uno::Any const & aElement)
throw (
css::lang::IllegalArgumentException,
css::container::NoSuchElementException,
@@ -483,17 +458,13 @@ void Access::replaceByHierarchicalName(
break;
case Node::KIND_SET:
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr::Access::replaceByHierarchicalName does not"
- " currently support set members")),
+ OUString("configmgr::Access::replaceByHierarchicalName does not"
+ " currently support set members"),
static_cast< cppu::OWeakObject * >(this), 0);
case Node::KIND_ROOT:
throw css::lang::IllegalArgumentException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr::Access::replaceByHierarchicalName does not"
- " allow changing component "))
+ (OUString("configmgr::Access::replaceByHierarchicalName does not"
+ " allow changing component ")
+ aName),
static_cast< cppu::OWeakObject * >(this), 0);
default:
@@ -515,7 +486,7 @@ void Access::addContainerListener(
checkLocalizedPropertyAccess();
if (!xListener.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
static_cast< cppu::OWeakObject * >(this));
}
if (!disposed_) {
@@ -542,7 +513,7 @@ void Access::removeContainerListener(
}
}
-rtl::OUString Access::getExactName(rtl::OUString const & aApproximateName)
+OUString Access::getExactName(OUString const & aApproximateName)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
@@ -567,7 +538,7 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
return properties.getAsConstList();
}
-css::beans::Property Access::getPropertyByName(rtl::OUString const & aName)
+css::beans::Property Access::getPropertyByName(OUString const & aName)
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
assert(thisIs(IS_GROUP));
@@ -580,7 +551,7 @@ css::beans::Property Access::getPropertyByName(rtl::OUString const & aName)
return child->asProperty();
}
-sal_Bool Access::hasPropertyByName(rtl::OUString const & Name)
+sal_Bool Access::hasPropertyByName(OUString const & Name)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_GROUP));
@@ -588,18 +559,18 @@ sal_Bool Access::hasPropertyByName(rtl::OUString const & Name)
return getChild(Name).is();
}
-rtl::OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
+OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
// For backwards compatibility, return an absolute path representation where
// available:
- rtl::OUStringBuffer path;
+ OUStringBuffer path;
rtl::Reference< RootAccess > root(getRootAccess());
if (root.is()) {
path.append(root->getAbsolutePathRepresentation());
}
- rtl::OUString rel(getRelativePathRepresentation());
+ OUString rel(getRelativePathRepresentation());
if (path.getLength() != 0 && !rel.isEmpty()) {
path.append(sal_Unicode('/'));
}
@@ -607,8 +578,8 @@ rtl::OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
return path.makeStringAndClear();
}
-rtl::OUString Access::composeHierarchicalName(
- rtl::OUString const & aRelativeName)
+OUString Access::composeHierarchicalName(
+ OUString const & aRelativeName)
throw (
css::lang::IllegalArgumentException, css::lang::NoSupportException,
css::uno::RuntimeException)
@@ -618,13 +589,11 @@ rtl::OUString Access::composeHierarchicalName(
checkLocalizedPropertyAccess();
if (aRelativeName.isEmpty() || aRelativeName[0] == '/') {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr composeHierarchicalName inappropriate relative"
- " name")),
+ OUString("configmgr composeHierarchicalName inappropriate relative"
+ " name"),
static_cast< cppu::OWeakObject * >(this), -1);
}
- rtl::OUStringBuffer path(getRelativePathRepresentation());
+ OUStringBuffer path(getRelativePathRepresentation());
if (path.getLength() != 0) {
path.append(sal_Unicode('/'));
}
@@ -632,14 +601,14 @@ rtl::OUString Access::composeHierarchicalName(
return path.makeStringAndClear();
}
-rtl::OUString Access::getName() throw (css::uno::RuntimeException) {
+OUString Access::getName() throw (css::uno::RuntimeException) {
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
return getNameInternal();
}
-void Access::setName(rtl::OUString const & aName)
+void Access::setName(OUString const & aName)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
@@ -693,9 +662,7 @@ void Access::setName(rtl::OUString const & aName)
// renaming a property could only work for an extension property,
// but a localized property is never an extension property
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setName inappropriate node")),
+ OUString("configmgr setName inappropriate node"),
static_cast< cppu::OWeakObject * >(this));
default:
assert(false); // this cannot happen
@@ -722,7 +689,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
}
void Access::setPropertyValue(
- rtl::OUString const & aPropertyName, css::uno::Any const & aValue)
+ OUString const & aPropertyName, css::uno::Any const & aValue)
throw (
css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
@@ -734,9 +701,7 @@ void Access::setPropertyValue(
osl::MutexGuard g(*lock_);
if (!getRootAccess()->isUpdate()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setPropertyValue on non-update access")),
+ OUString("configmgr setPropertyValue on non-update access"),
static_cast< cppu::OWeakObject * >(this));
}
Modifications localMods;
@@ -749,7 +714,7 @@ void Access::setPropertyValue(
bc.send();
}
-css::uno::Any Access::getPropertyValue(rtl::OUString const & PropertyName)
+css::uno::Any Access::getPropertyValue(OUString const & PropertyName)
throw (
css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
@@ -765,7 +730,7 @@ css::uno::Any Access::getPropertyValue(rtl::OUString const & PropertyName)
}
void Access::addPropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
xListener)
throw (
@@ -777,7 +742,7 @@ void Access::addPropertyChangeListener(
osl::MutexGuard g(*lock_);
if (!xListener.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+ OUString("null listener"),
static_cast< cppu::OWeakObject * >(this));
}
checkKnownProperty(aPropertyName);
@@ -793,7 +758,7 @@ void Access::addPropertyChangeListener(
}
void Access::removePropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
aListener)
throw (
@@ -817,7 +782,7 @@ void Access::removePropertyChangeListener(
}
void Access::addVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
throw (
@@ -829,7 +794,7 @@ void Access::addVetoableChangeListener(
osl::MutexGuard g(*lock_);
if (!aListener.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+ OUString("null listener"),
static_cast< cppu::OWeakObject * >(this));
}
checkKnownProperty(PropertyName);
@@ -846,7 +811,7 @@ void Access::addVetoableChangeListener(
}
void Access::removeVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
throw (
@@ -870,7 +835,7 @@ void Access::removeVetoableChangeListener(
}
void Access::setPropertyValues(
- css::uno::Sequence< rtl::OUString > const & aPropertyNames,
+ css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Sequence< css::uno::Any > const & aValues)
throw (
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
@@ -882,27 +847,21 @@ void Access::setPropertyValues(
osl::MutexGuard g(*lock_);
if (!getRootAccess()->isUpdate()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setPropertyValues on non-update access")),
+ OUString("configmgr setPropertyValues on non-update access"),
static_cast< cppu::OWeakObject * >(this));
}
if (aPropertyNames.getLength() != aValues.getLength()) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setPropertyValues: aPropertyNames/aValues of"
- " different length")),
+ OUString("configmgr setPropertyValues: aPropertyNames/aValues of"
+ " different length"),
static_cast< cppu::OWeakObject * >(this), -1);
}
Modifications localMods;
for (sal_Int32 i = 0; i < aPropertyNames.getLength(); ++i) {
if (!setChildProperty(aPropertyNames[i], aValues[i], &localMods)) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setPropertyValues inappropriate property"
- " name")),
+ OUString("configmgr setPropertyValues inappropriate property"
+ " name"),
static_cast< cppu::OWeakObject * >(this), -1);
}
}
@@ -912,7 +871,7 @@ void Access::setPropertyValues(
}
css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
- css::uno::Sequence< rtl::OUString > const & aPropertyNames)
+ css::uno::Sequence< OUString > const & aPropertyNames)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_GROUP));
@@ -922,10 +881,8 @@ css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
rtl::Reference< ChildAccess > child(getChild(aPropertyNames[i]));
if (!child.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr getPropertyValues inappropriate property"
- " name")),
+ OUString("configmgr getPropertyValues inappropriate property"
+ " name"),
static_cast< cppu::OWeakObject * >(this));
}
vals[i] = child->asValue();
@@ -934,7 +891,7 @@ css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
}
void Access::addPropertiesChangeListener(
- css::uno::Sequence< rtl::OUString > const &,
+ css::uno::Sequence< OUString > const &,
css::uno::Reference< css::beans::XPropertiesChangeListener > const &
xListener)
throw (css::uno::RuntimeException)
@@ -944,7 +901,7 @@ void Access::addPropertiesChangeListener(
osl::MutexGuard g(*lock_);
if (!xListener.is()) {
throw css::uno::RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
+ OUString("null listener"),
static_cast< cppu::OWeakObject * >(this));
}
if (!disposed_) {
@@ -973,7 +930,7 @@ void Access::removePropertiesChangeListener(
}
void Access::firePropertiesChangeEvent(
- css::uno::Sequence< rtl::OUString > const & aPropertyNames,
+ css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Reference< css::beans::XPropertiesChangeListener > const &
xListener)
throw (css::uno::RuntimeException)
@@ -997,7 +954,7 @@ Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException) {
}
void Access::setHierarchicalPropertyValue(
- rtl::OUString const & aHierarchicalPropertyName,
+ OUString const & aHierarchicalPropertyName,
css::uno::Any const & aValue)
throw (
css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
@@ -1010,10 +967,8 @@ void Access::setHierarchicalPropertyValue(
osl::MutexGuard g(*lock_);
if (!getRootAccess()->isUpdate()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setHierarchicalPropertyName on non-update"
- " access")),
+ OUString("configmgr setHierarchicalPropertyName on non-update"
+ " access"),
static_cast< cppu::OWeakObject * >(this));
}
rtl::Reference< ChildAccess > child(
@@ -1032,7 +987,7 @@ void Access::setHierarchicalPropertyValue(
}
css::uno::Any Access::getHierarchicalPropertyValue(
- rtl::OUString const & aHierarchicalPropertyName)
+ OUString const & aHierarchicalPropertyName)
throw (
css::beans::UnknownPropertyException,
css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
@@ -1050,7 +1005,7 @@ css::uno::Any Access::getHierarchicalPropertyValue(
}
void Access::setHierarchicalPropertyValues(
- css::uno::Sequence< rtl::OUString > const & aHierarchicalPropertyNames,
+ css::uno::Sequence< OUString > const & aHierarchicalPropertyNames,
css::uno::Sequence< css::uno::Any > const & Values)
throw (
css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
@@ -1062,18 +1017,14 @@ void Access::setHierarchicalPropertyValues(
osl::MutexGuard g(*lock_);
if (!getRootAccess()->isUpdate()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setPropertyValues on non-update access")),
+ OUString("configmgr setPropertyValues on non-update access"),
static_cast< cppu::OWeakObject * >(this));
}
if (aHierarchicalPropertyNames.getLength() != Values.getLength()) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setHierarchicalPropertyValues:"
+ OUString("configmgr setHierarchicalPropertyValues:"
" aHierarchicalPropertyNames/Values of different"
- " length")),
+ " length"),
static_cast< cppu::OWeakObject * >(this), -1);
}
Modifications localMods;
@@ -1082,10 +1033,8 @@ void Access::setHierarchicalPropertyValues(
getSubChild(aHierarchicalPropertyNames[i]));
if (!child.is()) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr setHierarchicalPropertyValues"
- " inappropriate property name")),
+ OUString("configmgr setHierarchicalPropertyValues"
+ " inappropriate property name"),
static_cast< cppu::OWeakObject * >(this), -1);
}
child->checkFinalized();
@@ -1097,7 +1046,7 @@ void Access::setHierarchicalPropertyValues(
}
css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
- css::uno::Sequence< rtl::OUString > const & aHierarchicalPropertyNames)
+ css::uno::Sequence< OUString > const & aHierarchicalPropertyNames)
throw (
css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
css::uno::RuntimeException)
@@ -1111,10 +1060,8 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
getSubChild(aHierarchicalPropertyNames[i]));
if (!child.is()) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr getHierarchicalPropertyValues inappropriate"
- " hierarchical property name")),
+ OUString("configmgr getHierarchicalPropertyValues inappropriate"
+ " hierarchical property name"),
static_cast< cppu::OWeakObject * >(this), -1);
}
vals[i] = child->asValue();
@@ -1123,7 +1070,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
}
css::beans::Property Access::getPropertyByHierarchicalName(
- rtl::OUString const & aHierarchicalName)
+ OUString const & aHierarchicalName)
throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
assert(thisIs(IS_GROUP));
@@ -1137,7 +1084,7 @@ css::beans::Property Access::getPropertyByHierarchicalName(
}
sal_Bool Access::hasPropertyByHierarchicalName(
- rtl::OUString const & aHierarchicalName)
+ OUString const & aHierarchicalName)
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_GROUP));
@@ -1146,7 +1093,7 @@ sal_Bool Access::hasPropertyByHierarchicalName(
}
void Access::replaceByName(
- rtl::OUString const & aName, css::uno::Any const & aElement)
+ OUString const & aName, css::uno::Any const & aElement)
throw (
css::lang::IllegalArgumentException,
css::container::NoSuchElementException,
@@ -1190,7 +1137,7 @@ void Access::replaceByName(
}
void Access::insertByName(
- rtl::OUString const & aName, css::uno::Any const & aElement)
+ OUString const & aName, css::uno::Any const & aElement)
throw (
css::lang::IllegalArgumentException,
css::container::ElementExistException,
@@ -1241,7 +1188,7 @@ void Access::insertByName(
bc.send();
}
-void Access::removeByName(rtl::OUString const & aName)
+void Access::removeByName(OUString const & aName)
throw (
css::container::NoSuchElementException,
css::lang::WrappedTargetException, css::uno::RuntimeException)
@@ -1282,13 +1229,13 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance()
throw (css::uno::Exception, css::uno::RuntimeException)
{
assert(thisIs(IS_SET|IS_UPDATE));
- rtl::OUString tmplName(
+ OUString tmplName(
dynamic_cast< SetNode * >(getNode().get())->getDefaultTemplateName());
rtl::Reference< Node > tmpl(
components_.getTemplate(Data::NO_LAYER, tmplName));
if (!tmpl.is()) {
throw css::uno::Exception(
- (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown template ")) +
+ (OUString("unknown template ") +
tmplName),
static_cast< cppu::OWeakObject * >(this));
}
@@ -1305,10 +1252,8 @@ css::uno::Reference< css::uno::XInterface > Access::createInstanceWithArguments(
assert(thisIs(IS_SET|IS_UPDATE));
if (aArguments.getLength() != 0) {
throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configuration SimpleSetUpdate createInstanceWithArguments"
- " must not specify any arguments")),
+ OUString("configuration SimpleSetUpdate createInstanceWithArguments"
+ " must not specify any arguments"),
static_cast< cppu::OWeakObject * >(this));
}
return createInstance();
@@ -1465,9 +1410,7 @@ void Access::checkLocalizedPropertyAccess() {
!Components::allLocales(getRootAccess()->getLocale()))
{
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr Access to specialized LocalizedPropertyNode")),
+ OUString("configmgr Access to specialized LocalizedPropertyNode"),
static_cast< cppu::OWeakObject * >(this));
}
}
@@ -1477,7 +1420,7 @@ rtl::Reference< Node > Access::getParentNode() {
return parent.is() ? parent->getNode() : rtl::Reference< Node >();
}
-rtl::Reference< ChildAccess > Access::getChild(rtl::OUString const & name) {
+rtl::Reference< ChildAccess > Access::getChild(OUString const & name) {
if (getNode()->kind() == Node::KIND_LOCALIZED_PROPERTY && name.match("*")) {
OUString locale(name.copy(1));
if (locale.match("*")) {
@@ -1609,15 +1552,13 @@ void Access::checkValue(css::uno::Any const & value, Type type, bool nillable) {
}
if (!ok) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr inappropriate property value")),
+ OUString("configmgr inappropriate property value"),
static_cast< cppu::OWeakObject * >(this), -1);
}
}
void Access::insertLocalizedValueChild(
- rtl::OUString const & name, css::uno::Any const & value,
+ OUString const & name, css::uno::Any const & value,
Modifications * localModifications)
{
assert(localModifications != 0);
@@ -1755,7 +1696,7 @@ void Access::initBroadcasterAndChanges(
css::uno::Any()));
}
}
- j = propertyChangeListeners_.find(rtl::OUString());
+ j = propertyChangeListeners_.find(OUString());
if (j != propertyChangeListeners_.end()) {
for (PropertyChangeListenersElement::iterator k(
j->second.begin());
@@ -1843,7 +1784,7 @@ void Access::initBroadcasterAndChanges(
css::uno::Any()));
}
}
- j = propertyChangeListeners_.find(rtl::OUString());
+ j = propertyChangeListeners_.find(OUString());
if (j != propertyChangeListeners_.end()) {
for (PropertyChangeListenersElement::iterator k(
j->second.begin());
@@ -1931,13 +1872,13 @@ void Access::initBroadcasterAndChanges(
//TODO: non-void ReplacedElement
}
if (allChanges != 0) {
- rtl::OUStringBuffer path(getRelativePathRepresentation());
+ OUStringBuffer path(getRelativePathRepresentation());
if (path.getLength() != 0) {
path.append(sal_Unicode('/'));
}
path.append(
Data::createSegment(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")),
+ OUString("*"),
i->first));
allChanges->push_back(
css::util::ElementChange(
@@ -1977,7 +1918,7 @@ void Access::initBroadcasterAndChanges(
css::uno::Any()));
}
}
- j = propertyChangeListeners_.find(rtl::OUString());
+ j = propertyChangeListeners_.find(OUString());
if (j != propertyChangeListeners_.end()) {
for (PropertyChangeListenersElement::iterator k(
j->second.begin());
@@ -1992,7 +1933,7 @@ void Access::initBroadcasterAndChanges(
}
}
if (allChanges != 0) {
- rtl::OUStringBuffer path(
+ OUStringBuffer path(
getRelativePathRepresentation());
if (path.getLength() != 0) {
path.append(sal_Unicode('/'));
@@ -2029,14 +1970,14 @@ void Access::initBroadcasterAndChanges(
//TODO: non-void ReplacedElement
}
if (allChanges != 0) {
- rtl::OUStringBuffer path(
+ OUStringBuffer path(
getRelativePathRepresentation());
if (path.getLength() != 0) {
path.append(sal_Unicode('/'));
}
path.append(
Data::createSegment(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")),
+ OUString("*"),
i->first));
allChanges->push_back(
css::util::ElementChange(
@@ -2086,7 +2027,7 @@ rtl::Reference< ChildAccess > Access::getModifiedChild(
}
rtl::Reference< ChildAccess > Access::getUnmodifiedChild(
- rtl::OUString const & name)
+ OUString const & name)
{
assert(modifiedChildren_.find(name) == modifiedChildren_.end());
rtl::Reference< Node > node(getNode()->getMember(name));
@@ -2111,7 +2052,7 @@ rtl::Reference< ChildAccess > Access::getUnmodifiedChild(
return child;
}
-rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
+rtl::Reference< ChildAccess > Access::getSubChild(OUString const & path) {
sal_Int32 i = 0;
// For backwards compatibility, allow absolute paths where meaningful:
if (!path.isEmpty() && path[0] == '/') {
@@ -2121,17 +2062,17 @@ rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
}
Path abs(getAbsolutePath());
for (Path::iterator j(abs.begin()); j != abs.end(); ++j) {
- rtl::OUString name1;
+ OUString name1;
bool setElement1;
- rtl::OUString templateName1;
+ OUString templateName1;
i = Data::parseSegment(
path, i, &name1, &setElement1, &templateName1);
if (i == -1 || (i != path.getLength() && path[i] != '/')) {
return rtl::Reference< ChildAccess >();
}
- rtl::OUString name2;
+ OUString name2;
bool setElement2;
- rtl::OUString templateName2;
+ OUString templateName2;
Data::parseSegment(*j, 0, &name2, &setElement2, &templateName2);
if (name1 != name2 || setElement1 != setElement2 ||
(setElement1 &&
@@ -2145,9 +2086,9 @@ rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
}
}
for (rtl::Reference< Access > parent(this);;) {
- rtl::OUString name;
+ OUString name;
bool setElement;
- rtl::OUString templateName;
+ OUString templateName;
i = Data::parseSegment(path, i, &name, &setElement, &templateName);
if (i == -1 || (i != path.getLength() && path[i] != '/')) {
return rtl::Reference< ChildAccess >();
@@ -2192,7 +2133,7 @@ rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
}
bool Access::setChildProperty(
- rtl::OUString const & name, css::uno::Any const & value,
+ OUString const & name, css::uno::Any const & value,
Modifications * localModifications)
{
assert(localModifications != 0);
@@ -2263,14 +2204,12 @@ css::beans::Property Access::asProperty() {
void Access::checkFinalized() {
if (isFinalized()) {
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr modification of finalized item")),
+ OUString("configmgr modification of finalized item"),
static_cast< cppu::OWeakObject * >(this), -1);
}
}
-void Access::checkKnownProperty(rtl::OUString const & descriptor) {
+void Access::checkKnownProperty(OUString const & descriptor) {
if (descriptor.isEmpty()) {
return;
}
@@ -2313,9 +2252,7 @@ rtl::Reference< ChildAccess > Access::getFreeSetMember(
freeAcc->getRootAccess() != getRootAccess()))
{
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr inappropriate set element")),
+ OUString("configmgr inappropriate set element"),
static_cast< cppu::OWeakObject * >(this), 1);
}
assert(dynamic_cast< SetNode * >(getNode().get()) != 0);
@@ -2323,9 +2260,7 @@ rtl::Reference< ChildAccess > Access::getFreeSetMember(
freeAcc->getNode()->getTemplateName()))
{
throw css::lang::IllegalArgumentException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr inappropriate set element")),
+ OUString("configmgr inappropriate set element"),
static_cast< cppu::OWeakObject * >(this), 1);
}
return freeAcc;
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 1e91fed..6703568 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -82,7 +82,6 @@ namespace com { namespace sun { namespace star {
}
namespace util { struct ElementChange; }
} } }
-namespace rtl { class OUString; }
namespace configmgr {
@@ -120,12 +119,12 @@ public:
bool isValue();
void markChildAsModified(rtl::Reference< ChildAccess > const & child);
- void releaseChild(rtl::OUString const & name);
+ void releaseChild(OUString const & name);
virtual Path getAbsolutePath() = 0;
virtual Path getRelativePath() = 0;
- virtual rtl::OUString getRelativePathRepresentation() = 0;
+ virtual OUString getRelativePathRepresentation() = 0;
virtual rtl::Reference< Node > getNode() = 0;
virtual bool isFinalized() = 0;
@@ -142,13 +141,13 @@ public:
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL dispose()
@@ -171,29 +170,29 @@ public:
throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Any SAL_CALL getByName(
- rtl::OUString const & aName)
+ OUString const & aName)
throw (
com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getElementNames() throw (com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName(rtl::OUString const & aName)
+ virtual sal_Bool SAL_CALL hasByName(OUString const & aName)
throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Any SAL_CALL getByHierarchicalName(
- rtl::OUString const & aName)
+ OUString const & aName)
throw (
com::sun::star::container::NoSuchElementException,
com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
+ virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL replaceByHierarchicalName(
- rtl::OUString const & aName, com::sun::star::uno::Any const & aElement)
+ OUString const & aName, com::sun::star::uno::Any const & aElement)
throw (
com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::NoSuchElementException,
@@ -210,36 +209,36 @@ public:
com::sun::star::container::XContainerListener > const & xListener)
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getExactName(
- rtl::OUString const & aApproximateName)
+ virtual OUString SAL_CALL getExactName(
+ OUString const & aApproximateName)
throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::beans::Property SAL_CALL getPropertyByName(
- rtl::OUString const & aName)
+ OUString const & aName)
throw (
com::sun::star::beans::UnknownPropertyException,
com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name)
+ virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name)
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getHierarchicalName()
+ virtual OUString SAL_CALL getHierarchicalName()
throw (com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL composeHierarchicalName(
- rtl::OUString const & aRelativeName)
+ virtual OUString SAL_CALL composeHierarchicalName(
+ OUString const & aRelativeName)
throw (
com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::NoSupportException,
com::sun::star::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName(rtl::OUString const & aName)
+ virtual void SAL_CALL setName(OUString const & aName)
throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::beans::Property SAL_CALL getAsProperty()
@@ -250,7 +249,7 @@ public:
SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
com::sun::star::uno::Any const & aValue)
throw (
com::sun::star::beans::UnknownPropertyException,
@@ -260,14 +259,14 @@ public:
com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(
- rtl::OUString const & PropertyName)
+ OUString const & PropertyName)
throw (
com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertyChangeListener > const & xListener)
throw (
@@ -276,7 +275,7 @@ public:
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener(
- rtl::OUString const & aPropertyName,
+ OUString const & aPropertyName,
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertyChangeListener > const & aListener)
throw (
@@ -285,7 +284,7 @@ public:
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
com::sun::star::uno::Reference<
com::sun::star::beans::XVetoableChangeListener > const & aListener)
throw (
@@ -294,7 +293,7 @@ public:
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener(
- rtl::OUString const & PropertyName,
+ OUString const & PropertyName,
com::sun::star::uno::Reference<
com::sun::star::beans::XVetoableChangeListener > const & aListener)
throw (
@@ -303,7 +302,7 @@ public:
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValues(
- com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames,
+ com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
aValues)
throw (
@@ -314,11 +313,11 @@ public:
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL
getPropertyValues(
- com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames)
+ com::sun::star::uno::Sequence< OUString > const & aPropertyNames)
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertiesChangeListener(
- com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames,
+ com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertiesChangeListener > const &
xListener)
@@ -331,7 +330,7 @@ public:
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL firePropertiesChangeEvent(
- com::sun::star::uno::Sequence< rtl::OUString > const & aPropertyNames,
+ com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertiesChangeListener > const &
xListener)
@@ -344,7 +343,7 @@ public:
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setHierarchicalPropertyValue(
- rtl::OUString const & aHierarchicalPropertyName,
+ OUString const & aHierarchicalPropertyName,
com::sun::star::uno::Any const & aValue)
throw (
com::sun::star::beans::UnknownPropertyException,
@@ -354,7 +353,7 @@ public:
com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Any SAL_CALL getHierarchicalPropertyValue(
- rtl::OUString const & aHierarchicalPropertyName)
+ OUString const & aHierarchicalPropertyName)
throw (
com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::IllegalArgumentException,
@@ -362,7 +361,7 @@ public:
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setHierarchicalPropertyValues(
- com::sun::star::uno::Sequence< rtl::OUString > const &
+ com::sun::star::uno::Sequence< OUString > const &
aHierarchicalPropertyNames,
com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
Values)
@@ -374,7 +373,7 @@ public:
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL
getHierarchicalPropertyValues(
- com::sun::star::uno::Sequence< rtl::OUString > const &
+ com::sun::star::uno::Sequence< OUString > const &
aHierarchicalPropertyNames)
throw (
com::sun::star::lang::IllegalArgumentException,
@@ -382,17 +381,17 @@ public:
com::sun::star::uno::RuntimeException);
virtual com::sun::star::beans::Property SAL_CALL
- getPropertyByHierarchicalName(rtl::OUString const & aHierarchicalName)
+ getPropertyByHierarchicalName(OUString const & aHierarchicalName)
throw (
com::sun::star::beans::UnknownPropertyException,
com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName(
- rtl::OUString const & aHierarchicalName)
+ OUString const & aHierarchicalName)
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL replaceByName(
- rtl::OUString const & aName, com::sun::star::uno::Any const & aElement)
+ OUString const & aName, com::sun::star::uno::Any const & aElement)
throw (
com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::NoSuchElementException,
@@ -400,14 +399,14 @@ public:
com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertByName(
- rtl::OUString const & aName, com::sun::star::uno::Any const & aElement)
+ OUString const & aName, com::sun::star::uno::Any const & aElement)
throw (
com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::ElementExistException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByName(rtl::OUString const & aName)
+ virtual void SAL_CALL removeByName(OUString const & aName)
throw (
com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
@@ -432,7 +431,7 @@ protected:
virtual ~Access();
- virtual rtl::OUString getNameInternal() = 0;
+ virtual OUString getNameInternal() = 0;
virtual rtl::Reference< RootAccess > getRootAccess() = 0;
virtual rtl::Reference< Access > getParentAccess() = 0;
@@ -440,7 +439,7 @@ protected:
const = 0;
virtual void addSupportedServiceNames(
- std::vector< rtl::OUString > * services) = 0;
+ std::vector< OUString > * services) = 0;
virtual void initDisposeBroadcaster(Broadcaster * broadcaster);
virtual void clearListeners() throw ();
@@ -454,14 +453,14 @@ protected:
void checkLocalizedPropertyAccess();
rtl::Reference< Node > getParentNode();
- rtl::Reference< ChildAccess > getChild(rtl::OUString const & name);
+ rtl::Reference< ChildAccess > getChild(OUString const & name);
std::vector< rtl::Reference< ChildAccess > > getAllChildren();
void checkValue(
com::sun::star::uno::Any const & value, Type type, bool nillable);
void insertLocalizedValueChild(
- rtl::OUString const & name, com::sun::star::uno::Any const & value,
+ OUString const & name, com::sun::star::uno::Any const & value,
Modifications * localModifications);
void reportChildChanges(
@@ -487,32 +486,32 @@ private:
bool theDirectlyModified);
};
- typedef std::map< rtl::OUString, ModifiedChild > ModifiedChildren;
+ typedef std::map< OUString, ModifiedChild > ModifiedChildren;
rtl::Reference< ChildAccess > getModifiedChild(
ModifiedChildren::iterator const & childIterator);
rtl::Reference< ChildAccess > getUnmodifiedChild(
- rtl::OUString const & name);
+ OUString const & name);
- rtl::Reference< ChildAccess > getSubChild(rtl::OUString const & path);
+ rtl::Reference< ChildAccess > getSubChild(OUString const & path);
bool setChildProperty(
- rtl::OUString const & name, com::sun::star::uno::Any const & value,
+ OUString const & name, com::sun::star::uno::Any const & value,
Modifications * localModifications);
com::sun::star::beans::Property asProperty();
void checkFinalized();
- void checkKnownProperty(rtl::OUString const & descriptor);
+ void checkKnownProperty(OUString const & descriptor);
rtl::Reference< ChildAccess > getFreeSetMember(
com::sun::star::uno::Any const & value);
rtl::Reference< Access > getNotificationRoot();
- typedef std::map< rtl::OUString, ChildAccess * > WeakChildMap;
+ typedef std::map< OUString, ChildAccess * > WeakChildMap;
typedef
std::multiset<
@@ -532,7 +531,7 @@ private:
com::sun::star::beans::XPropertyChangeListener > >
PropertyChangeListenersElement;
- typedef std::map< rtl::OUString, PropertyChangeListenersElement >
+ typedef std::map< OUString, PropertyChangeListenersElement >
PropertyChangeListeners;
typedef
@@ -541,7 +540,7 @@ private:
com::sun::star::beans::XVetoableChangeListener > >
VetoableChangeListenersElement;
- typedef std::map< rtl::OUString, VetoableChangeListenersElement >
+ typedef std::map< OUString, VetoableChangeListenersElement >
VetoableChangeListeners;
typedef
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index d7592c6..6a6a503 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -45,9 +45,9 @@ namespace configmgr {
namespace {
void appendMessage(
- rtl::OUStringBuffer & buffer, css::uno::Exception const & exception)
+ OUStringBuffer & buffer, css::uno::Exception const & exception)
{
- buffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("; "));
+ buffer.appendAscii("; ");
buffer.append(exception.Message);
}
@@ -110,7 +110,7 @@ void Broadcaster::addChangesNotification(
void Broadcaster::send() {
css::uno::Any exception;
- rtl::OUStringBuffer messages;
+ OUStringBuffer messages;
for (DisposeNotifications::iterator i(disposeNotifications_.begin());
i != disposeNotifications_.end(); ++i) {
try {
@@ -193,9 +193,7 @@ void Broadcaster::send() {
}
if (exception.hasValue()) {
throw css::lang::WrappedTargetRuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "configmgr exceptions during listener notification")) +
+ (OUString("configmgr exceptions during listener notification") +
messages.makeStringAndClear()),
css::uno::Reference< css::uno::XInterface >(),
exception);
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 6b2cd41..587f59b 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -73,7 +73,7 @@ css::uno::Sequence< sal_Int8 > ChildAccess::getTunnelId()
ChildAccess::ChildAccess(
Components & components, rtl::Reference< RootAccess > const & root,
- rtl::Reference< Access > const & parent, rtl::OUString const & name,
+ rtl::Reference< Access > const & parent, OUString const & name,
rtl::Reference< Node > const & node):
Access(components), root_(root), parent_(parent), name_(name), node_(node),
inTransaction_(false)
@@ -108,8 +108,8 @@ Path ChildAccess::getRelativePath() {
return path;
}
-rtl::OUString ChildAccess::getRelativePathRepresentation() {
- rtl::OUStringBuffer path;
+OUString ChildAccess::getRelativePathRepresentation() {
+ OUStringBuffer path;
rtl::Reference< Access > parent(getParentAccess());
if (parent.is()) {
path.append(parent->getRelativePathRepresentation());
@@ -130,7 +130,7 @@ bool ChildAccess::isFinalized() {
(parent_.is() && parent_->isFinalized());
}
-rtl::OUString ChildAccess::getNameInternal() {
+OUString ChildAccess::getNameInternal() {
return name_;
}
@@ -166,7 +166,7 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
throw css::lang::NoSupportException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setParent")),
+ OUString("setParent"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -183,7 +183,7 @@ sal_Int64 ChildAccess::getSomething(
void ChildAccess::bind(
rtl::Reference< RootAccess > const & root,
- rtl::Reference< Access > const & parent, rtl::OUString const & name)
+ rtl::Reference< Access > const & parent, OUString const & name)
throw ()
{
assert(!parent_.is() && root.is() && parent.is() && !name.isEmpty());
@@ -223,7 +223,7 @@ void ChildAccess::setProperty(
break;
case Node::KIND_LOCALIZED_PROPERTY:
{
- rtl::OUString locale(getRootAccess()->getLocale());
+ OUString locale(getRootAccess()->getLocale());
if (!Components::allLocales(locale)) {
rtl::Reference< ChildAccess > child(getChild(locale));
if (child.is()) {
@@ -321,17 +321,13 @@ void ChildAccess::addTypes(std::vector< css::uno::Type > * types) const {
}
void ChildAccess::addSupportedServiceNames(
- std::vector< rtl::OUString > * services)
+ std::vector< OUString > * services)
{
assert(services != 0);
services->push_back(
getParentNode()->kind() == Node::KIND_GROUP
- ? rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.GroupElement"))
- : rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.SetElement")));
+ ? OUString("com.sun.star.configuration.GroupElement")
+ : OUString("com.sun.star.configuration.SetElement"));
}
css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType)
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index b453a6a..ef1444a 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -60,7 +60,7 @@ public:
ChildAccess(
Components & components, rtl::Reference< RootAccess > const & root,
- rtl::Reference< Access > const & parent, rtl::OUString const & name,
+ rtl::Reference< Access > const & parent, OUString const & name,
rtl::Reference< Node > const & node);
ChildAccess(
@@ -70,12 +70,12 @@ public:
virtual Path getAbsolutePath();
virtual Path getRelativePath();
- virtual rtl::OUString getRelativePathRepresentation();
+ virtual OUString getRelativePathRepresentation();
virtual rtl::Reference< Node > getNode();
virtual bool isFinalized();
- virtual rtl::OUString getNameInternal();
+ virtual OUString getNameInternal();
virtual rtl::Reference< RootAccess > getRootAccess();
virtual rtl::Reference< Access > getParentAccess();
@@ -100,7 +100,7 @@ public:
void bind(
rtl::Reference< RootAccess > const & root,
- rtl::Reference< Access > const & parent, rtl::OUString const & name)
+ rtl::Reference< Access > const & parent, OUString const & name)
throw ();
void unbind() throw ();
@@ -124,15 +124,15 @@ private:
std::vector< com::sun::star::uno::Type > * types) const;
virtual void addSupportedServiceNames(
- std::vector< rtl::OUString > * services);
+ std::vector< OUString > * services);
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & aType)
throw (com::sun::star::uno::RuntimeException);
rtl::Reference< RootAccess > root_;
- rtl::Reference< Access > parent_; // null iff free node
- rtl::OUString name_;
+ rtl::Reference< Access > parent_; // null if free node
+ OUString name_;
rtl::Reference< Node > node_;
std::auto_ptr< com::sun::star::uno::Any > changedValue_;
bool inTransaction_;
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 779a030..fa1302a 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -71,11 +71,11 @@ namespace configmgr {
namespace {
struct UnresolvedListItem {
- rtl::OUString name;
+ OUString name;
rtl::Reference< ParseManager > manager;
UnresolvedListItem(
- rtl::OUString const & theName,
+ OUString const & theName,
rtl::Reference< ParseManager > theManager):
name(theName), manager(theManager) {}
};
@@ -83,7 +83,7 @@ struct UnresolvedListItem {
typedef std::list< UnresolvedListItem > UnresolvedList;
void parseXcsFile(
- rtl::OUString const & url, int layer, Data & data, Partial const * partial,
+ OUString const & url, int layer, Data & data, Partial const * partial,
Modifications * modifications, Additions * additions)
SAL_THROW((
css::container::NoSuchElementException, css::uno::RuntimeException))
@@ -97,7 +97,7 @@ void parseXcsFile(
}
void parseXcuFile(
- rtl::OUString const & url, int layer, Data & data, Partial const * partial,
+ OUString const & url, int layer, Data & data, Partial const * partial,
Modifications * modifications, Additions * additions)
SAL_THROW((
css::container::NoSuchElementException, css::uno::RuntimeException))
@@ -111,8 +111,8 @@ void parseXcuFile(
(void) ok; // avoid warnings
}
-rtl::OUString expand(rtl::OUString const & str) {
- rtl::OUString s(str);
+OUString expand(OUString const & str) {
+ OUString s(str);
rtl::Bootstrap::expandMacros(s); //TODO: detect failure
return s;
}
@@ -146,7 +146,7 @@ class Components::WriteThread: public salhelper::Thread {
public:
WriteThread(
rtl::Reference< WriteThread > * reference, Components & components,
- rtl::OUString const & url, Data const & data);
+ OUString const & url, Data const & data);
void flush() { delay_.set(); }
@@ -157,7 +157,7 @@ private:
rtl::Reference< WriteThread > * reference_;
Components & components_;
- rtl::OUString url_;
+ OUString url_;
Data const & data_;
osl::Condition delay_;
boost::shared_ptr<osl::Mutex> lock_;
@@ -165,7 +165,7 @@ private:
Components::WriteThread::WriteThread(
rtl::Reference< WriteThread > * reference, Components & components,
- rtl::OUString const & url, Data const & data):
+ OUString const & url, Data const & data):
Thread("configmgrWriter"), reference_(reference), components_(components),
url_(url), data_(data)
{
@@ -208,13 +208,13 @@ Components & Components::getSingleton(
return theComponentsSingleton::get(context);
}
-bool Components::allLocales(rtl::OUString const & locale) {
+bool Components::allLocales(OUString const & locale) {
return locale == "*";
}
rtl::Reference< Node > Components::resolvePathRepresentation(
- rtl::OUString const & pathRepresentation,
- rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
+ OUString const & pathRepresentation,
+ OUString * canonicRepresentation, Path * path, int * finalizedLayer)
const
{
return data_.resolvePathRepresentation(
@@ -222,7 +222,7 @@ rtl::Reference< Node > Components::resolvePathRepresentation(
}
rtl::Reference< Node > Components::getTemplate(
- int layer, rtl::OUString const & fullName) const
+ int layer, OUString const & fullName) const
{
return data_.getTemplate(layer, fullName);
}
@@ -305,23 +305,21 @@ void Components::flushModifications() {
}
void Components::insertExtensionXcsFile(
- bool shared, rtl::OUString const & fileUri)
+ bool shared, OUString const & fileUri)
{
int layer = getExtensionLayer(shared);
try {
parseXcsFile(fileUri, layer, data_, 0, 0, 0);
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "insertExtensionXcsFile does not exist: ")) +
+ (OUString("insertExtensionXcsFile does not exist: ") +
e.Message),
css::uno::Reference< css::uno::XInterface >());
}
}
void Components::insertExtensionXcuFile(
- bool shared, rtl::OUString const & fileUri, Modifications * modifications)
+ bool shared, OUString const & fileUri, Modifications * modifications)
{
assert(modifications != 0);
int layer = getExtensionLayer(shared) + 1;
@@ -331,16 +329,14 @@ void Components::insertExtensionXcuFile(
} catch (css::container::NoSuchElementException & e) {
data_.removeExtensionXcuAdditions(fileUri);
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "insertExtensionXcuFile does not exist: ")) +
+ (OUString("insertExtensionXcuFile does not exist: ") +
e.Message),
css::uno::Reference< css::uno::XInterface >());
}
}
void Components::removeExtensionXcuFile(
- rtl::OUString const & fileUri, Modifications * modifications)
+ OUString const & fileUri, Modifications * modifications)
{
//TODO: Ideally, exactly the data coming from the specified xcu file would
// be removed. However, not enough information is recorded in the in-memory
@@ -392,9 +388,9 @@ void Components::removeExtensionXcuFile(
}
void Components::insertModificationXcuFile(
- rtl::OUString const & fileUri,
- std::set< rtl::OUString > const & includedPaths,
- std::set< rtl::OUString > const & excludedPaths,
+ OUString const & fileUri,
+ std::set< OUString > const & includedPaths,
+ std::set< OUString > const & excludedPaths,
Modifications * modifications)
{
assert(modifications != 0);
@@ -412,18 +408,17 @@ void Components::insertModificationXcuFile(
}
css::beans::Optional< css::uno::Any > Components::getExternalValue(
- rtl::OUString const & descriptor)
+ OUString const & descriptor)
{
sal_Int32 i = descriptor.indexOf(' ');
if (i <= 0) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("bad external value descriptor ")) +
+ (OUString("bad external value descriptor ") +
descriptor),
css::uno::Reference< css::uno::XInterface >());
}
//TODO: Do not make calls with mutex locked:
- rtl::OUString name(descriptor.copy(0, i));
+ OUString name(descriptor.copy(0, i));
ExternalServices::iterator j(externalServices_.find(name));
if (j == externalServices_.end()) {
css::uno::Reference< css::uno::XInterface > service;
@@ -456,24 +451,18 @@ css::beans::Optional< css::uno::Any > Components::getExternalValue(
value))
{
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "cannot obtain external value through ")) +
+ (OUString("cannot obtain external value through ") +
descriptor),
css::uno::Reference< css::uno::XInterface >());
}
} catch (css::beans::UnknownPropertyException & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "unknown external value descriptor ID: ")) +
+ (OUString("unknown external value descriptor ID: ") +
e.Message),
css::uno::Reference< css::uno::XInterface >());
} catch (css::lang::WrappedTargetException & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "cannot obtain external value: ")) +
+ (OUString("cannot obtain external value: ") +
e.Message),
css::uno::Reference< css::uno::XInterface >());
}
@@ -487,10 +476,9 @@ Components::Components(
{
assert(context.is());
lock_ = lock();
- rtl::OUString conf(
+ OUString conf(
expand(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("${CONFIGURATION_LAYERS}"))));
+ OUString("${CONFIGURATION_LAYERS}")));
RTL_LOGFILE_TRACE("configmgr : begin parsing");
int layer = 0;
for (sal_Int32 i = 0;;) {
@@ -502,19 +490,15 @@ Components::Components(
}
if (!modificationFileUrl_.isEmpty()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CONFIGURATION_LAYERS: \"user\" followed by further"
- " layers")),
+ OUString("CONFIGURATION_LAYERS: \"user\" followed by further"
+ " layers"),
css::uno::Reference< css::uno::XInterface >());
}
sal_Int32 c = i;
for (;; ++c) {
if (c == conf.getLength() || conf[c] == ' ') {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CONFIGURATION_LAYERS: missing \":\"")),
+ OUString("CONFIGURATION_LAYERS: missing \":\""),
css::uno::Reference< css::uno::XInterface >());
}
if (conf[c] == ':') {
@@ -525,8 +509,8 @@ Components::Components(
if (n == -1) {
n = conf.getLength();
}
- rtl::OUString type(conf.copy(i, c - i));
- rtl::OUString url(conf.copy(c + 1, n - c - 1));
+ OUString type(conf.copy(i, c - i));
+ OUString url(conf.copy(c + 1, n - c - 1));
if ( type == "xcsxcu" ) {
parseXcsXcuLayer(layer, url);
layer += 2; //TODO: overflow
@@ -537,10 +521,8 @@ Components::Components(
} else if ( type == "sharedext" ) {
if (sharedExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CONFIGURATION_LAYERS: multiple \"sharedext\""
- " layers")),
+ OUString("CONFIGURATION_LAYERS: multiple \"sharedext\""
+ " layers"),
css::uno::Reference< css::uno::XInterface >());
}
sharedExtensionLayer_ = layer;
@@ -549,10 +531,8 @@ Components::Components(
} else if ( type == "userext" ) {
if (userExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CONFIGURATION_LAYERS: multiple \"userext\""
- " layers")),
+ OUString("CONFIGURATION_LAYERS: multiple \"userext\""
+ " layers"),
css::uno::Reference< css::uno::XInterface >());
}
userExtensionLayer_ = layer;
@@ -567,20 +547,16 @@ Components::Components(
} else if ( type == "user" ) {
if (url.isEmpty()) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CONFIGURATION_LAYERS: empty \"user\" URL")),
+ OUString("CONFIGURATION_LAYERS: empty \"user\" URL"),
css::uno::Reference< css::uno::XInterface >());
}
modificationFileUrl_ = url;
parseModificationLayer(url);
} else {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "CONFIGURATION_LAYERS: unknown layer type \"")) +
+ (OUString("CONFIGURATION_LAYERS: unknown layer type \"") +
type +
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""))),
+ OUString("\"")),
css::uno::Reference< css::uno::XInterface >());
}
i = n;
@@ -597,7 +573,7 @@ Components::~Components()
}
void Components::parseFileLeniently(
- FileParser * parseFile, rtl::OUString const & url, int layer, Data & data,
+ FileParser * parseFile, OUString const & url, int layer, Data & data,
Partial const * partial, Modifications * modifications,
Additions * additions)
{
@@ -616,8 +592,8 @@ void Components::parseFileLeniently(
}
void Components::parseFiles(
- int layer, rtl::OUString const & extension, FileParser * parseFile,
- rtl::OUString const & url, bool recursive)
+ int layer, OUString const & extension, FileParser * parseFile,
+ OUString const & url, bool recursive)
{
osl::Directory dir(url);
switch (dir.open()) {
@@ -630,8 +606,7 @@ void Components::parseFiles(
// fall through
default:
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot open directory ")) +
+ (OUString("cannot open directory ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
@@ -643,8 +618,7 @@ void Components::parseFiles(
}
if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot iterate directory ")) +
+ (OUString("cannot iterate directory ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
@@ -653,15 +627,14 @@ void Components::parseFiles(
osl_FileStatus_Mask_FileURL);
if (i.getFileStatus(stat) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot stat in directory ")) +
+ (OUString("cannot stat in directory ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
parseFiles(layer, extension, parseFile, stat.getFileURL(), true);
} else {
- rtl::OUString file(stat.getFileName());
+ OUString file(stat.getFileName());
if (file.getLength() >= extension.getLength() &&
file.match(extension, file.getLength() - extension.getLength()))
{
@@ -670,9 +643,7 @@ void Components::parseFiles(
parseFile, stat.getFileURL(), layer, data_, 0, 0, 0);
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "stat'ed file does not exist: ")) +
+ (OUString("stat'ed file does not exist: ") +
e.Message),
css::uno::Reference< css::uno::XInterface >());
}
@@ -682,11 +653,11 @@ void Components::parseFiles(
}
void Components::parseFileList(
- int layer, FileParser * parseFile, rtl::OUString const & urls,
+ int layer, FileParser * parseFile, OUString const & urls,
bool recordAdditions)
{
for (sal_Int32 i = 0;;) {
- rtl::OUString url(urls.getToken(0, ' ', i));
+ OUString url(urls.getToken(0, ' ', i));
if (!url.isEmpty()) {
Additions * adds = 0;
if (recordAdditions) {
@@ -708,7 +679,7 @@ void Components::parseFileList(
}
}
-void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
+void Components::parseXcdFiles(int layer, OUString const & url) {
osl::Directory dir(url);
switch (dir.open()) {
case osl::FileBase::E_None:
@@ -717,8 +688,7 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
return;
default:
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot open directory ")) +
+ (OUString("cannot open directory ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
@@ -733,8 +703,7 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
}
if (rc != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot iterate directory ")) +
+ (OUString("cannot iterate directory ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
@@ -743,19 +712,18 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
osl_FileStatus_Mask_FileURL);
if (i.getFileStatus(stat) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot stat in directory ")) +
+ (OUString("cannot stat in directory ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
- rtl::OUString file(stat.getFileName());
+ OUString file(stat.getFileName());
if (file.getLength() >= RTL_CONSTASCII_LENGTH(".xcd") &&
file.matchAsciiL(
RTL_CONSTASCII_STRINGPARAM(".xcd"),
file.getLength() - RTL_CONSTASCII_LENGTH(".xcd")))
{
- rtl::OUString name(
+ OUString name(
file.copy(
0, file.getLength() - RTL_CONSTASCII_LENGTH(".xcd")));
existingDeps.insert(name);
@@ -766,9 +734,7 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
new XcdParser(layer, processedDeps, data_));
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "stat'ed file does not exist: ")) +
+ (OUString("stat'ed file does not exist: ") +
e.Message),
css::uno::Reference< css::uno::XInterface >());
}
@@ -793,35 +759,33 @@ void Components::parseXcdFiles(int layer, rtl::OUString const & url) {
}
if (!resolved) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "xcd: unresolved dependencies in ")) +
+ (OUString("xcd: unresolved dependencies in ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
}
}
-void Components::parseXcsXcuLayer(int layer, rtl::OUString const & url) {
+void Components::parseXcsXcuLayer(int layer, OUString const & url) {
parseXcdFiles(layer, url);
parseFiles(
- layer, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcs")),
+ layer, OUString(".xcs"),
&parseXcsFile,
- url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/schema")), false);
+ url + OUString("/schema"), false);
parseFiles(
- layer + 1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+ layer + 1, OUString(".xcu"),
&parseXcuFile,
- url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/data")), false);
+ url + OUString("/data"), false);
}
void Components::parseXcsXcuIniLayer(
- int layer, rtl::OUString const & url, bool recordAdditions)
+ int layer, OUString const & url, bool recordAdditions)
{
// Check if ini file exists (otherwise .override would still read global
// SCHEMA/DATA variables, which could interfere with unrelated environment
// variables):
if (rtl::Bootstrap(url).getHandle() != 0) {
- rtl::OUStringBuffer prefix("${.override:");
+ OUStringBuffer prefix("${.override:");
for (sal_Int32 i = 0; i != url.getLength(); ++i) {
sal_Unicode c = url[i];
switch (c) {
@@ -835,13 +799,13 @@ void Components::parseXcsXcuIniLayer(
}
}
prefix.append(':');
- rtl::OUString urls(prefix.toString() + rtl::OUString("SCHEMA}"));
+ OUString urls(prefix.toString() + OUString("SCHEMA}"));
rtl::Bootstrap::expandMacros(urls);
if (!urls.isEmpty())
{
parseFileList(layer, &parseXcsFile, urls, false);
}
- urls = prefix.makeStringAndClear() + rtl::OUString("DATA}");
+ urls = prefix.makeStringAndClear() + OUString("DATA}");
rtl::Bootstrap::expandMacros(urls);
if (!urls.isEmpty())
{
@@ -850,22 +814,22 @@ void Components::parseXcsXcuIniLayer(
}
}
-void Components::parseModuleLayer(int layer, rtl::OUString const & url) {
+void Components::parseModuleLayer(int layer, OUString const & url) {
parseFiles(
- layer, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+ layer, OUString(".xcu"),
&parseXcuFile, url, false);
}
-void Components::parseResLayer(int layer, rtl::OUString const & url) {
- rtl::OUString resUrl(
- url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/res")));
+void Components::parseResLayer(int layer, OUString const & url) {
+ OUString resUrl(
+ url + OUString("/res"));
parseXcdFiles(layer, resUrl);
parseFiles(
- layer, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+ layer, OUString(".xcu"),
&parseXcuFile, resUrl, false);
}
-void Components::parseModificationLayer(rtl::OUString const & url) {
+void Components::parseModificationLayer(OUString const & url) {
try {
parseFileLeniently(&parseXcuFile, url, Data::NO_LAYER, data_, 0, 0, 0);
} catch (css::container::NoSuchElementException &) {
@@ -875,13 +839,11 @@ void Components::parseModificationLayer(rtl::OUString const & url) {
// longer relevant, probably OOo 4; also see hack for xsi namespace in
// xmlreader::XmlReader::registerNamespaceIri):
parseFiles(
- Data::NO_LAYER, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
+ Data::NO_LAYER, OUString(".xcu"),
&parseXcuFile,
expand(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
- ":UserInstallation}/user/registry/data"))),
+ OUString("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+ ":UserInstallation}/user/registry/data")),
false);
}
}
@@ -890,9 +852,7 @@ int Components::getExtensionLayer(bool shared) {
int layer = shared ? sharedExtensionLayer_ : userExtensionLayer_;
if (layer == -1) {
throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "insert extension xcs/xcu file into undefined layer")),
+ OUString("insert extension xcs/xcu file into undefined layer"),
css::uno::Reference< css::uno::XInterface >());
}
return layer;
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 70f7669..6ecda33 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star {
class XComponentContext;
}
} } }
-namespace rtl { class OUString; }
namespace configmgr {
@@ -58,15 +57,15 @@ public:
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
- static bool allLocales(rtl::OUString const & locale);
+ static bool allLocales(OUString const & locale);
rtl::Reference< Node > resolvePathRepresentation(
- rtl::OUString const & pathRepresentation,
- rtl::OUString * canonicRepresenation, Path * path, int * finalizedLayer)
+ OUString const & pathRepresentation,
+ OUString * canonicRepresenation, Path * path, int * finalizedLayer)
const;
rtl::Reference< Node > getTemplate(
- int layer, rtl::OUString const & fullName) const;
+ int layer, OUString const & fullName) const;
void addRootAccess(rtl::Reference< RootAccess > const & access);
@@ -88,27 +87,27 @@ public:
// shutdown if writeModifications has ever been called (probably
// indirectly, via removeExtensionXcuFile)
- void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri);
+ void insertExtensionXcsFile(bool shared, OUString const & fileUri);
void insertExtensionXcuFile(
- bool shared, rtl::OUString const & fileUri,
+ bool shared, OUString const & fileUri,
Modifications * modifications);
void removeExtensionXcuFile(
- rtl::OUString const & fileUri, Modifications * modifications);
+ OUString const & fileUri, Modifications * modifications);
void insertModificationXcuFile(
- rtl::OUString const & fileUri,
- std::set< rtl::OUString > const & includedPaths,
- std::set< rtl::OUString > const & excludedPaths,
+ OUString const & fileUri,
+ std::set< OUString > const & includedPaths,
+ std::set< OUString > const & excludedPaths,
Modifications * modifications);
com::sun::star::beans::Optional< com::sun::star::uno::Any >
- getExternalValue(rtl::OUString const & descriptor);
+ getExternalValue(OUString const & descriptor);
private:
typedef void FileParser(
- rtl::OUString const &, int, Data &, Partial const *, Modifications *,
+ OUString const &, int, Data &, Partial const *, Modifications *,
Additions *);
public:
Components(
@@ -119,30 +118,30 @@ public:
private:
void parseFileLeniently(
- FileParser * parseFile, rtl::OUString const & url, int layer,
+ FileParser * parseFile, OUString const & url, int layer,
Data & data, Partial const * partial, Modifications * modifications,
Additions * additions);
void parseFiles(
- int layer, rtl::OUString const & extension, FileParser * parseFile,
- rtl::OUString const & url, bool recursive);
+ int layer, OUString const & extension, FileParser * parseFile,
+ OUString const & url, bool recursive);
void parseFileList(
- int layer, FileParser * parseFile, rtl::OUString const & urls,
+ int layer, FileParser * parseFile, OUString const & urls,
bool recordAdditions);
- void parseXcdFiles(int layer, rtl::OUString const & url);
+ void parseXcdFiles(int layer, OUString const & url);
- void parseXcsXcuLayer(int layer, rtl::OUString const & url);
+ void parseXcsXcuLayer(int layer, OUString const & url);
void parseXcsXcuIniLayer(
- int layer, rtl::OUString const & url, bool recordAdditions);
+ int layer, OUString const & url, bool recordAdditions);
- void parseModuleLayer(int layer, rtl::OUString const & url);
+ void parseModuleLayer(int layer, OUString const & url);
- void parseResLayer(int layer, rtl::OUString const & url);
+ void parseResLayer(int layer, OUString const & url);
- void parseModificationLayer(rtl::OUString const & url);
+ void parseModificationLayer(OUString const & url);
int getExtensionLayer(bool shared);
@@ -150,7 +149,7 @@ private:
typedef
std::map<
- rtl::OUString,
+ OUString,
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet > >
ExternalServices;
@@ -165,7 +164,7 @@ private:
rtl::Reference< WriteThread > writeThread_;
int sharedExtensionLayer_;
int userExtensionLayer_;
- rtl::OUString modificationFileUrl_;
+ OUString modificationFileUrl_;
boost::shared_ptr<osl::Mutex> lock_;
};
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 4f0b532..a73ec6b 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -73,10 +73,8 @@ char const updateAccessServiceName[] =
void badNodePath() {
throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider expects a"
- " single, non-empty, string nodepath argument")),
+ OUString("com.sun.star.configuration.ConfigurationProvider expects a"
+ " single, non-empty, string nodepath argument"),
0);
}
@@ -93,7 +91,7 @@ class Service:
public:
Service(
css::uno::Reference< css::uno::XComponentContext > const context,
- rtl::OUString const & locale):
+ OUString const & locale):
ServiceBase(*static_cast< osl::Mutex * >(this)), context_(context),
locale_(locale)
{
@@ -106,29 +104,29 @@ private:
virtual void SAL_CALL disposing() { flushModifications(); }
- virtual rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return configuration_provider::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException)
{ return ServiceName == getSupportedServiceNames()[0]; } //TODO
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException)
{ return configuration_provider::getSupportedServiceNames(); }
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
- rtl::OUString const & aServiceSpecifier)
+ OUString const & aServiceSpecifier)
throw (css::uno::Exception, css::uno::RuntimeException);
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments(
- rtl::OUString const & ServiceSpecifier,
+ OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments)
throw (css::uno::Exception, css::uno::RuntimeException);
- virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames() throw (css::uno::RuntimeException);
virtual void SAL_CALL refresh() throw (css::uno::RuntimeException);
@@ -160,12 +158,12 @@ private:
void flushModifications() const;
css::uno::Reference< css::uno::XComponentContext > context_;
- rtl::OUString locale_;
+ OUString locale_;
boost::shared_ptr<osl::Mutex> lock_;
};
css::uno::Reference< css::uno::XInterface > Service::createInstance(
- rtl::OUString const & aServiceSpecifier)
+ OUString const & aServiceSpecifier)
throw (css::uno::Exception, css::uno::RuntimeException)
{
return createInstanceWithArguments(
@@ -174,16 +172,16 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
css::uno::Reference< css::uno::XInterface >
Service::createInstanceWithArguments(
- rtl::OUString const & ServiceSpecifier,
+ OUString const & ServiceSpecifier,
css::uno::Sequence< css::uno::Any > const & Arguments)
throw (css::uno::Exception, css::uno::RuntimeException)
{
- rtl::OUString nodepath;
- rtl::OUString locale;
+ OUString nodepath;
+ OUString locale;
for (sal_Int32 i = 0; i < Arguments.getLength(); ++i) {
css::beans::NamedValue v1;
css::beans::PropertyValue v2;
- rtl::OUString name;
+ OUString name;
css::uno::Any value;
if (Arguments[i] >>= v1) {
name = v1.Name;
@@ -200,10 +198,8 @@ Service::createInstanceWithArguments(
break;
} else {
throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider"
- " expects NamedValue or PropertyValue arguments")),
+ OUString("com.sun.star.configuration.ConfigurationProvider"
+ " expects NamedValue or PropertyValue arguments"),
0);
}
// For backwards compatibility, allow "nodepath" and "Locale" in any
@@ -223,11 +219,9 @@ Service::createInstanceWithArguments(
locale.isEmpty())
{
throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider"
+ OUString("com.sun.star.configuration.ConfigurationProvider"
" expects at most one, non-empty, string Locale"
- " argument")),
+ " argument"),
0);
}
}
@@ -238,13 +232,13 @@ Service::createInstanceWithArguments(
// For backwards compatibility, allow a nodepath that misses the leading
// slash:
if (nodepath[0] != '/') {
- nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;
+ nodepath = OUString("/") + nodepath;
}
if (locale.isEmpty()) {
//TODO: should the Access use the dynamically changing locale_ instead?
locale = locale_;
if (locale.isEmpty()) {
- locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+ locale = OUString("en-US");
}
}
bool update;
@@ -256,10 +250,8 @@ Service::createInstanceWithArguments(
update = true;
} else {
throw css::uno::Exception(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider does not"
- " support service ")) +
+ (OUString("com.sun.star.configuration.ConfigurationProvider does not"
+ " support service ") +
ServiceSpecifier),
static_cast< cppu::OWeakObject * >(this));
}
@@ -269,10 +261,8 @@ Service::createInstanceWithArguments(
new RootAccess(components, nodepath, locale, update));
if (root->isValue()) {
throw css::uno::Exception(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider: there is"
- " a leaf value at nodepath ")) +
+ (OUString("com.sun.star.configuration.ConfigurationProvider: there is"
+ " a leaf value at nodepath ") +
nodepath),
static_cast< cppu::OWeakObject * >(this));
}
@@ -280,13 +270,12 @@ Service::createInstanceWithArguments(
return static_cast< cppu::OWeakObject * >(root.get());
}
-css::uno::Sequence< rtl::OUString > Service::getAvailableServiceNames()
+css::uno::Sequence< OUString > Service::getAvailableServiceNames()
throw (css::uno::RuntimeException)
{
- css::uno::Sequence< rtl::OUString > names(2);
- names[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(accessServiceName));
- names[1] = rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(updateAccessServiceName));
+ css::uno::Sequence< OUString > names(2);
+ names[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(accessServiceName));
+ names[1] = OUString(RTL_CONSTASCII_USTRINGPARAM(updateAccessServiceName));
return names;
}
@@ -362,8 +351,7 @@ css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
loc.Variant = l.getVariant();
} catch (comphelper::Locale::MalFormedLocaleException & e) {
throw css::uno::RuntimeException(
- (rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("MalformedLocaleException: ")) +
+ (OUString("MalformedLocaleException: ") +
e.Message),
static_cast< cppu::OWeakObject * >(this));
}
@@ -402,15 +390,15 @@ private:
css::uno::Reference< css::uno::XComponentContext > const & Context)
throw (css::uno::Exception, css::uno::RuntimeException);
- virtual rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return configuration_provider::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list