From 44ea5d14140cccdc77a5fd8e2473804e879880df Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 23 Nov 2012 13:41:15 +0100 Subject: Adding SAL_DEPRECATED_INTERNAL to an implementation function is pointless ...as there are typically no direct calls to it anyway. What is apparently needed is to decorate the cppumaker-generated headers instead: * cppumaker obtains deprecation-information from the documentation strings in .rdb files. As these are normally generated by idlc without documentation included (no -C), idlc got changed to nevertheless contain documentation consisting of just "@deprecated" in this case, to allow to easily tunnel this information to cppumaker always. * The mechanism of parsing for "@deprecated" in documentation strings is somewhat crude, of course. * For now, cppumaker only decorates C++ functions that correspond to UNOIDL interface attributes and methods. More should be possible (but, e.g., being able to decorate a complete C++ class corresponding to a deprecated UNOIDL interface type depends on whether all platforms would accept SAL_DEPRECATED_INTERNAL at the same position in a C++ class declaration. * This could also be extended to other languages than C++/cppumaker. * Always using SAL_DEPRECATED_INERNAL instead of SAL_DEPRECATED for decoration is to keep things simple and our codebase working. Improvements are possible here, too, of course. Change-Id: Ia2917892f780d477652e4cd9f286588a6898c3f5 --- cppuhelper/inc/cppuhelper/weakagg.hxx | 1 - 1 file changed, 1 deletion(-) (limited to 'cppuhelper/inc/cppuhelper/weakagg.hxx') diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx index f4ae380a7218..094e178ec222 100644 --- a/cppuhelper/inc/cppuhelper/weakagg.hxx +++ b/cppuhelper/inc/cppuhelper/weakagg.hxx @@ -79,7 +79,6 @@ public: @param Delegator the object that delegate its queryInterface to this aggregate. */ - SAL_DEPRECATED_INTERNAL("do not use XAggregation") virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Delegator ) throw(::com::sun::star::uno::RuntimeException); /** Called by the delegator or queryInterface. Re-implement this method instead of -- cgit v1.2.3