Kaydet (Commit) 4e3ed5ae authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

use SAL_DEPRECATED in uno::Reference

and fix a couple of usages that have crept in

Change-Id: Ia3e7fcc05dac6e0d205e69c0e0372c74653e7c5e
Reviewed-on: https://gerrit.libreoffice.org/26851Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 6964c174
......@@ -882,7 +882,7 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
binaryToCppMapping_.mapInterface(
*static_cast< uno_Interface ** >(ret.getValue(ifc)),
ifc.get())),
css::uno::UNO_REF_NO_ACQUIRE);
SAL_NO_ACQUIRE);
}
OUString Bridge::getName() throw (css::uno::RuntimeException, std::exception) {
......
......@@ -333,7 +333,7 @@ public:
@param pInterface another reference
@param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors
*/
inline Reference( interface_type * pInterface, UnoReference_NoAcquire dummy );
inline SAL_DEPRECATED("use SAL_NO_ACQUIRE version") Reference( interface_type * pInterface, UnoReference_NoAcquire dummy );
/** Constructor: Queries given interface for reference interface type (interface_type).
......@@ -451,7 +451,7 @@ public:
@param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to set methods
@return true, if non-null interface was set
*/
inline bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire dummy);
inline SAL_DEPRECATED("use SAL_NO_ACQUIRE version") bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire dummy);
/** Queries given interface for reference interface type (interface_type) and sets it.
An interface already set will be released.
......
......@@ -450,7 +450,7 @@ void Entity::startElement( Event *pEvent )
}
// swap the reference we own in to avoid referencing thrash.
maContextStack.top().mxContext.set( static_cast<XFastContextHandler *>( xContext.get() ) );
xContext.set( nullptr, UNO_REF_NO_ACQUIRE );
xContext.set( nullptr, SAL_NO_ACQUIRE );
}
catch (const Exception&)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment