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 | |
parent | e653fbfbfa41ec46431b84e50ac6f054e8713601 (diff) |
sfx2: std::auto_ptr -> std::unique_ptr
Change-Id: I7bac4105494cdbbadd4c4d78ce1fcf03b8ccae6c
-rw-r--r-- | include/sfx2/DocumentMetadataAccess.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/controlwrapper.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/itemconnect.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/opengrf.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/securitypage.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/userinputinterception.hxx | 2 | ||||
-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 |
10 files changed, 15 insertions, 23 deletions
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx index e0cea2749346..8178b59fa99e 100644 --- a/include/sfx2/DocumentMetadataAccess.hxx +++ b/include/sfx2/DocumentMetadataAccess.hxx @@ -198,7 +198,7 @@ public: ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; private: - std::auto_ptr<DocumentMetadataAccess_Impl> m_pImpl; + std::unique_ptr<DocumentMetadataAccess_Impl> m_pImpl; }; } // namespace sfx2 diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 447bf5cb54d3..91b79b04f396 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -452,7 +452,7 @@ public: virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; private: - std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; + std::unique_ptr< MultiControlWrapperHelper_Impl > mxImpl; }; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index a0f2eb6d78df..79fce0c4c5dd 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -243,8 +243,8 @@ public: typedef typename ControlWrpT::ControlType ControlType; typedef typename ControlWrpT::ControlValueType ControlValueType; - typedef std::auto_ptr< ItemWrpT > ItemWrapperRef; - typedef std::auto_ptr< ControlWrpT > ControlWrapperRef; + typedef std::unique_ptr< ItemWrpT > ItemWrapperRef; + typedef std::unique_ptr< ControlWrpT > ControlWrapperRef; /** Receives pointer to a newly created control wrapper. @descr Takes ownership of the control wrapper. */ @@ -454,7 +454,7 @@ protected: virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; private: - std::auto_ptr< ItemConnectionArrayImpl > mxImpl; + std::unique_ptr< ItemConnectionArrayImpl > mxImpl; }; diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 83cce38846be..a38d8800a4bd 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.hxx @@ -50,7 +50,7 @@ private: SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); SFX2_DLLPRIVATE SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ); - const std::auto_ptr< SvxOpenGrf_Impl > mpImpl; + const std::unique_ptr< SvxOpenGrf_Impl > mpImpl; }; #endif // _SVX_OPENGRF_HXX diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index eecaf318ab0a..2777088ddc60 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -30,7 +30,7 @@ struct SfxSecurityPage_Impl; class SfxSecurityPage : public SfxTabPage { - std::auto_ptr< SfxSecurityPage_Impl > m_pImpl; + std::unique_ptr< SfxSecurityPage_Impl > m_pImpl; protected: SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 5825ac1d7d86..539cdb1c8eb5 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -63,7 +63,7 @@ namespace sfx2 bool handleNotifyEvent( const NotifyEvent& _rEvent ); private: - ::std::auto_ptr< UserInputInterception_Data > m_pData; + ::std::unique_ptr< UserInputInterception_Data > m_pData; }; 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)) |