diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-18 18:14:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-21 19:44:56 +0000 |
| commit | bd614b91352b5a0a291f33a428c95d7bcbf34679 (patch) | |
| tree | 1372effc15db45ec2fa8c9c248c9d66eacb99683 /sw | |
| parent | 05d175a8efceccd684c9e3d7f428073f1b142346 (diff) | |
Delete the "Any-to-Any" template specializations for LIBO_INTERNAL_ONLY
i.e., css::uno::Any function template specializations
Any::has<Any>() const
Any::get(Any const &) const
operator >>=(Any const &, Any &)
operator <<=(Any &, Any const &)
that don't make much sense (the first is always true, the rest can be replaced
with operator =, which additionally supports move semantics). For 3rd-party
compatibility, do this only for LIBO_INTERNAL_ONLY, however.
However, some generic template code did benefit from operator >>= working also
for Any, so make up for that with a new (LIBO_INTERNAL_ONLY, given that
operator >>= still covers if fine for !LIBO_INTERNAL_ONLY) fromAny,
complementing the existing toAny.
Change-Id: I8b1b5f803f0b909808159916366d53c948206a88
Reviewed-on: https://gerrit.libreoffice.org/30022
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/inc/swmodeltestbase.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index eacc0a040d26..3097db6a7d8b 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -421,8 +421,8 @@ protected: T getProperty( const uno::Any& obj, const OUString& name ) const { uno::Reference< beans::XPropertySet > properties( obj, uno::UNO_QUERY_THROW ); - T data = T(); - if (!(properties->getPropertyValue(name) >>= data)) + T data; + if (!css::uno::fromAny(properties->getPropertyValue(name), &data)) { CPPUNIT_FAIL("the property is of unexpected type or void"); } |