summaryrefslogtreecommitdiff
path: root/cppuhelper/source/servicemanager.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-24 10:24:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-24 09:17:34 +0000
commit48e83f7be240cd0af5b9f1ee5b87c4d9376c102e (patch)
tree15ccd05d11aca0461309670987ae71316a6232ca /cppuhelper/source/servicemanager.cxx
parent3422dfc1b61c15d7d3a6b0e1ee16c50457946cc0 (diff)
makeAny->Any in cppuhelper..cui
Change-Id: Ia54e6e9b71df68bd04c304a0bb02da8ebac74420 Reviewed-on: https://gerrit.libreoffice.org/34603 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper/source/servicemanager.cxx')
-rw-r--r--cppuhelper/source/servicemanager.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 1fd8bba105c1..e3ddaee00798 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1183,13 +1183,13 @@ cppuhelper::ServiceManager::createContentEnumeration(
}
}
if (impl->factory1.is()) {
- factories.push_back(css::uno::makeAny(impl->factory1));
+ factories.push_back(css::uno::Any(impl->factory1));
} else if (impl->factory2.is()) {
- factories.push_back(css::uno::makeAny(impl->factory2));
+ factories.push_back(css::uno::Any(impl->factory2));
} else {
css::uno::Reference< css::lang::XSingleComponentFactory > factory(
new ImplementationWrapper(this, *i));
- factories.push_back(css::uno::makeAny(factory));
+ factories.push_back(css::uno::Any(factory));
}
}
return new ContentEnumeration(factories);
@@ -1221,7 +1221,7 @@ css::uno::Any cppuhelper::ServiceManager::getPropertyValue(
PropertyName, static_cast< cppu::OWeakObject * >(this));
}
assert(context_.is());
- return css::uno::makeAny(context_);
+ return css::uno::Any(context_);
}
void cppuhelper::ServiceManager::addPropertyChangeListener(