diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 09:56:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 09:57:16 +0200 |
| commit | eba71a4937036bd2e1101a060a28a1ec45f702bf (patch) | |
| tree | ecf338be85d303e0b774dc80169a775bd2bb6abe /sfx2/source/dialog | |
| parent | e653fbfbfa41ec46431b84e50ac6f054e8713601 (diff) | |
sfx2: std::auto_ptr -> std::unique_ptr
Change-Id: I7bac4105494cdbbadd4c4d78ce1fcf03b8ccae6c
Diffstat (limited to 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 1032a68c2db9..be6f0ace6be2 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -862,9 +862,7 @@ namespace sfx2 DECL_LINK( OnToolboxClicked, ToolBox* ); DECL_LINK( OnMenuItemSelected, Menu* ); DECL_LINK( DockingChanged, TitledDockingWindow* ); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< PopupMenu > impl_createPopupMenu() const; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< PopupMenu > impl_createPopupMenu() const; /// sets the given layout for the panel selector void impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false ); @@ -991,9 +989,7 @@ namespace sfx2 { i_pToolBox->EndSelection(); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< PopupMenu > pMenu = impl_createPopupMenu(); pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) ); // pass toolbox button rect so the menu can stay open on button up @@ -1194,10 +1190,9 @@ namespace sfx2 } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const + ::std::unique_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const { - ::std::auto_ptr<PopupMenu> pMenu( new PopupMenu ); + ::std::unique_ptr<PopupMenu> pMenu( new PopupMenu ); FloatingWindow* pMenuWindow = static_cast< FloatingWindow* >( pMenu->GetWindow() ); if ( pMenuWindow != NULL ) { @@ -1243,8 +1238,6 @@ namespace sfx2 return pMenu; } - SAL_WNODEPRECATED_DECLARATIONS_POP - //= TaskPaneController |