diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 18:50:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-25 08:40:12 +0200 |
| commit | d54a72a40852e206d78ab4c57a6898cfae39b8d0 (patch) | |
| tree | 93967bdbbe5b48e4645b912cf921b244634088af /dbaccess/source/ui/control | |
| parent | 43c47c610556b0bbd4f22c317d6e58c543109c12 (diff) | |
dbaccess: std::auto_ptr -> std::unique_ptr
Change-Id: I2b27aaf589fcbe4da1680f624a57be7ae62b0dc5
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/RelationControl.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 15 |
3 files changed, 7 insertions, 12 deletions
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 35bf2e2f0d00..8e2b99f0c26a 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -59,7 +59,7 @@ namespace dbaui { friend class OTableListBoxControl; - ::std::auto_ptr< ::svt::ListBoxControl> m_pListCell; + ::std::unique_ptr< ::svt::ListBoxControl> m_pListCell; TTableConnectionData::value_type m_pConnData; OTableListBoxControl* m_pBoxControl; long m_nDataPos; diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 71120eca7bc1..0eb0fc5b690a 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -565,7 +565,7 @@ namespace PopupMenu* DBTreeListBox::CreateContextMenu( void ) { - ::std::auto_ptr< PopupMenu > pContextMenu; + ::std::unique_ptr< PopupMenu > pContextMenu; if ( !m_pContextMenuProvider ) return pContextMenu.release(); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 079bb8f97830..95ced8b8190c 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -159,9 +159,7 @@ namespace dbaui aFind->second = Event.IsEnabled; if ( m_aCommandURL == aFind->first && !Event.IsEnabled ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<PopupMenu> pMenu = getMenu(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<PopupMenu> pMenu = getMenu(); sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 i = 0; i < nCount; ++i) { @@ -179,10 +177,9 @@ namespace dbaui } } } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<PopupMenu> OToolboxController::getMenu() + ::std::unique_ptr<PopupMenu> OToolboxController::getMenu() { - ::std::auto_ptr<PopupMenu> pMenu; + ::std::unique_ptr<PopupMenu> pMenu; if ( m_aStates.size() > 2 ) { pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) ); @@ -224,7 +221,7 @@ namespace dbaui } return pMenu; } - SAL_WNODEPRECATED_DECLARATIONS_POP + Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException, std::exception) { // execute the menu @@ -232,9 +229,7 @@ namespace dbaui ::osl::MutexGuard aGuard(m_aMutex); ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<PopupMenu> pMenu = getMenu(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr<PopupMenu> pMenu = getMenu(); sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN); // "cleanup" the toolbox state |