diff options
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 15 | ||||
| -rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/viewimp.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 1 |
4 files changed, 7 insertions, 15 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 diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index c54e3e82586e..c82336f9d4bf 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -251,7 +251,7 @@ private: const OUString & i_rIdref) const SAL_OVERRIDE; struct XmlIdRegistry_Impl; - ::std::auto_ptr<XmlIdRegistry_Impl> m_pImpl; + ::std::unique_ptr<XmlIdRegistry_Impl> m_pImpl; }; // MetadatableUndo --------------------------------------------------- @@ -343,7 +343,7 @@ private: const bool i_isInContent); struct XmlIdRegistry_Impl; - ::std::auto_ptr<XmlIdRegistry_Impl> m_pImpl; + ::std::unique_ptr<XmlIdRegistry_Impl> m_pImpl; }; diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index 5b6e3f08ac18..7ce2473e8655 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -57,7 +57,7 @@ struct SfxViewShell_Impl bool m_bGotFrameOwnership; sal_uInt16 m_nFamily; ::rtl::Reference<SfxBaseController> m_pController; - ::std::auto_ptr< ::svt::AcceleratorExecute > m_pAccExec; + ::std::unique_ptr< ::svt::AcceleratorExecute > m_pAccExec; com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts; ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener; ::boost::shared_ptr< vcl::PrinterController > m_pPrinterController; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 27cc1dfc28e8..6151d72da919 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -290,7 +290,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags) , m_bGotFrameOwnership(false) , m_nFamily(0xFFFF) // undefined, default set by TemplateDialog , m_pController(0) -, m_pAccExec(0) {} SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0)) |