summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/inc/pch/precompiled_configmgr.hxx1
-rw-r--r--configmgr/source/access.cxx22
-rw-r--r--configmgr/source/rootaccess.cxx10
-rw-r--r--configmgr/source/valueparser.cxx10
4 files changed, 21 insertions, 22 deletions
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index d924b7bc02e9..4a1909c8b55f 100644
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
@@ -99,7 +99,6 @@
#include <com/sun/star/util/XFlushable.hpp>
#include <com/sun/star/util/XRefreshListener.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
-#include <comphelper/sequenceasvector.hxx>
#include <comphelper/servicehelper.hxx>
#include <config_folders.h>
#include <cppu/unotype.hxx>
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 7402897335eb..1fff9fe76cd0 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -69,7 +69,7 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/XWeak.hpp>
#include <com/sun/star/util/ElementChange.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
#include <cppu/unotype.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -156,7 +156,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- comphelper::SequenceAsVector< css::uno::Type > types;
+ std::vector< css::uno::Type > types;
types.push_back(cppu::UnoType< css::uno::XInterface >::get());
types.push_back(cppu::UnoType< css::uno::XWeak >::get());
types.push_back(cppu::UnoType< css::lang::XTypeProvider >::get());
@@ -199,7 +199,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
cppu::UnoType< css::container::XHierarchicalNameAccess >::get());
}
addTypes(&types);
- return types.getAsConstList();
+ return comphelper::containerToSequence(types);
}
css::uno::Sequence< sal_Int8 > Access::getImplementationId()
@@ -231,7 +231,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- comphelper::SequenceAsVector< OUString > services;
+ std::vector< OUString > services;
services.push_back("com.sun.star.configuration.ConfigurationAccess");
if (getRootAccess()->isUpdate()) {
services.push_back(
@@ -254,7 +254,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
}
}
addSupportedServiceNames(&services);
- return services.getAsConstList();
+ return comphelper::containerToSequence(services);
}
void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
@@ -402,14 +402,14 @@ css::uno::Sequence< OUString > Access::getElementNames()
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
- comphelper::SequenceAsVector< OUString > names;
+ std::vector< OUString > names;
for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
children.begin());
i != children.end(); ++i)
{
names.push_back((*i)->getNameInternal());
}
- return names.getAsConstList();
+ return comphelper::containerToSequence(names);
}
sal_Bool Access::hasByName(OUString const & aName)
@@ -541,14 +541,14 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
- comphelper::SequenceAsVector< css::beans::Property > properties;
+ std::vector< css::beans::Property > properties;
for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
children.begin());
i != children.end(); ++i)
{
properties.push_back((*i)->asProperty());
}
- return properties.getAsConstList();
+ return comphelper::containerToSequence(properties);
}
css::beans::Property Access::getPropertyByName(OUString const & aName)
@@ -1651,7 +1651,7 @@ void Access::initBroadcasterAndChanges(
std::vector< css::util::ElementChange > * allChanges)
{
assert(broadcaster != 0);
- comphelper::SequenceAsVector< css::beans::PropertyChangeEvent > propChanges;
+ std::vector< css::beans::PropertyChangeEvent > propChanges;
bool collectPropChanges = !propertiesChangeListeners_.empty();
for (Modifications::Node::Children::const_iterator i(
modifications.children.begin());
@@ -1994,7 +1994,7 @@ void Access::initBroadcasterAndChanges(
}
if (!propChanges.empty()) {
css::uno::Sequence< css::beans::PropertyChangeEvent > seq(
- propChanges.getAsConstList());
+ comphelper::containerToSequence(propChanges));
for (PropertiesChangeListeners::iterator i(
propertiesChangeListeners_.begin());
i != propertiesChangeListeners_.end(); ++i)
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 09ed9b0b41c4..91967684b949 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/util/XChangesListener.hpp>
#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
#include <cppu/unotype.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
@@ -75,11 +75,11 @@ void RootAccess::initBroadcaster(
Modifications::Node const & modifications, Broadcaster * broadcaster)
{
assert(broadcaster != 0);
- comphelper::SequenceAsVector< css::util::ElementChange > changes;
+ std::vector< css::util::ElementChange > changes;
initBroadcasterAndChanges(
modifications, broadcaster, changesListeners_.empty() ? 0 : &changes);
if (!changes.empty()) {
- css::util::ChangesSet set(changes.getAsConstList());
+ css::util::ChangesSet set(comphelper::containerToSequence(changes));
for (ChangesListeners::iterator i(changesListeners_.begin());
i != changesListeners_.end(); ++i)
{
@@ -193,9 +193,9 @@ css::util::ChangesSet RootAccess::getPendingChanges()
assert(thisIs(IS_UPDATE));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- comphelper::SequenceAsVector< css::util::ElementChange > changes;
+ std::vector< css::util::ElementChange > changes;
reportChildChanges(&changes);
- return changes.getAsConstList();
+ return comphelper::containerToSequence(changes);
}
RootAccess::~RootAccess()
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 487d91400fcf..3fc85e478992 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
-#include <comphelper/sequenceasvector.hxx>
+#include <comphelper/sequence.hxx>
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
@@ -150,7 +150,7 @@ bool parseValue(
if ((text.length & 1) != 0) {
return false;
}
- comphelper::SequenceAsVector< sal_Int8 > seq;
+ std::vector< sal_Int8 > seq;
for (sal_Int32 i = 0; i != text.length;) {
int n1;
int n2;
@@ -161,7 +161,7 @@ bool parseValue(
}
seq.push_back(static_cast< sal_Int8 >((n1 << 4) | n2));
}
- *value = seq.getAsConstList();
+ *value = comphelper::containerToSequence(seq);
return true;
}
@@ -178,7 +178,7 @@ template< typename T > css::uno::Any parseSingleValue(
template< typename T > css::uno::Any parseListValue(
OString const & separator, xmlreader::Span const & text)
{
- comphelper::SequenceAsVector< T > seq;
+ std::vector< T > seq;
xmlreader::Span sep;
if (separator.isEmpty()) {
sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));
@@ -203,7 +203,7 @@ template< typename T > css::uno::Any parseListValue(
t.length -= i + sep.length;
}
}
- return css::uno::makeAny(seq.getAsConstList());
+ return css::uno::makeAny(comphelper::containerToSequence(seq));
}
css::uno::Any parseValue(
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 16:12:33 +0000