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 /svx/source/tbxctrls | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index db9dcd90e079..046804b4d35e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -190,7 +190,9 @@ class SvxFontNameBox_Impl : public FontNameBox using Window::Update; private: const FontList* pFontList; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FontList> m_aOwnFontList; + SAL_WNODEPRECATED_DECLARATIONS_POP Font aCurFont; Size aLogicalSize; String aCurText; @@ -221,7 +223,9 @@ public: virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - inline void SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; } + SAL_WNODEPRECATED_DECLARATIONS_PUSH + void SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; } + SAL_WNODEPRECATED_DECLARATIONS_POP }; //======================================================================== @@ -555,7 +559,9 @@ sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* (SvxFontListItem*)pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ); else { + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FontList> aFontList(new FontList( pBox )); + SAL_WNODEPRECATED_DECLARATIONS_POP *ppFontList = aFontList.get(); pBox->SetOwnFontList(aFontList); bChanged = sal_True; |