binaryurp/source/bridge.cxx | 2 +- include/com/sun/star/uno/Reference.h | 4 ++-- sax/source/fastparser/fastparser.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 4e3ed5aeb5c998ee4077138fe802b471bea9fcb2 Author: Noel Grandin <[email protected]> Date: Fri Jul 1 13:30:38 2016 +0200 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/26851 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 1bfdd17..d47b834 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -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) { diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h index 5f4fea0..e657fd8 100644 --- a/include/com/sun/star/uno/Reference.h +++ b/include/com/sun/star/uno/Reference.h @@ -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. diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index fe69161..b9d9bfa 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -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&) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
