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 /sfx2/source/dialog/taskpane.cxx | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'sfx2/source/dialog/taskpane.cxx')
| -rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 76589da3bcb2..673b562b4f88 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -889,7 +889,9 @@ 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 /// sets the given layout for the panel selector void impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce = false ); @@ -1015,7 +1017,9 @@ namespace sfx2 { i_pToolBox->EndSelection(); + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu(); + SAL_WNODEPRECATED_DECLARATIONS_POP pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) ); // pass toolbox button rect so the menu can stay open on button up @@ -1216,6 +1220,7 @@ namespace sfx2 } // --------------------------------------------------------------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const { ::std::auto_ptr<PopupMenu> pMenu( new PopupMenu ); @@ -1261,6 +1266,7 @@ namespace sfx2 return pMenu; } + SAL_WNODEPRECATED_DECLARATIONS_POP //================================================================================================================== //= TaskPaneController |