ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

rtl:: prefix removal from configmgr

Browse Source 
- 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@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
This commit is contained in:
Radu Ioan
2012-12-11 12:08:38 +00:00
committed by Luboš Luňák
parent 90874ab3c7
commit 3e64874e7c
55 changed files with 816 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configmgr/source/access.cxx
+115 -180
View File
@@ -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;
configmgr/source/access.hxx
+51 -52
View File
@@ -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
configmgr/source/broadcaster.cxx
+4 -6
View File
@@ -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);
configmgr/source/childaccess.cxx
+10 -14
View File
@@ -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)
configmgr/source/childaccess.hxx
+7 -7
View File
@@ -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_;
configmgr/source/components.cxx
+79 -119
View File
@@ -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;
configmgr/source/components.hxx
+24 -25
View File
@@ -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_;
};
configmgr/source/configurationprovider.cxx
+49 -71
View File
@@ -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)
{ 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(); }
};
@@ -432,11 +420,11 @@ Factory::createInstanceWithArgumentsAndContext(
if (Arguments.getLength() == 0) {
return css::configuration::theDefaultProvider::get(Context);
} else {
rtl::OUString locale;
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;
@@ -446,11 +434,9 @@ Factory::createInstanceWithArgumentsAndContext(
value = v2.Value;
} else {
throw css::uno::Exception(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationProvider"
OUString("com.sun.star.configuration.ConfigurationProvider"
" factory expects NamedValue or PropertyValue"
" arguments")),
" arguments"),
0);
}
// For backwards compatibility, allow "Locale" and (ignored)
@@ -462,21 +448,17 @@ Factory::createInstanceWithArgumentsAndContext(
locale.isEmpty())
{
throw css::uno::Exception(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration."
OUString("com.sun.star.configuration."
"ConfigurationProvider factory expects at most"
" one, non-empty, string Locale argument")),
" one, non-empty, string Locale argument"),
0);
}
} else if (!name.equalsIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("enableasync")))
{
throw css::uno::Exception(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationProvider"
" factory: unknown argument ")) + name,
OUString("com.sun.star.configuration.ConfigurationProvider"
" factory: unknown argument ") + name,
0);
}
}
@@ -490,27 +472,23 @@ css::uno::Reference< css::uno::XInterface > createDefault(
css::uno::Reference< css::uno::XComponentContext > const & context)
{
return static_cast< cppu::OWeakObject * >(
new Service(context, rtl::OUString()));
new Service(context, OUString()));
}
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.ConfigurationProvider"));
OUString getImplementationName() {
return OUString("com.sun.star.comp.configuration.ConfigurationProvider");
}
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
rtl::OUString name(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationProvider"));
return css::uno::Sequence< rtl::OUString >(&name, 1);
css::uno::Sequence< OUString > getSupportedServiceNames() {
OUString name("com.sun.star.configuration.ConfigurationProvider");
return css::uno::Sequence< OUString >(&name, 1);
}
css::uno::Reference< css::lang::XSingleComponentFactory >
createFactory(
SAL_UNUSED_PARAMETER cppu::ComponentFactoryFunc,
SAL_UNUSED_PARAMETER rtl::OUString const &,
SAL_UNUSED_PARAMETER css::uno::Sequence< rtl::OUString > const &,
SAL_UNUSED_PARAMETER OUString const &,
SAL_UNUSED_PARAMETER css::uno::Sequence< OUString > const &,
SAL_UNUSED_PARAMETER rtl_ModuleCount *)
SAL_THROW(())
{
configmgr/source/configurationprovider.hxx
+4 -5
View File
@@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star {
class XInterface;
}
} } }
namespace rtl { class OUString; }
namespace configmgr { namespace configuration_provider {
@@ -43,15 +42,15 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createDefault(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
rtl::OUString SAL_CALL getImplementationName();
OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames();
com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
SAL_CALL createFactory(
cppu::ComponentFactoryFunc, rtl::OUString const &,
com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
cppu::ComponentFactoryFunc, OUString const &,
com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *)
SAL_THROW(());
} }
configmgr/source/configurationregistry.cxx
+111 -177
View File
@@ -79,22 +79,22 @@ public:
private:
virtual ~Service() {}
virtual rtl::OUString SAL_CALL getImplementationName()
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return configuration_registry::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_registry::getSupportedServiceNames(); }
virtual rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException);
virtual void SAL_CALL open(
rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
@@ -119,7 +119,7 @@ private:
virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException);
virtual void SAL_CALL mergeKey(rtl::OUString const &, rtl::OUString const &)
virtual void SAL_CALL mergeKey(OUString const &, OUString const &)
throw (
css::registry::InvalidRegistryException,
css::registry::MergeConflictException, css::uno::RuntimeException);
@@ -143,7 +143,7 @@ private:
css::uno::Reference< css::lang::XMultiServiceFactory > provider_;
osl::Mutex mutex_;
css::uno::Reference< css::uno::XInterface > access_;
rtl::OUString url_;
OUString url_;
bool readOnly_;
friend class RegistryKey;
@@ -160,7 +160,7 @@ public:
private:
virtual ~RegistryKey() {}
virtual rtl::OUString SAL_CALL getKeyName()
virtual OUString SAL_CALL getKeyName()
throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL isReadOnly()
@@ -171,7 +171,7 @@ private:
virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException);
virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
rtl::OUString const &)
OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
@@ -202,44 +202,44 @@ private:
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getAsciiValue()
virtual OUString SAL_CALL getAsciiValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException);
virtual void SAL_CALL setAsciiValue(rtl::OUString const &)
virtual void SAL_CALL setAsciiValue(OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAsciiListValue()
virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException);
virtual void SAL_CALL setAsciiListValue(
css::uno::Sequence< rtl::OUString > const &)
css::uno::Sequence< OUString > const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getStringValue()
virtual OUString SAL_CALL getStringValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException);
virtual void SAL_CALL setStringValue(rtl::OUString const &)
virtual void SAL_CALL setStringValue(OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual css::uno::Sequence< rtl::OUString > SAL_CALL getStringListValue()
virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException);
virtual void SAL_CALL setStringListValue(
css::uno::Sequence< rtl::OUString > const &)
css::uno::Sequence< OUString > const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
@@ -255,13 +255,13 @@ private:
css::uno::RuntimeException);
virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
rtl::OUString const & aKeyName)
OUString const & aKeyName)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
createKey(rtl::OUString const &)
createKey(OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
@@ -271,7 +271,7 @@ private:
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual void SAL_CALL deleteKey(rtl::OUString const &)
virtual void SAL_CALL deleteKey(OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
@@ -283,29 +283,29 @@ private:
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual css::uno::Sequence< rtl::OUString > SAL_CALL getKeyNames()
virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames()
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual sal_Bool SAL_CALL createLink(
rtl::OUString const &, rtl::OUString const &)
OUString const &, OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual void SAL_CALL deleteLink(rtl::OUString const &)
virtual void SAL_CALL deleteLink(OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getLinkTarget(rtl::OUString const &)
virtual OUString SAL_CALL getLinkTarget(OUString const &)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getResolvedName(
rtl::OUString const & aKeyName)
virtual OUString SAL_CALL getResolvedName(
OUString const & aKeyName)
throw (
css::registry::InvalidRegistryException,
css::uno::RuntimeException);
@@ -321,32 +321,28 @@ Service::Service(
try {
provider_ = css::uno::Reference< css::lang::XMultiServiceFactory >(
context->getServiceManager()->createInstanceWithContext(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.DefaultProvider")),
OUString("com.sun.star.configuration.DefaultProvider"),
context),
css::uno::UNO_QUERY_THROW);
} catch (css::uno::RuntimeException &) {
throw;
} catch (css::uno::Exception & e) {
throw css::uno::DeploymentException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"component context fails to supply service"
(OUString("component context fails to supply service"
" com.sun.star.configuration.DefaultProvider of type"
" com.sun.star.lang.XMultiServiceFactory: ")) +
" com.sun.star.lang.XMultiServiceFactory: ") +
e.Message),
context);
}
}
rtl::OUString Service::getURL() throw (css::uno::RuntimeException) {
OUString Service::getURL() throw (css::uno::RuntimeException) {
osl::MutexGuard g(mutex_);
checkValid_RuntimeException();
return url_;
}
void Service::open(rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
//TODO: bCreate
@@ -356,26 +352,20 @@ void Service::open(rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
}
css::uno::Sequence< css::uno::Any > args(1);
args[0] <<= css::beans::NamedValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
OUString("nodepath"),
css::uno::makeAny(rURL));
try {
access_ = provider_->createInstanceWithArguments(
(bReadOnly
? rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationAccess"))
: rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationUpdateAccess"))),
? OUString("com.sun.star.configuration.ConfigurationAccess")
: OUString("com.sun.star.configuration.ConfigurationUpdateAccess")),
args);
} catch (css::uno::RuntimeException &) {
throw;
} catch (css::uno::Exception & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: open"
" failed: ")) +
(OUString("com.sun.star.configuration.ConfigurationRegistry: open"
" failed: ") +
e.Message),
static_cast< cppu::OWeakObject * >(this));
}
@@ -400,10 +390,8 @@ void Service::destroy()
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -421,26 +409,22 @@ sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException) {
return readOnly_;
}
void Service::mergeKey(rtl::OUString const &, rtl::OUString const &)
void Service::mergeKey(OUString const &, OUString const &)
throw (
css::registry::InvalidRegistryException,
css::registry::MergeConflictException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
void Service::flush() throw (css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -449,10 +433,8 @@ void Service::addFlushListener(
throw (css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -461,20 +443,16 @@ void Service::removeFlushListener(
throw (css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
void Service::checkValid() {
if (!access_.is()) {
throw css::registry::InvalidRegistryException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" valid")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" valid"),
static_cast< cppu::OWeakObject * >(this));
}
}
@@ -482,10 +460,8 @@ void Service::checkValid() {
void Service::checkValid_RuntimeException() {
if (!access_.is()) {
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" valid")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" valid"),
static_cast< cppu::OWeakObject * >(this));
}
}
@@ -494,7 +470,7 @@ void Service::doClose() {
access_.clear();
}
rtl::OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) {
OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) {
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
css::uno::Reference< css::container::XNamed > named;
@@ -502,10 +478,8 @@ rtl::OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) {
return named->getName();
}
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -521,7 +495,7 @@ sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException) {
return service_.isValid();
}
css::registry::RegistryKeyType RegistryKey::getKeyType(rtl::OUString const &)
css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
@@ -547,7 +521,7 @@ css::registry::RegistryValueType RegistryKey::getValueType()
{
return css::registry::RegistryValueType_LONGLIST;
} else if (t ==
cppu::UnoType< css::uno::Sequence< rtl::OUString > >::get())
cppu::UnoType< css::uno::Sequence< OUString > >::get())
{
return css::registry::RegistryValueType_STRINGLIST;
}
@@ -569,9 +543,7 @@ sal_Int32 RegistryKey::getLongValue()
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -579,10 +551,8 @@ void RegistryKey::setLongValue(sal_Int32)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -598,9 +568,7 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -608,127 +576,109 @@ void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
rtl::OUString RegistryKey::getAsciiValue()
OUString RegistryKey::getAsciiValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
rtl::OUString v;
OUString v;
if (value_ >>= v) {
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
void RegistryKey::setAsciiValue(rtl::OUString const &)
void RegistryKey::setAsciiValue(OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Sequence< rtl::OUString > RegistryKey::getAsciiListValue()
css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
css::uno::Sequence< rtl::OUString > v;
css::uno::Sequence< OUString > v;
if (value_ >>= v) {
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
void RegistryKey::setAsciiListValue(css::uno::Sequence< rtl::OUString > const &)
void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
rtl::OUString RegistryKey::getStringValue()
OUString RegistryKey::getStringValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
rtl::OUString v;
OUString v;
if (value_ >>= v) {
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
void RegistryKey::setStringValue(rtl::OUString const &)
void RegistryKey::setStringValue(OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Sequence< rtl::OUString > RegistryKey::getStringListValue()
css::uno::Sequence< OUString > RegistryKey::getStringListValue()
throw (
css::registry::InvalidRegistryException,
css::registry::InvalidValueException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
css::uno::Sequence< rtl::OUString > v;
css::uno::Sequence< OUString > v;
if (value_ >>= v) {
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
void RegistryKey::setStringListValue(
css::uno::Sequence< rtl::OUString > const &)
css::uno::Sequence< OUString > const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -744,9 +694,7 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
return v;
}
throw css::registry::InvalidValueException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry")),
OUString("com.sun.star.configuration.ConfigurationRegistry"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -754,15 +702,13 @@ void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
rtl::OUString const & aKeyName)
OUString const & aKeyName)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
@@ -778,15 +724,13 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
}
css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
rtl::OUString const &)
OUString const &)
throw (
css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -798,14 +742,12 @@ void RegistryKey::closeKey()
service_.checkValid_RuntimeException();
}
void RegistryKey::deleteKey(rtl::OUString const &)
void RegistryKey::deleteKey(OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -814,25 +756,21 @@ RegistryKey::openKeys()
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
css::uno::Sequence< rtl::OUString > RegistryKey::getKeyNames()
css::uno::Sequence< OUString > RegistryKey::getKeyNames()
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry: not"
" implemented")),
OUString("com.sun.star.configuration.ConfigurationRegistry: not"
" implemented"),
static_cast< cppu::OWeakObject * >(this));
}
sal_Bool RegistryKey::createLink(rtl::OUString const &, rtl::OUString const &)
sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
@@ -840,22 +778,22 @@ sal_Bool RegistryKey::createLink(rtl::OUString const &, rtl::OUString const &)
return false;
}
void RegistryKey::deleteLink(rtl::OUString const &)
void RegistryKey::deleteLink(OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
}
rtl::OUString RegistryKey::getLinkTarget(rtl::OUString const &)
OUString RegistryKey::getLinkTarget(OUString const &)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
return rtl::OUString();
return OUString();
}
rtl::OUString RegistryKey::getResolvedName(rtl::OUString const & aKeyName)
OUString RegistryKey::getResolvedName(OUString const & aKeyName)
throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
{
osl::MutexGuard g(service_.mutex_);
@@ -871,17 +809,13 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.ConfigurationRegistry"));
OUString getImplementationName() {
return OUString("com.sun.star.comp.configuration.ConfigurationRegistry");
}
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
rtl::OUString name(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationRegistry"));
return css::uno::Sequence< rtl::OUString >(&name, 1);
css::uno::Sequence< OUString > getSupportedServiceNames() {
OUString name("com.sun.star.configuration.ConfigurationRegistry");
return css::uno::Sequence< OUString >(&name, 1);
}
} }
configmgr/source/configurationregistry.hxx
+2 -3
View File
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star {
class XInterface;
}
} } }
namespace rtl { class OUString; }
namespace configmgr { namespace configuration_registry {
@@ -41,9 +40,9 @@ create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
rtl::OUString SAL_CALL getImplementationName();
OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames();
} }
configmgr/source/data.cxx
+39 -46
View File
@@ -46,13 +46,13 @@ namespace configmgr {
namespace {
bool decode(
rtl::OUString const & encoded, sal_Int32 begin, sal_Int32 end,
rtl::OUString * decoded)
OUString const & encoded, sal_Int32 begin, sal_Int32 end,
OUString * decoded)
{
assert(
begin >= 0 && begin <= end && end <= encoded.getLength() &&
decoded != 0);
rtl::OUStringBuffer buf;
OUStringBuffer buf;
while (begin != end) {
sal_Unicode c = encoded[begin++];
if (c == '&') {
@@ -84,39 +84,39 @@ bool decode(
}
rtl::OUString Data::createSegment(
rtl::OUString const & templateName, rtl::OUString const & name)
OUString Data::createSegment(
OUString const & templateName, OUString const & name)
{
if (templateName.isEmpty()) {
return name;
}
rtl::OUStringBuffer buf(templateName);
OUStringBuffer buf(templateName);
//TODO: verify template name contains no bad chars?
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("['"));
buf.appendAscii("['");
for (sal_Int32 i = 0; i < name.getLength(); ++i) {
sal_Unicode c = name[i];
switch (c) {
case '&':
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("&amp;"));
buf.appendAscii("&amp;");
break;
case '"':
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("&quot;"));
buf.appendAscii("&quot;");
break;
case '\'':
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("&apos;"));
buf.appendAscii("&apos;");
break;
default:
buf.append(c);
break;
}
}
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("']"));
buf.appendAscii("']");
return buf.makeStringAndClear();
}
sal_Int32 Data::parseSegment(
rtl::OUString const & path, sal_Int32 index, rtl::OUString * name,
bool * setElement, rtl::OUString * templateName)
OUString const & path, sal_Int32 index, OUString * name,
bool * setElement, OUString * templateName)
{
assert(
index >= 0 && index <= path.getLength() && name != 0 &&
@@ -132,7 +132,7 @@ sal_Int32 Data::parseSegment(
}
if (templateName != 0) {
if (i - index == 1 && path[index] == '*') {
*templateName = rtl::OUString();
*templateName = OUString();
} else {
*templateName = path.copy(index, i - index);
}
@@ -154,26 +154,24 @@ sal_Int32 Data::parseSegment(
return j + 2;
}
rtl::OUString Data::fullTemplateName(
rtl::OUString const & component, rtl::OUString const & name)
OUString Data::fullTemplateName(
OUString const & component, OUString const & name)
{
if (component.indexOf(':') != -1 || name.indexOf(':') != -1) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad component/name pair containing colon ")) +
component + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
(OUString("bad component/name pair containing colon ") +
component + OUString("/") +
name),
css::uno::Reference< css::uno::XInterface >());
}
rtl::OUStringBuffer buf(component);
OUStringBuffer buf(component);
buf.append(sal_Unicode(':'));
buf.append(name);
return buf.makeStringAndClear();
}
bool Data::equalTemplateNames(
rtl::OUString const & shortName, rtl::OUString const & longName)
OUString const & shortName, OUString const & longName)
{
if (shortName.indexOf(':') == -1) {
sal_Int32 i = longName.indexOf(':') + 1;
@@ -189,7 +187,7 @@ bool Data::equalTemplateNames(
}
rtl::Reference< Node > Data::findNode(
int layer, NodeMap const & map, rtl::OUString const & name)
int layer, NodeMap const & map, OUString const & name)
{
NodeMap::const_iterator i(map.find(name));
return i == map.end() || i->second->getLayer() > layer
@@ -199,13 +197,13 @@ rtl::Reference< Node > Data::findNode(
Data::Data(): root_(new RootNode) {}
rtl::Reference< Node > Data::resolvePathRepresentation(
rtl::OUString const & pathRepresentation,
rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
OUString const & pathRepresentation,
OUString * canonicRepresentation, Path * path, int * finalizedLayer)
const
{
if (pathRepresentation.isEmpty() || pathRepresentation[0] != '/') {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
@@ -221,20 +219,20 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
}
return root_;
}
rtl::OUString seg;
OUString seg;
bool setElement;
rtl::OUString templateName;
OUString templateName;
sal_Int32 n = parseSegment(pathRepresentation, 1, &seg, &setElement, 0);
if (n == -1 || setElement)
{
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
NodeMap const & components = getComponents();
NodeMap::const_iterator i(components.find(seg));
rtl::OUStringBuffer canonic;
OUStringBuffer canonic;
rtl::Reference< Node > parent;
int finalized = NO_LAYER;
for (rtl::Reference< Node > p(i == components.end() ? 0 : i->second);;) {
@@ -253,7 +251,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
pathRepresentation[n++] != '/')
{
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
@@ -268,12 +266,12 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
return p;
}
parent = p;
templateName = rtl::OUString();
templateName = OUString();
n = parseSegment(
pathRepresentation, n, &seg, &setElement, &templateName);
if (n == -1) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
@@ -285,8 +283,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
case Node::KIND_LOCALIZED_PROPERTY:
if (!templateName.isEmpty()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
@@ -297,15 +294,14 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
templateName))
{
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
break;
default:
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
@@ -313,8 +309,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
assert(!p->getTemplateName().isEmpty());
if (!equalTemplateNames(templateName, p->getTemplateName())) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
(OUString("bad path ") +
pathRepresentation),
css::uno::Reference< css::uno::XInterface >());
}
@@ -324,7 +319,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
}
rtl::Reference< Node > Data::getTemplate(
int layer, rtl::OUString const & fullName) const
int layer, OUString const & fullName) const
{
return findNode(layer, templates, fullName);
}
@@ -334,7 +329,7 @@ NodeMap & Data::getComponents() const {
}
Additions * Data::addExtensionXcuAdditions(
rtl::OUString const & url, int layer)
OUString const & url, int layer)
{
rtl::Reference< ExtensionXcu > item(new ExtensionXcu);
ExtensionXcuAdditions::iterator i(
@@ -343,9 +338,7 @@ Additions * Data::addExtensionXcuAdditions(
url, rtl::Reference< ExtensionXcu >())).first);
if (i->second.is()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"already added extension xcu ")) +
(OUString("already added extension xcu ") +
url),
css::uno::Reference< css::uno::XInterface >());
}
@@ -355,7 +348,7 @@ Additions * Data::addExtensionXcuAdditions(
}
rtl::Reference< Data::ExtensionXcu > Data::removeExtensionXcuAdditions(
rtl::OUString const & url)
OUString const & url)
{
ExtensionXcuAdditions::iterator i(extensionXcuAdditions_.find(url));
if (i == extensionXcuAdditions_.end()) {
configmgr/source/data.hxx
+14 -14
View File
@@ -53,43 +53,43 @@ struct Data: private boost::noncopyable {
Modifications modifications;
static rtl::OUString createSegment(
rtl::OUString const & templateName, rtl::OUString const & name);
static OUString createSegment(
OUString const & templateName, OUString const & name);
static sal_Int32 parseSegment(
rtl::OUString const & path, sal_Int32 index, rtl::OUString * name,
bool * setElement, rtl::OUString * templateName);
OUString const & path, sal_Int32 index, OUString * name,
bool * setElement, OUString * templateName);
static rtl::OUString fullTemplateName(
rtl::OUString const & component, rtl::OUString const & name);
static OUString fullTemplateName(
OUString const & component, OUString const & name);
//TODO: better rules under which circumstances a short template name matches
static bool equalTemplateNames(
rtl::OUString const & shortName, rtl::OUString const & longName);
OUString const & shortName, OUString const & longName);
static rtl::Reference< Node > findNode(
int layer, NodeMap const & map, rtl::OUString const & name);
int layer, NodeMap const & map, OUString const & name);
Data();
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;
NodeMap & getComponents() const;
Additions * addExtensionXcuAdditions(
rtl::OUString const & url, int layer);
OUString const & url, int layer);
rtl::Reference< ExtensionXcu > removeExtensionXcuAdditions(
rtl::OUString const & url);
OUString const & url);
private:
typedef std::map< rtl::OUString, rtl::Reference< ExtensionXcu > >
typedef std::map< OUString, rtl::Reference< ExtensionXcu > >
ExtensionXcuAdditions;
rtl::Reference< Node > root_;
configmgr/source/defaultprovider.cxx
+5 -9
View File
@@ -42,17 +42,13 @@ css::uno::Reference< css::uno::XInterface > create(
return singleton;
}
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.DefaultProvider"));
OUString getImplementationName() {
return OUString("com.sun.star.comp.configuration.DefaultProvider");
}
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
rtl::OUString name(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.DefaultProvider"));
return css::uno::Sequence< rtl::OUString >(&name, 1);
css::uno::Sequence< OUString > getSupportedServiceNames() {
OUString name("com.sun.star.configuration.DefaultProvider");
return css::uno::Sequence< OUString >(&name, 1);
}
} }
configmgr/source/defaultprovider.hxx
+2 -3
View File
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star {
class XInterface;
}
} } }
namespace rtl { class OUString; }
namespace configmgr { namespace default_provider {
@@ -41,9 +40,9 @@ create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
rtl::OUString SAL_CALL getImplementationName();
OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames();
} }
configmgr/source/groupnode.cxx
+2 -2
View File
@@ -30,7 +30,7 @@
namespace configmgr {
GroupNode::GroupNode(
int layer, bool extensible, rtl::OUString const & templateName):
int layer, bool extensible, OUString const & templateName):
Node(layer), extensible_(extensible), templateName_(templateName),
mandatory_(Data::NO_LAYER)
{}
@@ -43,7 +43,7 @@ NodeMap & GroupNode::getMembers() {
return members_;
}
rtl::OUString GroupNode::getTemplateName() const {
OUString GroupNode::getTemplateName() const {
return templateName_;
}
configmgr/source/groupnode.hxx
+4 -4
View File
@@ -32,13 +32,13 @@ namespace configmgr {
class GroupNode: public Node {
public:
GroupNode(int layer, bool extensible, rtl::OUString const & templateName);
GroupNode(int layer, bool extensible, OUString const & templateName);
virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
virtual NodeMap & getMembers();
virtual rtl::OUString getTemplateName() const;
virtual OUString getTemplateName() const;
virtual void setMandatory(int layer);
@@ -57,8 +57,8 @@ private:
bool extensible_;
NodeMap members_;
rtl::OUString templateName_;
// non-empty iff this node is a template, free node, or set member
OUString templateName_;
// non-empty if this node is a template, free node, or set member
int mandatory_;
};
configmgr/source/localizedpropertynode.hxx
-1
View File
@@ -28,7 +28,6 @@
#include "nodemap.hxx"
#include "type.hxx"
namespace rtl { class OUString; }
namespace configmgr {
configmgr/source/localizedvaluenode.cxx
+2 -2
View File
@@ -37,8 +37,8 @@ rtl::Reference< Node > LocalizedValueNode::clone(bool) const {
return new LocalizedValueNode(*this);
}
rtl::OUString LocalizedValueNode::getTemplateName() const {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
OUString LocalizedValueNode::getTemplateName() const {
return OUString("*");
}
css::uno::Any LocalizedValueNode::getValue() const {
configmgr/source/localizedvaluenode.hxx
+1 -2
View File
@@ -27,7 +27,6 @@
#include "node.hxx"
namespace rtl { class OUString; }
namespace configmgr {
@@ -37,7 +36,7 @@ public:
virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
virtual rtl::OUString getTemplateName() const;
virtual OUString getTemplateName() const;
com::sun::star::uno::Any getValue() const;
configmgr/source/modifications.hxx
+1 -2
View File
@@ -28,14 +28,13 @@
#include "path.hxx"
namespace rtl { class OUString; }
namespace configmgr {
class Modifications: private boost::noncopyable {
public:
struct Node {
typedef std::map< rtl::OUString, Node > Children;
typedef std::map< OUString, Node > Children;
Children children;
};
configmgr/source/node.cxx
+4 -4
View File
@@ -37,12 +37,12 @@ namespace configmgr {
NodeMap & Node::getMembers() {
assert(false);
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
OUString("this cannot happen"),
css::uno::Reference< css::uno::XInterface >());
}
rtl::OUString Node::getTemplateName() const {
return rtl::OUString();
OUString Node::getTemplateName() const {
return OUString();
}
void Node::setMandatory(int layer) {
@@ -71,7 +71,7 @@ int Node::getFinalized() const {
return finalized_;
}
rtl::Reference< Node > Node::getMember(rtl::OUString const & name) {
rtl::Reference< Node > Node::getMember(OUString const & name) {
NodeMap const & members = getMembers();
NodeMap::const_iterator i(members.find(name));
return i == members.end() ? rtl::Reference< Node >() : i->second;
configmgr/source/node.hxx
+2 -3
View File
@@ -27,7 +27,6 @@
#include "nodemap.hxx"
namespace rtl { class OUString; }
namespace configmgr {
@@ -42,7 +41,7 @@ public:
virtual rtl::Reference< Node > clone(bool keepTemplateName) const = 0;
virtual NodeMap & getMembers();
virtual rtl::OUString getTemplateName() const;
virtual OUString getTemplateName() const;
virtual void setMandatory(int layer);
virtual int getMandatory() const;
@@ -53,7 +52,7 @@ public:
void setFinalized(int layer);
int getFinalized() const;
rtl::Reference< Node > getMember(rtl::OUString const & name);
rtl::Reference< Node > getMember(OUString const & name);
protected:
explicit Node(int layer);
configmgr/source/nodemap.hxx
+1 -2
View File
@@ -24,13 +24,12 @@
#include <map>
#include "rtl/ref.hxx"
namespace rtl { class OUString; }
namespace configmgr {
class Node;
typedef std::map< rtl::OUString, rtl::Reference< Node > > NodeMap;
typedef std::map< OUString, rtl::Reference< Node > > NodeMap;
void cloneNodeMap(NodeMap const & source, NodeMap * target);
configmgr/source/parsemanager.cxx
+1 -1
View File
@@ -34,7 +34,7 @@
namespace configmgr {
ParseManager::ParseManager(
rtl::OUString const & url, rtl::Reference< Parser > const & parser)
OUString const & url, rtl::Reference< Parser > const & parser)
SAL_THROW((
css::container::NoSuchElementException, css::uno::RuntimeException)):
reader_(url), parser_(parser)
configmgr/source/parsemanager.hxx
+2 -3
View File
@@ -32,7 +32,6 @@
#include "xmlreader/span.hxx"
#include "xmlreader/xmlreader.hxx"
namespace rtl { class OUString; }
namespace configmgr {
@@ -41,12 +40,12 @@ class Parser;
class ParseManager: public salhelper::SimpleReferenceObject {
public:
ParseManager(
rtl::OUString const & url, rtl::Reference< Parser > const & parser)
OUString const & url, rtl::Reference< Parser > const & parser)
SAL_THROW((
com::sun::star::container::NoSuchElementException,
com::sun::star::uno::RuntimeException));
bool parse(std::set< rtl::OUString > const * existingDependencies);
bool parse(std::set< OUString > const * existingDependencies);
enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
configmgr/source/parser.hxx
+1 -2
View File
@@ -28,7 +28,6 @@
#include "salhelper/simplereferenceobject.hxx"
#include "xmlreader/xmlreader.hxx"
namespace rtl { class OUString; }
namespace xmlreader { struct Span; }
namespace configmgr {
@@ -39,7 +38,7 @@ public:
virtual bool startElement(
xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
std::set< rtl::OUString > const * existingDependencies) = 0;
std::set< OUString > const * existingDependencies) = 0;
virtual void endElement(xmlreader::XmlReader const & reader) = 0;
configmgr/source/partial.cxx
+10 -10
View File
@@ -38,15 +38,15 @@ namespace configmgr {
namespace {
bool parseSegment(
rtl::OUString const & path, sal_Int32 * index, rtl::OUString * segment)
OUString const & path, sal_Int32 * index, OUString * segment)
{
assert(
index != 0 && *index >= 0 && *index <= path.getLength() &&
segment != 0);
if (path[(*index)++] == '/') {
rtl::OUString name;
OUString name;
bool setElement;
rtl::OUString templateName;
OUString templateName;
*index = Data::parseSegment(
path, *index, &name, &setElement, &templateName);
if (*index != -1) {
@@ -55,15 +55,15 @@ bool parseSegment(
}
}
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) + path,
OUString("bad path ") + path,
css::uno::Reference< css::uno::XInterface >());
}
}
Partial::Partial(
std::set< rtl::OUString > const & includedPaths,
std::set< rtl::OUString > const & excludedPaths)
std::set< OUString > const & includedPaths,
std::set< OUString > const & excludedPaths)
{
// The Partial::Node tree built up here encodes the following information:
// * Inner node, startInclude: an include starts here that contains excluded
@@ -71,12 +71,12 @@ Partial::Partial(
// * Inner node, !startInclude: contains in-/excluded sub-trees
// * Leaf node, startInclude: an include starts here
// * Leaf node, !startInclude: an exclude starts here
for (std::set< rtl::OUString >::const_iterator i(includedPaths.begin());
for (std::set< OUString >::const_iterator i(includedPaths.begin());
i != includedPaths.end(); ++i)
{
sal_Int32 n = 0;
for (Node * p = &root_;;) {
rtl::OUString seg;
OUString seg;
bool end = parseSegment(*i, &n, &seg);
p = &p->children[seg];
if (p->startInclude) {
@@ -89,12 +89,12 @@ Partial::Partial(
}
}
}
for (std::set< rtl::OUString >::const_iterator i(excludedPaths.begin());
for (std::set< OUString >::const_iterator i(excludedPaths.begin());
i != excludedPaths.end(); ++i)
{
sal_Int32 n = 0;
for (Node * p = &root_;;) {
rtl::OUString seg;
OUString seg;
bool end = parseSegment(*i, &n, &seg);
if (end) {
p->children[seg] = Node();
configmgr/source/partial.hxx
+3 -4
View File
@@ -29,7 +29,6 @@
#include "path.hxx"
namespace rtl { class OUString; }
namespace configmgr {
@@ -38,8 +37,8 @@ public:
enum Containment { CONTAINS_NOT, CONTAINS_SUBNODES, CONTAINS_NODE };
Partial(
std::set< rtl::OUString > const & includedPaths,
std::set< rtl::OUString > const & excludedPaths);
std::set< OUString > const & includedPaths,
std::set< OUString > const & excludedPaths);
~Partial();
@@ -47,7 +46,7 @@ public:
private:
struct Node {
typedef std::map< rtl::OUString, Node > Children;
typedef std::map< OUString, Node > Children;
Node(): startInclude(false) {}
configmgr/source/path.hxx
+1 -2
View File
@@ -24,11 +24,10 @@
#include <vector>
namespace rtl { class OUString; }
namespace configmgr {
typedef std::vector< rtl::OUString > Path;
typedef std::vector< OUString > Path;
}
configmgr/source/propertynode.cxx
+3 -3
View File
@@ -61,7 +61,7 @@ css::uno::Any PropertyNode::getValue(Components & components) {
if (val.IsPresent) {
value_ = val.Value; //TODO: check value type
}
externalDescriptor_ = rtl::OUString(); // must not throw
externalDescriptor_ = OUString(); // must not throw
}
SAL_WARN_IF(
!(value_.hasValue() || nillable_), "configmgr",
@@ -72,10 +72,10 @@ css::uno::Any PropertyNode::getValue(Components & components) {
void PropertyNode::setValue(int layer, css::uno::Any const & value) {
setLayer(layer);
value_ = value;
externalDescriptor_ = rtl::OUString();
externalDescriptor_ = OUString();
}
void PropertyNode::setExternal(int layer, rtl::OUString const & descriptor) {
void PropertyNode::setExternal(int layer, OUString const & descriptor) {
assert(!descriptor.isEmpty());
setLayer(layer);
externalDescriptor_ = descriptor;
configmgr/source/propertynode.hxx
+2 -3
View File
@@ -28,7 +28,6 @@
#include "node.hxx"
#include "type.hxx"
namespace rtl { class OUString; }
namespace configmgr {
@@ -50,7 +49,7 @@ public:
void setValue(int layer, com::sun::star::uno::Any const & value);
void setExternal(int layer, rtl::OUString const & descriptor);
void setExternal(int layer, OUString const & descriptor);
bool isExtension() const;
@@ -66,7 +65,7 @@ private:
// TYPE_HEXBINARY_LIST; not TYPE_ERROR or TYPE_NIL)
bool nillable_;
bool extension_;
rtl::OUString externalDescriptor_;
OUString externalDescriptor_;
com::sun::star::uno::Any value_;
};
configmgr/source/readonlyaccess.cxx
+9 -11
View File
@@ -74,15 +74,15 @@ public:
private:
virtual ~Service() {}
virtual rtl::OUString SAL_CALL getImplementationName()
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return read_only_access::getImplementationName(); }
virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &)
virtual sal_Bool SAL_CALL supportsService(OUString const &)
throw (css::uno::RuntimeException)
{ return false; }
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException)
{ return read_only_access::getSupportedServiceNames(); }
@@ -91,12 +91,12 @@ private:
throw (css::uno::Exception, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getByHierarchicalName(
rtl::OUString const & aName)
OUString const & aName)
throw (
css::container::NoSuchElementException, css::uno::RuntimeException)
{ return getRoot()->getByHierarchicalName(aName); }
virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
throw (css::uno::RuntimeException)
{ return getRoot()->hasByHierarchicalName(aName); }
@@ -145,14 +145,12 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.ReadOnlyAccess"));
OUString getImplementationName() {
return OUString("com.sun.star.comp.configuration.ReadOnlyAccess");
}
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
return css::uno::Sequence< rtl::OUString >();
css::uno::Sequence< OUString > getSupportedServiceNames() {
return css::uno::Sequence< OUString >();
}
} }
configmgr/source/readonlyaccess.hxx
+2 -3
View File
@@ -40,7 +40,6 @@ namespace com { namespace sun { namespace star {
class XInterface;
}
} } }
namespace rtl { class OUString; }
namespace configmgr { namespace read_only_access {
@@ -49,9 +48,9 @@ create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const &);
rtl::OUString SAL_CALL getImplementationName();
OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames();
} }
configmgr/source/readwriteaccess.cxx
+11 -15
View File
@@ -76,15 +76,15 @@ public:
private:
virtual ~Service() {}
virtual rtl::OUString SAL_CALL getImplementationName()
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
{ return read_write_access::getImplementationName(); }
virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &)
virtual sal_Bool SAL_CALL supportsService(OUString const &)
throw (css::uno::RuntimeException)
{ return false; }
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException)
{ return read_write_access::getSupportedServiceNames(); }
@@ -93,17 +93,17 @@ private:
throw (css::uno::Exception, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getByHierarchicalName(
rtl::OUString const & aName)
OUString const & aName)
throw (
css::container::NoSuchElementException, css::uno::RuntimeException)
{ return getRoot()->getByHierarchicalName(aName); }
virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
throw (css::uno::RuntimeException)
{ return getRoot()->hasByHierarchicalName(aName); }
virtual void SAL_CALL 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,
@@ -167,17 +167,13 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.ReadWriteAccess"));
OUString getImplementationName() {
return OUString("com.sun.star.comp.configuration.ReadWriteAccess");
}
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
rtl::OUString name(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ReadWriteAccess"));
return css::uno::Sequence< rtl::OUString >(&name, 1);
css::uno::Sequence< OUString > getSupportedServiceNames() {
OUString name("com.sun.star.configuration.ReadWriteAccess");
return css::uno::Sequence< OUString >(&name, 1);
}
} }
configmgr/source/readwriteaccess.hxx
+2 -3
View File
@@ -40,7 +40,6 @@ namespace com { namespace sun { namespace star {
class XInterface;
}
} } }
namespace rtl { class OUString; }
namespace configmgr { namespace read_write_access {
@@ -49,9 +48,9 @@ create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const &);
rtl::OUString SAL_CALL getImplementationName();
OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames();
} }
configmgr/source/rootaccess.cxx
+15 -19
View File
@@ -58,8 +58,8 @@
namespace configmgr {
RootAccess::RootAccess(
Components & components, rtl::OUString const & pathRepresentation,
rtl::OUString const & locale, bool update):
Components & components, OUString const & pathRepresentation,
OUString const & locale, bool update):
Access(components), pathRepresentation_(pathRepresentation),
locale_(locale), update_(update), finalized_(false), alive_(true)
{
@@ -101,12 +101,12 @@ void RootAccess::release() throw () {
Access::release();
}
rtl::OUString RootAccess::getAbsolutePathRepresentation() {
OUString RootAccess::getAbsolutePathRepresentation() {
getNode(); // turn pathRepresentation_ into canonic form
return pathRepresentation_;
}
rtl::OUString RootAccess::getLocale() const {
OUString RootAccess::getLocale() const {
return locale_;
}
@@ -128,7 +128,7 @@ void RootAccess::addChangesListener(
checkLocalizedPropertyAccess();
if (!aListener.is()) {
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
OUString("null listener"),
static_cast< cppu::OWeakObject * >(this));
}
if (!isDisposed()) {
@@ -214,19 +214,19 @@ Path RootAccess::getRelativePath() {
return Path();
}
rtl::OUString RootAccess::getRelativePathRepresentation() {
return rtl::OUString();
OUString RootAccess::getRelativePathRepresentation() {
return OUString();
}
rtl::Reference< Node > RootAccess::getNode() {
if (!node_.is()) {
rtl::OUString canonic;
OUString canonic;
int finalizedLayer;
node_ = getComponents().resolvePathRepresentation(
pathRepresentation_, &canonic, &path_, &finalizedLayer);
if (!node_.is()) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot find ")) +
(OUString("cannot find ") +
pathRepresentation_),
0);
// RootAccess::queryInterface indirectly calls
@@ -250,7 +250,7 @@ bool RootAccess::isFinalized() {
return finalized_;
}
rtl::OUString RootAccess::getNameInternal() {
OUString RootAccess::getNameInternal() {
getNode();
return name_;
}
@@ -270,18 +270,14 @@ void RootAccess::addTypes(std::vector< css::uno::Type > * types) const {
}
void RootAccess::addSupportedServiceNames(
std::vector< rtl::OUString > * services)
std::vector< OUString > * services)
{
assert(services != 0);
services->push_back(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.AccessRootElement")));
OUString("com.sun.star.configuration.AccessRootElement"));
if (update_) {
services->push_back(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.UpdateRootElement")));
OUString("com.sun.star.configuration.UpdateRootElement"));
}
}
@@ -324,13 +320,13 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
return res;
}
rtl::OUString RootAccess::getImplementationName()
OUString RootAccess::getImplementationName()
throw (css::uno::RuntimeException)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("configmgr.RootAccess"));
return OUString("configmgr.RootAccess");
}
}
configmgr/source/rootaccess.hxx
+11 -11
View File
@@ -59,8 +59,8 @@ class RootAccess:
{
public:
RootAccess(
Components & components, rtl::OUString const & pathRepresenation,
rtl::OUString const & locale, bool update);
Components & components, OUString const & pathRepresenation,
OUString const & locale, bool update);
virtual Path getAbsolutePath();
@@ -71,9 +71,9 @@ public:
virtual void SAL_CALL release() throw ();
rtl::OUString getAbsolutePathRepresentation();
OUString getAbsolutePathRepresentation();
rtl::OUString getLocale() const;
OUString getLocale() const;
bool isUpdate() const;
@@ -105,13 +105,13 @@ private:
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();
@@ -121,7 +121,7 @@ private:
const;
virtual void addSupportedServiceNames(
std::vector< rtl::OUString > * services);
std::vector< OUString > * services);
virtual void initDisposeBroadcaster(Broadcaster * broadcaster);
@@ -131,7 +131,7 @@ private:
com::sun::star::uno::Type const & aType)
throw (com::sun::star::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getImplementationName()
virtual OUString SAL_CALL getImplementationName()
throw (com::sun::star::uno::RuntimeException);
typedef
@@ -140,11 +140,11 @@ private:
com::sun::star::util::XChangesListener > >
ChangesListeners;
rtl::OUString pathRepresentation_;
rtl::OUString locale_;
OUString pathRepresentation_;
OUString locale_;
Path path_;
rtl::Reference< Node > node_;
rtl::OUString name_;
OUString name_;
ChangesListeners changesListeners_;
boost::shared_ptr<osl::Mutex> lock_;
configmgr/source/setnode.cxx
+10 -10
View File
@@ -38,24 +38,24 @@ namespace {
// Work around some compilers' failure to accept
// std::binder1st(std::ptr_fun(&Data::equalTemplateNames), ...):
class EqualTemplateNames:
public std::unary_function< rtl::OUString const &, bool >
public std::unary_function< OUString const &, bool >
{
public:
inline explicit EqualTemplateNames(rtl::OUString const & shortName):
inline explicit EqualTemplateNames(OUString const & shortName):
shortName_(shortName) {}
inline bool operator ()(rtl::OUString const & longName) const
inline bool operator ()(OUString const & longName) const
{ return Data::equalTemplateNames(shortName_, longName); }
private:
rtl::OUString const & shortName_;
OUString const & shortName_;
};
}
SetNode::SetNode(
int layer, rtl::OUString const & defaultTemplateName,
rtl::OUString const & templateName):
int layer, OUString const & defaultTemplateName,
OUString const & templateName):
Node(layer), defaultTemplateName_(defaultTemplateName),
templateName_(templateName), mandatory_(Data::NO_LAYER)
{}
@@ -68,7 +68,7 @@ NodeMap & SetNode::getMembers() {
return members_;
}
rtl::OUString SetNode::getTemplateName() const {
OUString SetNode::getTemplateName() const {
return templateName_;
}
@@ -80,15 +80,15 @@ int SetNode::getMandatory() const {
return mandatory_;
}
rtl::OUString const & SetNode::getDefaultTemplateName() const {
OUString const & SetNode::getDefaultTemplateName() const {
return defaultTemplateName_;
}
std::vector< rtl::OUString > & SetNode::getAdditionalTemplateNames() {
std::vector< OUString > & SetNode::getAdditionalTemplateNames() {
return additionalTemplateNames_;
}
bool SetNode::isValidTemplate(rtl::OUString const & templateName) const {
bool SetNode::isValidTemplate(OUString const & templateName) const {
return Data::equalTemplateNames(templateName, defaultTemplateName_) ||
(std::find_if(
additionalTemplateNames_.begin(),
configmgr/source/setnode.hxx
+10 -10
View File
@@ -35,24 +35,24 @@ namespace configmgr {
class SetNode: public Node {
public:
SetNode(
int layer, rtl::OUString const & defaultTemplateName,
rtl::OUString const & templateName);
int layer, OUString const & defaultTemplateName,
OUString const & templateName);
virtual rtl::Reference< Node > clone(bool keepTemplateName) const;
virtual NodeMap & getMembers();
virtual rtl::OUString getTemplateName() const;
virtual OUString getTemplateName() const;
virtual void setMandatory(int layer);
virtual int getMandatory() const;
rtl::OUString const & getDefaultTemplateName() const;
OUString const & getDefaultTemplateName() const;
std::vector< rtl::OUString > & getAdditionalTemplateNames();
std::vector< OUString > & getAdditionalTemplateNames();
bool isValidTemplate(rtl::OUString const & templateName) const;
bool isValidTemplate(OUString const & templateName) const;
private:
SetNode(SetNode const & other, bool keepTemplateName);
@@ -63,11 +63,11 @@ private:
virtual void clear();
rtl::OUString defaultTemplateName_;
std::vector< rtl::OUString > additionalTemplateNames_;
OUString defaultTemplateName_;
std::vector< OUString > additionalTemplateNames_;
NodeMap members_;
rtl::OUString templateName_;
// non-empty iff this node is a template, free node, or set member
OUString templateName_;
// non-empty if this node is a template, free node, or set member
int mandatory_;
};
configmgr/source/type.cxx
+5 -5
View File
@@ -61,7 +61,7 @@ Type elementType(Type type) {
default:
assert(false);
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
OUString("this cannot happen"),
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -81,7 +81,7 @@ css::uno::Type mapType(Type type) {
case TYPE_DOUBLE:
return cppu::UnoType< double >::get();
case TYPE_STRING:
return cppu::UnoType< rtl::OUString >::get();
return cppu::UnoType< OUString >::get();
case TYPE_HEXBINARY:
return cppu::UnoType< css::uno::Sequence< sal_Int8 > >::get();
case TYPE_BOOLEAN_LIST:
@@ -95,14 +95,14 @@ css::uno::Type mapType(Type type) {
case TYPE_DOUBLE_LIST:
return cppu::UnoType< css::uno::Sequence< double > >::get();
case TYPE_STRING_LIST:
return cppu::UnoType< css::uno::Sequence< rtl::OUString > >::get();
return cppu::UnoType< css::uno::Sequence< OUString > >::get();
case TYPE_HEXBINARY_LIST:
return cppu::UnoType<
css::uno::Sequence< css::uno::Sequence< sal_Int8 > > >::get();
default:
assert(false);
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
OUString("this cannot happen"),
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -134,7 +134,7 @@ Type getDynamicType(css::uno::Any const & value) {
return TYPE_STRING;
case css::uno::TypeClass_SEQUENCE: //TODO
{
rtl::OUString name(value.getValueType().getTypeName());
OUString name(value.getValueType().getTypeName());
if ( name == "[]byte" ) {
return TYPE_HEXBINARY;
} else if (name.equalsAsciiL(
configmgr/source/update.cxx
+20 -23
View File
@@ -49,10 +49,10 @@ namespace configmgr { namespace update {
namespace {
std::set< rtl::OUString > seqToSet(
css::uno::Sequence< rtl::OUString > const & sequence)
std::set< OUString > seqToSet(
css::uno::Sequence< OUString > const & sequence)
{
return std::set< rtl::OUString >(
return std::set< OUString >(
sequence.getConstArray(),
sequence.getConstArray() + sequence.getLength());
}
@@ -73,20 +73,20 @@ private:
virtual ~Service() {}
virtual void SAL_CALL insertExtensionXcsFile(
sal_Bool shared, rtl::OUString const & fileUri)
sal_Bool shared, OUString const & fileUri)
throw (css::uno::RuntimeException);
virtual void SAL_CALL insertExtensionXcuFile(
sal_Bool shared, rtl::OUString const & fileUri)
sal_Bool shared, OUString const & fileUri)
throw (css::uno::RuntimeException);
virtual void SAL_CALL removeExtensionXcuFile(rtl::OUString const & fileUri)
virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri)
throw (css::uno::RuntimeException);
virtual void SAL_CALL insertModificationXcuFile(
rtl::OUString const & fileUri,
css::uno::Sequence< rtl::OUString > const & includedPaths,
css::uno::Sequence< rtl::OUString > const & excludedPaths)
OUString const & fileUri,
css::uno::Sequence< OUString > const & includedPaths,
css::uno::Sequence< OUString > const & excludedPaths)
throw (css::uno::RuntimeException);
boost::shared_ptr<osl::Mutex> lock_;
@@ -94,7 +94,7 @@ private:
};
void Service::insertExtensionXcsFile(
sal_Bool shared, rtl::OUString const & fileUri)
sal_Bool shared, OUString const & fileUri)
throw (css::uno::RuntimeException)
{
osl::MutexGuard g(*lock_);
@@ -102,7 +102,7 @@ void Service::insertExtensionXcsFile(
}
void Service::insertExtensionXcuFile(
sal_Bool shared, rtl::OUString const & fileUri)
sal_Bool shared, OUString const & fileUri)
throw (css::uno::RuntimeException)
{
Broadcaster bc;
@@ -117,7 +117,7 @@ void Service::insertExtensionXcuFile(
bc.send();
}
void Service::removeExtensionXcuFile(rtl::OUString const & fileUri)
void Service::removeExtensionXcuFile(OUString const & fileUri)
throw (css::uno::RuntimeException)
{
Broadcaster bc;
@@ -133,9 +133,9 @@ void Service::removeExtensionXcuFile(rtl::OUString const & fileUri)
}
void Service::insertModificationXcuFile(
rtl::OUString const & fileUri,
css::uno::Sequence< rtl::OUString > const & includedPaths,
css::uno::Sequence< rtl::OUString > const & excludedPaths)
OUString const & fileUri,
css::uno::Sequence< OUString > const & includedPaths,
css::uno::Sequence< OUString > const & excludedPaths)
throw (css::uno::RuntimeException)
{
Broadcaster bc;
@@ -159,16 +159,13 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service(context));
}
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.Update"));
OUString getImplementationName() {
return OUString("com.sun.star.comp.configuration.Update");
}
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
rtl::OUString name(
RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.Update_Service"));
return css::uno::Sequence< rtl::OUString >(&name, 1);
css::uno::Sequence< OUString > getSupportedServiceNames() {
OUString name("com.sun.star.configuration.Update_Service");
return css::uno::Sequence< OUString >(&name, 1);
}
} }
configmgr/source/update.hxx
+2 -3
View File
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star {
class XInterface;
}
} } }
namespace rtl { class OUString; }
namespace configmgr { namespace update {
@@ -41,9 +40,9 @@ create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const &);
rtl::OUString SAL_CALL getImplementationName();
OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames();
} }
configmgr/source/valueparser.cxx
+13 -16
View File
@@ -139,7 +139,7 @@ bool parseValue(xmlreader::Span const & text, double * value) {
return true;
}
bool parseValue(xmlreader::Span const & text, rtl::OUString * value) {
bool parseValue(xmlreader::Span const & text, OUString * value) {
assert(text.is() && value != 0);
*value = text.convertFromUtf8();
return true;
@@ -173,7 +173,7 @@ template< typename T > css::uno::Any parseSingleValue(
T val;
if (!parseValue(text, &val)) {
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")),
OUString("invalid value"),
css::uno::Reference< css::uno::XInterface >());
}
return css::uno::makeAny(val);
@@ -198,7 +198,7 @@ template< typename T > css::uno::Any parseListValue(
xmlreader::Span(t.begin, i == -1 ? t.length : i), &val))
{
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")),
OUString("invalid value"),
css::uno::Reference< css::uno::XInterface >());
}
seq.push_back(val);
@@ -218,8 +218,7 @@ css::uno::Any parseValue(
switch (type) {
case TYPE_ANY:
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("invalid value of type any")),
OUString("invalid value of type any"),
css::uno::Reference< css::uno::XInterface >());
case TYPE_BOOLEAN:
return parseSingleValue< sal_Bool >(text);
@@ -232,7 +231,7 @@ css::uno::Any parseValue(
case TYPE_DOUBLE:
return parseSingleValue< double >(text);
case TYPE_STRING:
return parseSingleValue< rtl::OUString >(text);
return parseSingleValue< OUString >(text);
case TYPE_HEXBINARY:
return parseSingleValue< css::uno::Sequence< sal_Int8 > >(text);
case TYPE_BOOLEAN_LIST:
@@ -246,14 +245,14 @@ css::uno::Any parseValue(
case TYPE_DOUBLE_LIST:
return parseListValue< double >(separator, text);
case TYPE_STRING_LIST:
return parseListValue< rtl::OUString >(separator, text);
return parseListValue< OUString >(separator, text);
case TYPE_HEXBINARY_LIST:
return parseListValue< css::uno::Sequence< sal_Int8 > >(
separator, text);
default:
assert(false);
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
OUString("this cannot happen"),
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -287,7 +286,7 @@ xmlreader::XmlReader::Text ValueParser::getTextMode() const {
bool ValueParser::startElement(
xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
std::set< rtl::OUString > const *)
std::set< OUString > const *)
{
if (!node_.is()) {
return false;
@@ -337,9 +336,7 @@ bool ValueParser::startElement(
pad_.add(RTL_CONSTASCII_STRINGPARAM("\xEF\xBF\xBF"));
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad unicode scalar attribute in ")) +
(OUString("bad unicode scalar attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -351,9 +348,9 @@ bool ValueParser::startElement(
break;
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
(OUString("bad member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
OUString("> in ") + reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -386,7 +383,7 @@ bool ValueParser::endElement() {
value = convertItems< double >();
break;
case TYPE_STRING_LIST:
value = convertItems< rtl::OUString >();
value = convertItems< OUString >();
break;
case TYPE_HEXBINARY_LIST:
value = convertItems< css::uno::Sequence< sal_Int8 > >();
@@ -447,7 +444,7 @@ void ValueParser::characters(xmlreader::Span const & text) {
}
void ValueParser::start(
rtl::Reference< Node > const & node, rtl::OUString const & localizedName)
rtl::Reference< Node > const & node, OUString const & localizedName)
{
assert(node.is() && !node_.is());
node_ = node;
configmgr/source/valueparser.hxx
+2 -2
View File
@@ -61,7 +61,7 @@ public:
void start(
rtl::Reference< Node > const & property,
rtl::OUString const & localizedName = rtl::OUString());
OUString const & localizedName = OUString());
int getLayer() const;
@@ -75,7 +75,7 @@ private:
int layer_;
rtl::Reference< Node > node_;
rtl::OUString localizedName_;
OUString localizedName_;
State state_;
xmlreader::Pad pad_;
std::vector< com::sun::star::uno::Any > items_;
configmgr/source/writemodfile.cxx
+20 -23
View File
@@ -58,7 +58,7 @@ class Components;
namespace {
rtl::OString convertToUtf8(
rtl::OUString const & text, sal_Int32 offset, sal_Int32 length)
OUString const & text, sal_Int32 offset, sal_Int32 length)
{
assert(offset <= text.getLength() && text.getLength() - offset >= length);
rtl::OString s;
@@ -69,7 +69,7 @@ rtl::OString convertToUtf8(
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
throw css::uno::RuntimeException(
rtl::OUString(
OUString(
RTL_CONSTASCII_USTRINGPARAM("cannot convert to UTF-8")),
css::uno::Reference< css::uno::XInterface >());
}
@@ -77,7 +77,7 @@ rtl::OString convertToUtf8(
}
struct TempFile: public boost::noncopyable {
rtl::OUString url;
OUString url;
oslFileHandle handle;
bool closed;
@@ -111,7 +111,7 @@ void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) {
n != static_cast< sal_uInt32 >(length))
{
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("write failure")),
OUString("write failure"),
css::uno::Reference< css::uno::XInterface >());
}
}
@@ -120,7 +120,7 @@ void writeData(oslFileHandle handle, rtl::OString const & text) {
writeData(handle, text.getStr(), text.getLength());
}
void writeAttributeValue(oslFileHandle handle, rtl::OUString const & value) {
void writeAttributeValue(oslFileHandle handle, OUString const & value) {
sal_Int32 i = 0;
sal_Int32 j = i;
for (; j < value.getLength(); ++j) {
@@ -189,7 +189,7 @@ void writeValueContent(oslFileHandle handle, double value) {
writeData(handle, rtl::OString::valueOf(value));
}
void writeValueContent(oslFileHandle handle, rtl::OUString const & value) {
void writeValueContent(oslFileHandle handle, OUString const & value) {
sal_Int32 i = 0;
sal_Int32 j = i;
for (; j < value.getLength(); ++j) {
@@ -296,7 +296,7 @@ void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) {
writeSingleValue< double >(handle, value);
break;
case TYPE_STRING:
writeSingleValue< rtl::OUString >(handle, value);
writeSingleValue< OUString >(handle, value);
break;
case TYPE_HEXBINARY:
writeSingleValue< css::uno::Sequence< sal_Int8 > >(handle, value);
@@ -317,7 +317,7 @@ void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) {
writeListValue< double >(handle, value);
break;
case TYPE_STRING_LIST:
writeItemListValue< rtl::OUString >(handle, value);
writeItemListValue< OUString >(handle, value);
break;
case TYPE_HEXBINARY_LIST:
writeItemListValue< css::uno::Sequence< sal_Int8 > >(handle, value);
@@ -329,7 +329,7 @@ void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) {
void writeNode(
Components & components, oslFileHandle handle,
rtl::Reference< Node > const & parent, rtl::OUString const & name,
rtl::Reference< Node > const & parent, OUString const & name,
rtl::Reference< Node > const & node)
{
static xmlreader::Span const typeNames[] = {
@@ -446,8 +446,8 @@ void writeNode(
void writeModifications(
Components & components, oslFileHandle handle,
rtl::OUString const & parentPathRepresentation,
rtl::Reference< Node > const & parent, rtl::OUString const & nodeName,
OUString const & parentPathRepresentation,
rtl::Reference< Node > const & parent, OUString const & nodeName,
rtl::Reference< Node > const & node,
Modifications::Node const & modifications)
{
@@ -500,9 +500,9 @@ void writeModifications(
writeData(handle, RTL_CONSTASCII_STRINGPARAM("</item>\n"));
} else {
assert(node.is());
rtl::OUString pathRep(
OUString pathRep(
parentPathRepresentation +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
OUString("/") +
Data::createSegment(node->getTemplateName(), nodeName));
for (Modifications::Node::Children::const_iterator i(
modifications.children.begin());
@@ -518,11 +518,11 @@ void writeModifications(
}
void writeModFile(
Components & components, rtl::OUString const & url, Data const & data)
Components & components, OUString const & url, Data const & data)
{
sal_Int32 i = url.lastIndexOf('/');
assert(i != -1);
rtl::OUString dir(url.copy(0, i));
OUString dir(url.copy(0, i));
switch (osl::Directory::createPath(dir)) {
case osl::FileBase::E_None:
case osl::FileBase::E_EXIST:
@@ -535,8 +535,7 @@ void writeModFile(
return;
default:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("cannot create directory ")) +
(OUString("cannot create directory ") +
dir),
css::uno::Reference< css::uno::XInterface >());
}
@@ -552,9 +551,7 @@ void writeModFile(
return;
default:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"cannot create temporary file in ")) +
(OUString("cannot create temporary file in ") +
dir),
css::uno::Reference< css::uno::XInterface >());
}
@@ -573,7 +570,7 @@ void writeModFile(
j != data.modifications.getRoot().children.end(); ++j)
{
writeModifications(
components, tmp.handle, rtl::OUString(), rtl::Reference< Node >(),
components, tmp.handle, OUString(), rtl::Reference< Node >(),
j->first,
Data::findNode(Data::NO_LAYER, data.getComponents(), j->first),
j->second);
@@ -583,13 +580,13 @@ void writeModFile(
tmp.closed = true;
if (e != osl_File_E_None) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot close ")) +
(OUString("cannot close ") +
tmp.url),
css::uno::Reference< css::uno::XInterface >());
}
if (osl::File::move(tmp.url, url) != osl::FileBase::E_None) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot move ")) +
(OUString("cannot move ") +
tmp.url),
css::uno::Reference< css::uno::XInterface >());
}
configmgr/source/writemodfile.hxx
+1 -2
View File
@@ -22,7 +22,6 @@
#include "sal/config.h"
namespace rtl { class OUString; }
namespace configmgr {
@@ -30,7 +29,7 @@ class Components;
struct Data;
void writeModFile(
Components & components, rtl::OUString const & url, Data const & data);
Components & components, OUString const & url, Data const & data);
}
configmgr/source/xcdparser.cxx
+5 -9
View File
@@ -101,18 +101,14 @@ bool XcdParser::startElement(
}
if (!attrFile.is()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"no dependency file attribute in ")) +
(OUString("no dependency file attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
dependencyFile_ = attrFile.convertFromUtf8();
if (dependencyFile_.isEmpty()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad dependency file attribute in ")) +
(OUString("bad dependency file attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -126,7 +122,7 @@ bool XcdParser::startElement(
return false;
}
state_ = STATE_DEPENDENCY;
dependencyFile_ = rtl::OUString();
dependencyFile_ = OUString();
return true;
}
state_ = STATE_COMPONENTS;
@@ -154,9 +150,9 @@ bool XcdParser::startElement(
break;
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
(OUString("bad member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
OUString("> in ") + reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
configmgr/source/xcdparser.hxx
+1 -1
View File
@@ -62,7 +62,7 @@ private:
std::set< OUString > const & processedDependencies_;
Data & data_;
State state_;
rtl::OUString dependencyFile_;
OUString dependencyFile_;
bool dependencyOptional_;
rtl::Reference< Parser > nestedParser_;
long nesting_;
configmgr/source/xcsparser.cxx
+33 -51
View File
@@ -173,7 +173,7 @@ bool XcsParser::startElement(
elements_.push(
Element(
new GroupNode(
valueParser_.getLayer(), false, rtl::OUString()),
valueParser_.getLayer(), false, OUString()),
componentName_));
return true;
}
@@ -256,9 +256,9 @@ bool XcsParser::startElement(
}
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
(OUString("bad member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
OUString("> in ") + reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -301,8 +301,7 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
default:
assert(false);
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("this cannot happen")),
OUString("this cannot happen"),
css::uno::Reference< css::uno::XInterface >());
}
} else {
@@ -310,10 +309,9 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
NodeMap::value_type(top.name, top.node)).second)
{
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("duplicate ")) +
(OUString("duplicate ") +
top.name +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -331,8 +329,7 @@ void XcsParser::endElement(xmlreader::XmlReader const & reader) {
break;
case STATE_TEMPLATES_DONE:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no component element in ")) +
(OUString("no component element in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
case STATE_COMPONENT_DONE:
@@ -364,10 +361,8 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
{
if (hasPackage) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"multiple component-schema package attributes"
" in ")) +
(OUString("multiple component-schema package attributes"
" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -379,9 +374,7 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
{
if (hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"multiple component-schema name attributes in ")) +
(OUString("multiple component-schema name attributes in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -392,17 +385,13 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
}
if (!hasPackage) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"no component-schema package attribute in ")) +
(OUString("no component-schema package attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"no component-schema name attribute in ")) +
(OUString("no component-schema name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -412,10 +401,10 @@ void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
bool hasName = false;
rtl::OUString name;
rtl::OUString component(componentName_);
OUString name;
OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
OUString nodeType;
for (;;) {
int attrNsId;
xmlreader::Span attrLn;
@@ -440,8 +429,7 @@ void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no node-ref name attribute in ")) +
(OUString("no node-ref name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -454,8 +442,8 @@ void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
//TODO: this can erroneously happen as long as import/uses attributes
// are not correctly processed
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unknown node-ref ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("unknown node-ref ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -466,7 +454,7 @@ void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
void XcsParser::handleProp(xmlreader::XmlReader & reader) {
bool hasName = false;
rtl::OUString name;
OUString name;
valueParser_.type_ = TYPE_ERROR;
bool localized = false;
bool nillable = true;
@@ -498,15 +486,13 @@ void XcsParser::handleProp(xmlreader::XmlReader & reader) {
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no prop name attribute in ")) +
(OUString("no prop name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
if (valueParser_.type_ == TYPE_ERROR) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no prop type attribute in ")) +
(OUString("no prop type attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -539,9 +525,7 @@ void XcsParser::handlePropValue(
attrSeparator = reader.getAttributeValue(false);
if (attrSeparator.length == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad oor:separator attribute in ")) +
(OUString("bad oor:separator attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -554,7 +538,7 @@ void XcsParser::handlePropValue(
void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) {
bool hasName = false;
rtl::OUString name;
OUString name;
bool extensible = false;
for (;;) {
int attrNsId;
@@ -575,8 +559,7 @@ void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) {
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no group name attribute in ")) +
(OUString("no group name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -587,16 +570,16 @@ void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) {
Element(
new GroupNode(
valueParser_.getLayer(), extensible,
isTemplate ? name : rtl::OUString()),
isTemplate ? name : OUString()),
name));
}
void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) {
bool hasName = false;
rtl::OUString name;
rtl::OUString component(componentName_);
OUString name;
OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
OUString nodeType;
for (;;) {
int attrNsId;
xmlreader::Span attrLn;
@@ -621,8 +604,7 @@ void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) {
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no set name attribute in ")) +
(OUString("no set name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -635,14 +617,14 @@ void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) {
valueParser_.getLayer(),
xmldata::parseTemplateReference(
component, hasNodeType, nodeType, 0),
isTemplate ? name : rtl::OUString()),
isTemplate ? name : OUString()),
name));
}
void XcsParser::handleSetItem(xmlreader::XmlReader & reader, SetNode * set) {
rtl::OUString component(componentName_);
OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
OUString nodeType;
for (;;) {
int attrNsId;
xmlreader::Span attrLn;
@@ -662,7 +644,7 @@ void XcsParser::handleSetItem(xmlreader::XmlReader & reader, SetNode * set) {
}
set->getAdditionalTemplateNames().push_back(
xmldata::parseTemplateReference(component, hasNodeType, nodeType, 0));
elements_.push(Element(rtl::Reference< Node >(), rtl::OUString()));
elements_.push(Element(rtl::Reference< Node >(), OUString()));
}
}
configmgr/source/xcsparser.hxx
+4 -4
View File
@@ -51,7 +51,7 @@ private:
virtual bool startElement(
xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name,
std::set< rtl::OUString > const * existingDependencies);
std::set< OUString > const * existingDependencies);
virtual void endElement(xmlreader::XmlReader const & reader);
@@ -78,11 +78,11 @@ private:
struct Element {
rtl::Reference< Node > node;
rtl::OUString name;
OUString name;
inline Element(
rtl::Reference< Node > const & theNode,
rtl::OUString const & theName):
OUString const & theName):
node(theNode), name(theName) {}
};
@@ -90,7 +90,7 @@ private:
ValueParser valueParser_;
Data & data_;
rtl::OUString componentName_;
OUString componentName_;
State state_;
long ignoring_;
ElementStack elements_;
configmgr/source/xcuparser.cxx
+68 -122
View File
@@ -89,10 +89,9 @@ bool XcuParser::startElement(
state_.push(State(rtl::Reference< Node >(), false));
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad root element <")) +
(OUString("bad root element <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -105,10 +104,9 @@ bool XcuParser::startElement(
handleItem(reader);
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad items node member <")) +
(OUString("bad items node member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -123,11 +121,9 @@ bool XcuParser::startElement(
dynamic_cast< PropertyNode * >(state_.top().node.get()));
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad property node member <")) +
(OUString("bad property node member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -142,20 +138,18 @@ bool XcuParser::startElement(
state_.top().node.get()));
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad localized property node member <")) +
(OUString("bad localized property node member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
break;
case Node::KIND_LOCALIZED_VALUE:
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
(OUString("bad member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
case Node::KIND_GROUP:
@@ -171,11 +165,9 @@ bool XcuParser::startElement(
handleGroupNode(reader, state_.top().node);
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad group node member <")) +
(OUString("bad group node member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -196,10 +188,9 @@ bool XcuParser::startElement(
state_.push(State(true)); // ignored
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad set node member <")) +
(OUString("bad set node member <") +
name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
OUString("> in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -219,7 +210,7 @@ void XcuParser::endElement(xmlreader::XmlReader const &) {
assert(!state_.empty());
bool pop = state_.top().pop;
rtl::Reference< Node > insert;
rtl::OUString name;
OUString name;
if (state_.top().insert) {
insert = state_.top().node;
assert(insert.is());
@@ -256,7 +247,7 @@ XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) {
return OPERATION_REMOVE;
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid op ")) +
(OUString("invalid op ") +
text.convertFromUtf8()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -279,10 +270,8 @@ void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
{
if (hasPackage) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"multiple component-update package attributes"
" in ")) +
(OUString("multiple component-update package attributes"
" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -294,9 +283,7 @@ void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
{
if (hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"multiple component-update name attributes in ")) +
(OUString("multiple component-update name attributes in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -315,17 +302,13 @@ void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
}
if (!hasPackage) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"no component-data package attribute in ")) +
(OUString("no component-data package attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"no component-data name attribute in ")) +
(OUString("no component-data name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -357,9 +340,7 @@ void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
break;
default:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"invalid operation on root node in ")) +
(OUString("invalid operation on root node in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -386,12 +367,11 @@ void XcuParser::handleItem(xmlreader::XmlReader & reader) {
}
if (!attrPath.is()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("missing path attribute in ")) +
(OUString("missing path attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
rtl::OUString path(attrPath.convertFromUtf8());
OUString path(attrPath.convertFromUtf8());
int finalizedLayer;
rtl::Reference< Node > node(
data_.resolvePathRepresentation(
@@ -438,7 +418,7 @@ void XcuParser::handlePropValue(
{
bool nil = false;
rtl::OString separator;
rtl::OUString external;
OUString external;
for (;;) {
int attrNsId;
xmlreader::Span attrLn;
@@ -456,8 +436,7 @@ void XcuParser::handlePropValue(
reader, reader.getAttributeValue(true));
if (valueParser_.type_ != TYPE_ANY && type != valueParser_.type_) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("invalid value type in ")) +
(OUString("invalid value type in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -468,9 +447,7 @@ void XcuParser::handlePropValue(
xmlreader::Span s(reader.getAttributeValue(false));
if (s.length == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad oor:separator attribute in ")) +
(OUString("bad oor:separator attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -481,9 +458,7 @@ void XcuParser::handlePropValue(
external = reader.getAttributeValue(true).convertFromUtf8();
if (external.isEmpty()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad oor:external attribute value in ")) +
(OUString("bad oor:external attribute value in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -492,17 +467,13 @@ void XcuParser::handlePropValue(
if (nil) {
if (!prop->isNillable()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"xsi:nil attribute for non-nillable prop in ")) +
(OUString("xsi:nil attribute for non-nillable prop in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
if (!external.isEmpty()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"xsi:nil and oor:external attributes for prop in ")) +
(OUString("xsi:nil and oor:external attributes for prop in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -520,7 +491,7 @@ void XcuParser::handlePropValue(
void XcuParser::handleLocpropValue(
xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop)
{
rtl::OUString name;
OUString name;
bool nil = false;
rtl::OString separator;
Operation op = OPERATION_FUSE;
@@ -545,8 +516,7 @@ void XcuParser::handleLocpropValue(
reader, reader.getAttributeValue(true));
if (valueParser_.type_ != TYPE_ANY && type != valueParser_.type_) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("invalid value type in ")) +
(OUString("invalid value type in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -557,9 +527,7 @@ void XcuParser::handleLocpropValue(
xmlreader::Span s(reader.getAttributeValue(false));
if (s.length == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad oor:separator attribute in ")) +
(OUString("bad oor:separator attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -587,9 +555,7 @@ void XcuParser::handleLocpropValue(
}
if (nil && !locprop->isNillable()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"xsi:nil attribute for non-nillable prop in ")) +
(OUString("xsi:nil attribute for non-nillable prop in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -631,9 +597,7 @@ void XcuParser::handleLocpropValue(
break;
default:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad op attribute for value element in ")) +
(OUString("bad op attribute for value element in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -643,7 +607,7 @@ void XcuParser::handleGroupProp(
xmlreader::XmlReader & reader, GroupNode * group)
{
bool hasName = false;
rtl::OUString name;
OUString name;
Type type = TYPE_ERROR;
Operation op = OPERATION_MODIFY;
bool finalized = false;
@@ -674,8 +638,7 @@ void XcuParser::handleGroupProp(
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no prop name attribute in ")) +
(OUString("no prop name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -707,9 +670,8 @@ void XcuParser::handleGroupProp(
break;
default:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("inappropriate prop ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("inappropriate prop ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -718,7 +680,7 @@ void XcuParser::handleGroupProp(
void XcuParser::handleUnknownGroupProp(
xmlreader::XmlReader const & reader, GroupNode * group,
rtl::OUString const & name, Type type, Operation operation, bool finalized)
OUString const & name, Type type, Operation operation, bool finalized)
{
switch (operation) {
case OPERATION_REPLACE:
@@ -726,10 +688,8 @@ void XcuParser::handleUnknownGroupProp(
if (group->isExtensible()) {
if (type == TYPE_ERROR) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"missing type attribute for prop ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("missing type attribute for prop ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -758,7 +718,7 @@ void XcuParser::handleUnknownGroupProp(
void XcuParser::handlePlainGroupProp(
xmlreader::XmlReader const & reader, GroupNode * group,
NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
NodeMap::iterator const & propertyIndex, OUString const & name,
Type type, Operation operation, bool finalized)
{
PropertyNode * property = dynamic_cast< PropertyNode * >(
@@ -775,9 +735,8 @@ void XcuParser::handlePlainGroupProp(
type != property->getStaticType())
{
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("invalid type for prop ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("invalid type for prop ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -796,10 +755,8 @@ void XcuParser::handlePlainGroupProp(
case OPERATION_REMOVE:
if (!property->isExtension()) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"invalid remove of non-extension prop ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("invalid remove of non-extension prop ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -812,7 +769,7 @@ void XcuParser::handlePlainGroupProp(
void XcuParser::handleLocalizedGroupProp(
xmlreader::XmlReader const & reader, LocalizedPropertyNode * property,
rtl::OUString const & name, Type type, Operation operation, bool finalized)
OUString const & name, Type type, Operation operation, bool finalized)
{
if (property->getLayer() > valueParser_.getLayer()) {
state_.push(State(true)); // ignored
@@ -826,9 +783,8 @@ void XcuParser::handleLocalizedGroupProp(
type != property->getStaticType())
{
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("invalid type for prop ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("invalid type for prop ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -859,10 +815,8 @@ void XcuParser::handleLocalizedGroupProp(
break;
case OPERATION_REMOVE:
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"invalid remove of non-extension prop ")) +
name + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
(OUString("invalid remove of non-extension prop ") +
name + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -872,7 +826,7 @@ void XcuParser::handleGroupNode(
xmlreader::XmlReader & reader, rtl::Reference< Node > const & group)
{
bool hasName = false;
rtl::OUString name;
OUString name;
Operation op = OPERATION_MODIFY;
bool finalized = false;
for (;;) {
@@ -898,8 +852,7 @@ void XcuParser::handleGroupNode(
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no node name attribute in ")) +
(OUString("no node name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -923,18 +876,15 @@ void XcuParser::handleGroupNode(
Node::Kind kind = child->kind();
if (kind != Node::KIND_GROUP && kind != Node::KIND_SET) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad <node> \"")) +
(OUString("bad <node> \"") +
name +
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("\" of non group/set kind in ")) +
OUString("\" of non group/set kind in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
if (op != OPERATION_MODIFY && op != OPERATION_FUSE) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"invalid operation on group node in ")) +
(OUString("invalid operation on group node in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -950,10 +900,10 @@ void XcuParser::handleGroupNode(
void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
bool hasName = false;
rtl::OUString name;
rtl::OUString component(componentName_);
OUString name;
OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
OUString nodeType;
Operation op = OPERATION_MODIFY;
bool finalized = false;
bool mandatory = false;
@@ -993,8 +943,7 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
}
if (!hasName) {
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("no node name attribute in ")) +
(OUString("no node name attribute in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -1006,16 +955,15 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
return;
}
}
rtl::OUString templateName(
OUString templateName(
xmldata::parseTemplateReference(
component, hasNodeType, nodeType, &set->getDefaultTemplateName()));
if (!set->isValidTemplate(templateName)) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("set member node ")) +
(OUString("set member node ") +
name +
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(" references invalid template ")) +
templateName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
OUString(" references invalid template ") +
templateName + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -1023,12 +971,10 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
data_.getTemplate(valueParser_.getLayer(), templateName));
if (!tmpl.is()) {
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("set member node ")) +
(OUString("set member node ") +
name +
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
" references undefined template ")) +
templateName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" in ")) +
OUString(" references undefined template ") +
templateName + OUString(" in ") +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
configmgr/source/xcuparser.hxx
+7 -7
View File
@@ -87,17 +87,17 @@ private:
void handleUnknownGroupProp(
xmlreader::XmlReader const & reader, GroupNode * group,
rtl::OUString const & name, Type type, Operation operation,
OUString const & name, Type type, Operation operation,
bool finalized);
void handlePlainGroupProp(
xmlreader::XmlReader const & reader, GroupNode * group,
NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
NodeMap::iterator const & propertyIndex, OUString const & name,
Type type, Operation operation, bool finalized);
void handleLocalizedGroupProp(
xmlreader::XmlReader const & reader, LocalizedPropertyNode * property,
rtl::OUString const & name, Type type, Operation operation,
OUString const & name, Type type, Operation operation,
bool finalized);
void handleGroupNode(
@@ -108,8 +108,8 @@ private:
void recordModification(bool addition);
struct State {
rtl::Reference< Node > node; // empty iff ignore or <items>
rtl::OUString name; // empty and ignored if !insert
rtl::Reference< Node > node; // empty if ignore or <items>
OUString name; // empty and ignored if !insert
bool ignore;
bool insert;
bool locked;
@@ -126,7 +126,7 @@ private:
inline State(
rtl::Reference< Node > const & theNode,
rtl::OUString const & theName, bool theLocked):
OUString const & theName, bool theLocked):
node(theNode), name(theName), ignore(false), insert(true),
locked(theLocked), pop(true)
{}
@@ -141,7 +141,7 @@ private:
Additions * additions_;
bool recordModifications_;
bool trackPath_;
rtl::OUString componentName_;
OUString componentName_;
StateStack state_;
Path path_;
};
configmgr/source/xmldata.cxx
+6 -7
View File
@@ -145,7 +145,7 @@ Type parseType(
}
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid type ")) +
(OUString("invalid type ") +
text.convertFromUtf8()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -159,22 +159,21 @@ bool parseBoolean(xmlreader::Span const & text) {
return false;
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid boolean ")) +
(OUString("invalid boolean ") +
text.convertFromUtf8()),
css::uno::Reference< css::uno::XInterface >());
}
rtl::OUString parseTemplateReference(
rtl::OUString const & component, bool hasNodeType,
rtl::OUString const & nodeType, rtl::OUString const * defaultTemplateName)
OUString parseTemplateReference(
OUString const & component, bool hasNodeType,
OUString const & nodeType, OUString const * defaultTemplateName)
{
if (!hasNodeType) {
if (defaultTemplateName != 0) {
return *defaultTemplateName;
}
throw css::uno::RuntimeException(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("missing node-type attribute")),
OUString("missing node-type attribute"),
css::uno::Reference< css::uno::XInterface >());
}
return Data::fullTemplateName(component, nodeType);
configmgr/source/xmldata.hxx
+3 -4
View File
@@ -24,7 +24,6 @@
#include "type.hxx"
namespace rtl { class OUString; }
namespace xmlreader {
class XmlReader;
struct Span;
@@ -39,9 +38,9 @@ Type parseType(
bool parseBoolean(xmlreader::Span const & text);
rtl::OUString parseTemplateReference(
rtl::OUString const & component, bool hasNodeType,
rtl::OUString const & nodeType, rtl::OUString const * defaultTemplateName);
OUString parseTemplateReference(
OUString const & component, bool hasNodeType,
OUString const & nodeType, OUString const * defaultTemplateName);
}