diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /stoc | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/registry_tdprovider/tdiface.cxx | 6 | ||||
| -rw-r--r-- | stoc/source/registry_tdprovider/tdservice.cxx | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx index 9018867b281a..05a84db4bc15 100644 --- a/stoc/source/registry_tdprovider/tdiface.cxx +++ b/stoc/source/registry_tdprovider/tdiface.cxx @@ -204,10 +204,13 @@ class InterfaceAttributeImpl : public WeakImplHelper1< XInterfaceAttributeTypeDe sal_Bool _bBound; sal_Int32 _nPosition; + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > _getter; std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > _setter; + SAL_WNODEPRECATED_DECLARATIONS_POP public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH InterfaceAttributeImpl( const Reference< XHierarchicalNameAccess > & xTDMgr, const OUString & rTypeName, @@ -232,6 +235,7 @@ public: { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~InterfaceAttributeImpl(); // XTypeDescription @@ -475,10 +479,12 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio typeName.appendAscii(RTL_CONSTASCII_STRINGPARAM("::")); typeName.append(name); RTFieldAccess flags = reader.getFieldFlags(i); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > getter; std::auto_ptr< stoc::registry_tdprovider::FunctionDescription > setter; + SAL_WNODEPRECATED_DECLARATIONS_POP for (sal_uInt16 j = 0; j < methodCount; ++j) { if (reader.getMethodName(j) == name) { switch (reader.getMethodFlags(j)) { diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index 76c50932f22b..6b2896e59a90 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -245,9 +245,11 @@ ServiceTypeDescriptionImpl::getProperties() _aBytes.getConstArray(), _aBytes.getLength(), false, TYPEREG_VERSION_1); sal_uInt16 nFields = (sal_uInt16)aReader.getFieldCount(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< Sequence< Reference< XPropertyTypeDescription > > > pTempProps( new Sequence< Reference< XPropertyTypeDescription > >(nFields)); + SAL_WNODEPRECATED_DECLARATIONS_POP Reference< XPropertyTypeDescription > * pProps = pTempProps->getArray(); while ( nFields-- ) @@ -340,10 +342,12 @@ ServiceTypeDescriptionImpl::getConstructors() throw (RuntimeException) { _aBytes.getConstArray(), _aBytes.getLength(), false, TYPEREG_VERSION_1); sal_uInt16 ctorCount = reader.getMethodCount(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< Sequence< Reference< XServiceConstructorDescription > > > ctors( new Sequence< Reference< XServiceConstructorDescription > >( ctorCount)); + SAL_WNODEPRECATED_DECLARATIONS_POP for (sal_uInt16 i = 0; i < ctorCount; ++i) { rtl::OUString name(reader.getMethodName(i)); if (reader.getMethodFlags(i) != RT_MODE_TWOWAY |