diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-15 20:41:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-16 12:54:44 +0000 |
| commit | a1ceacc17e3f30d5e9c06b3218ad8ec26ca2f1b9 (patch) | |
| tree | 56a29f66f75f326a0a677ab1697ce28f1bc9fcbf /include/sfx2 | |
| parent | 18f41dfaf19d656d290c47d196ef2702e169a522 (diff) | |
boost::foo_ptr->std::foo_ptr
Change-Id: I9219619b538b6530a89f5932ac51eb3b62eb396a
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/dispatch.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/itemconnect.hxx | 7 | ||||
| -rw-r--r-- | include/sfx2/taskpane.hxx | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 3b1476c3a0e2..c32ec1faf0a3 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -27,7 +27,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> -#include <boost/scoped_ptr.hpp> class SfxSlotServer; class SfxShell; @@ -72,7 +71,7 @@ enum SfxSlotFilterState class SFX2_DLLPUBLIC SfxDispatcher { - boost::scoped_ptr<SfxDispatcher_Impl> pImp; + std::unique_ptr<SfxDispatcher_Impl> xImp; private: // Search for temporary evaluated Todos diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 3e49921ae659..7167075e098b 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -25,16 +25,11 @@ #include <memory> -#include <boost/scoped_ptr.hpp> #include <sfx2/itemwrapper.hxx> #include <sfx2/controlwrapper.hxx> - - namespace sfx { - - typedef int ItemConnFlags; /** No special state for the connection. */ @@ -513,7 +508,7 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet( if( !pOldItem || !(maItemWrp.GetItemValue( *pOldItem ) == aNewValue) ) { sal_uInt16 nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() ); - boost::scoped_ptr< ItemType > xItem( + std::unique_ptr< ItemType > xItem( static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) ); xItem->SetWhich( nWhich ); maItemWrp.SetItemValue( *xItem, aNewValue ); diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 5495c0b0bc6d..dadbdf1d300f 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -27,7 +27,6 @@ #include <svtools/toolpanel/tabalignment.hxx> #include <svtools/toolpanel/tabitemcontent.hxx> -#include <boost/scoped_ptr.hpp> #include <boost/optional.hpp> namespace svt @@ -126,7 +125,7 @@ namespace sfx2 virtual void GetFocus() SAL_OVERRIDE; private: - ::boost::scoped_ptr< ModuleTaskPane_Impl > m_pImpl; + std::unique_ptr<ModuleTaskPane_Impl> m_xImpl; }; @@ -152,7 +151,7 @@ namespace sfx2 void ActivateToolPanel( const OUString& i_rPanelURL ); private: - ::boost::scoped_ptr< TaskPaneController_Impl > m_pImpl; + std::unique_ptr<TaskPaneController_Impl> m_xImpl; }; |