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 /dbaccess/source/ui/control/toolboxcontroller.cxx | |
parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'dbaccess/source/ui/control/toolboxcontroller.cxx')
-rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 5f36c9678b99..1590cc2eab4e 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -166,7 +166,9 @@ 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 sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 i = 0; i < nCount; ++i) { @@ -185,6 +187,7 @@ namespace dbaui } } // ----------------------------------------------------------------------------- + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<PopupMenu> OToolboxController::getMenu() { ::std::auto_ptr<PopupMenu> pMenu; @@ -232,6 +235,7 @@ namespace dbaui } return pMenu; } + SAL_WNODEPRECATED_DECLARATIONS_POP // ----------------------------------------------------------------------------- Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException) { @@ -240,7 +244,9 @@ 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 sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN); // "cleanup" the toolbox state |