diff options
author | Jakub Trzebiatowski <ubap.dev@gmail.com> | 2016-03-07 19:48:23 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-15 06:26:57 +0000 |
commit | 89e0663c55f7f1763536a345d63111115c71ef26 (patch) | |
tree | bb9a3a82a3f462cb72242e02c0a974285a80d40a /configmgr/source/access.cxx | |
parent | Re-introduce two lines apparently accidentally removed yesterday (diff) | |
download | core-89e0663c55f7f1763536a345d63111115c71ef26.tar.gz core-89e0663c55f7f1763536a345d63111115c71ef26.zip |
tdf#96099 fix trival typedefs, Path to std::vector<OUString>
Change-Id: I23fca48becbfdfd92db02a11b739a668fc1cd8c4
Reviewed-on: https://gerrit.libreoffice.org/23007
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'configmgr/source/access.cxx')
-rw-r--r-- | configmgr/source/access.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 97543bbda69d..3506beb7aeb4 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -96,7 +96,6 @@ #include "modifications.hxx" #include "node.hxx" #include "nodemap.hxx" -#include "path.hxx" #include "propertynode.hxx" #include "rootaccess.hxx" #include "setnode.hxx" @@ -253,7 +252,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames() assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); - std::vector< OUString > services; + std::vector<OUString> services; services.push_back("com.sun.star.configuration.ConfigurationAccess"); if (getRootAccess()->isUpdate()) { services.push_back( @@ -424,7 +423,7 @@ css::uno::Sequence< OUString > Access::getElementNames() osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); std::vector< rtl::Reference< ChildAccess > > children(getAllChildren()); - std::vector< OUString > names; + std::vector<OUString> names; for (std::vector< rtl::Reference< ChildAccess > >::iterator i( children.begin()); i != children.end(); ++i) @@ -1673,7 +1672,7 @@ void Access::commitChildChanges( } } if (childValid && i->second.directlyModified) { - Path path(getAbsolutePath()); + std::vector<OUString> path(getAbsolutePath()); path.push_back(i->first); components_.addModification(path); globalModifications->add(path); @@ -2100,8 +2099,8 @@ rtl::Reference< ChildAccess > Access::getSubChild(OUString const & path) { if (!getRootAccess().is()) { return rtl::Reference< ChildAccess >(); } - Path abs(getAbsolutePath()); - for (Path::iterator j(abs.begin()); j != abs.end(); ++j) { + std::vector<OUString> abs(getAbsolutePath()); + for (auto j(abs.begin()); j != abs.end(); ++j) { OUString name1; bool setElement1; OUString templateName1; |