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 /filter | |
parent | should be > 4, not > 5 (diff) | |
download | core-871426533f7afe31bc451fa6b407b83db8e52827.tar.gz core-871426533f7afe31bc451fa6b407b83db8e52827.zip |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'filter')
-rw-r--r-- | filter/inc/filter/msfilter/escherex.hxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index 6ffa250de479..de9d27e5569a 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -1397,7 +1397,9 @@ public: class InteractionInfo { bool mbHasInteraction; + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<SvMemoryStream> mpHyperlinkRecord; + SAL_WNODEPRECATED_DECLARATIONS_POP InteractionInfo(); public: @@ -1406,7 +1408,9 @@ public: mpHyperlinkRecord.reset( pStream ); } bool hasInteraction() { return mbHasInteraction; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH const std::auto_ptr< SvMemoryStream >& getHyperlinkRecord() { return mpHyperlinkRecord; } + SAL_WNODEPRECATED_DECLARATIONS_POP }; class EscherExHostAppData diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 32557538580c..f6986b9ea44f 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -229,7 +229,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName ); if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData->GetInteractionInfo():NULL ) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord(); + SAL_WNODEPRECATED_DECLARATIONS_POP if ( pMemStrm.get() ) { pMemStrm->ObjectOwnsMemory( sal_False ); |