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 /editeng/source | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/accessibility/AccessibleStaticTextBase.cxx | 8 | ||||
| -rw-r--r-- | editeng/source/uno/unoedprx.cxx | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 0af51fcef399..d909892756f8 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -138,7 +138,9 @@ namespace accessibility return maEditSource; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException)); + SAL_WNODEPRECATED_DECLARATIONS_POP void SetEventSource( const uno::Reference< XAccessible >& rInterface ) { @@ -248,6 +250,7 @@ namespace accessibility DBG_DTOR( AccessibleStaticTextBase_Impl, NULL ); } + SAL_WNODEPRECATED_DECLARATIONS_PUSH void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException)) { DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL ); @@ -256,6 +259,7 @@ namespace accessibility if( mpTextParagraph ) mpTextParagraph->SetEditSource( &maEditSource ); } + SAL_WNODEPRECATED_DECLARATIONS_POP void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint ) { @@ -467,6 +471,7 @@ namespace accessibility // //------------------------------------------------------------------------ + SAL_WNODEPRECATED_DECLARATIONS_PUSH AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ) : mpImpl( new AccessibleStaticTextBase_Impl() ) { @@ -474,6 +479,7 @@ namespace accessibility SetEditSource( pEditSource ); } + SAL_WNODEPRECATED_DECLARATIONS_POP AccessibleStaticTextBase::~AccessibleStaticTextBase() { @@ -494,6 +500,7 @@ namespace accessibility #endif } + SAL_WNODEPRECATED_DECLARATIONS_PUSH void AccessibleStaticTextBase::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException)) { #ifdef DBG_UTIL @@ -509,6 +516,7 @@ namespace accessibility mpImpl->SetEditSource( pEditSource ); #endif } + SAL_WNODEPRECATED_DECLARATIONS_POP void AccessibleStaticTextBase::SetEventSource( const uno::Reference< XAccessible >& rInterface ) { diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 245241595af1..73220b8fbac0 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -336,7 +336,9 @@ SvxEditSource* SvxEditSourceAdapter::Clone() const { if( mbEditSourceValid && mpAdaptee.get() ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() ); + SAL_WNODEPRECATED_DECLARATIONS_POP if( pClonedAdaptee.get() ) { @@ -424,6 +426,7 @@ SfxBroadcaster& SvxEditSourceAdapter::GetBroadcaster() const return maDummyBroadcaster; } +SAL_WNODEPRECATED_DECLARATIONS_PUSH void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee ) { if( pAdaptee.get() ) @@ -439,6 +442,7 @@ void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdap mbEditSourceValid = sal_False; } } +SAL_WNODEPRECATED_DECLARATIONS_POP sal_Bool SvxEditSourceAdapter::IsValid() const { |