From c19c242ec0757d5d5f2936e2a57430e39c692b2b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 17 Feb 2015 16:40:00 +0000 Subject: boost->std Change-Id: I412137e7e7b9b2b87f401bc140a9499d1fc012c6 --- include/filter/msfilter/escherex.hxx | 1 - include/sfx2/Metadatable.hxx | 15 ++++++++------- include/sfx2/docmacromode.hxx | 4 ++-- include/svl/style.hxx | 4 ++-- include/svl/stylepool.hxx | 4 ++-- include/svtools/dialogcontrolling.hxx | 9 ++++----- include/svtools/table/tableinputhandler.hxx | 4 ++-- include/svtools/table/tablemodel.hxx | 17 +++++------------ include/svtools/table/tablerenderer.hxx | 4 ++-- include/svtools/toolpanel/drawerlayouter.hxx | 4 ++-- .../svx/sdr/attribute/sdrallfillattributeshelper.hxx | 2 +- 11 files changed, 30 insertions(+), 38 deletions(-) (limited to 'include') diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 884829b3a97e..75a4752f9027 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx index e69fd3f536a6..0cd51ecf163d 100644 --- a/include/sfx2/Metadatable.hxx +++ b/include/sfx2/Metadatable.hxx @@ -26,8 +26,7 @@ #include #include -#include -#include +#include namespace com { namespace sun { namespace star { @@ -64,9 +63,8 @@ createXmlIdRegistry(const bool i_DocIsClipboard); previous hooks

*/ -class SFX2_DLLPUBLIC Metadatable : private boost::noncopyable +class SFX2_DLLPUBLIC Metadatable { - public: Metadatable() : m_pReg(0) {} @@ -90,11 +88,11 @@ public: const bool i_bCopyPrecedesSource = false); /** create an Undo Metadatable, which remembers this' reference */ - ::boost::shared_ptr CreateUndo() const; - ::boost::shared_ptr CreateUndoForDelete(); + std::shared_ptr CreateUndo() const; + std::shared_ptr CreateUndoForDelete(); /** restore this from Undo Metadatable */ - void RestoreMetadata(::boost::shared_ptr const& i_pUndo); + void RestoreMetadata(std::shared_ptr const& i_pUndo); /** merge this and i_rOther into this */ void JoinMetadatable(Metadatable const & i_rOther, @@ -122,6 +120,9 @@ public: ::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0; private: + Metadatable(const Metadatable&) SAL_DELETED_FUNCTION; + Metadatable& operator=(const Metadatable&) SAL_DELETED_FUNCTION; + friend class MetadatableClipboard; friend class MetadatableUndo; diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 6f9d06a4ffe9..6945c788cdfc 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include namespace sfx2 @@ -316,7 +316,7 @@ namespace sfx2 ); private: - ::boost::shared_ptr< DocumentMacroMode_Data > m_pData; + std::shared_ptr< DocumentMacroMode_Data > m_xData; }; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 82091f14705c..e49dd2af33e1 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -35,7 +35,7 @@ #include #include -#include +#include class SfxItemSet; class SfxItemPool; @@ -183,7 +183,7 @@ private: friend class SfxStyleSheetBasePool; }; -typedef ::boost::shared_ptr< SfxStyleSheetIterator > SfxStyleSheetIteratorPtr; +typedef std::shared_ptr< SfxStyleSheetIterator > SfxStyleSheetIteratorPtr; class SfxStyleSheetBasePool_Impl; diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index 4a971f0916fd..61eca0bac67d 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVL_STYLEPOOL_HXX #define INCLUDED_SVL_STYLEPOOL_HXX -#include +#include #include #include @@ -31,7 +31,7 @@ class SVL_DLLPUBLIC StylePool private: StylePoolImpl *pImpl; public: - typedef boost::shared_ptr SfxItemSet_Pointer_t; + typedef std::shared_ptr SfxItemSet_Pointer_t; explicit StylePool( SfxItemSet* pIgnorableItems = 0 ); diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 2e4014babd14..c46f6744baaf 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -25,9 +25,8 @@ #include #include +#include #include -#include - namespace svt { @@ -53,7 +52,7 @@ namespace svt virtual ~IWindowOperator(); }; - typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; + typedef std::shared_ptr< IWindowOperator > PWindowOperator; //= IWindowEventFilter @@ -68,7 +67,7 @@ namespace svt virtual ~IWindowEventFilter(); }; - typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; + typedef std::shared_ptr< IWindowEventFilter > PWindowEventFilter; //= DialogController @@ -123,7 +122,7 @@ namespace svt DialogController( const DialogController& ) SAL_DELETED_FUNCTION; DialogController& operator=( const DialogController& ) SAL_DELETED_FUNCTION; }; - typedef ::boost::shared_ptr< DialogController > PDialogController; + typedef std::shared_ptr< DialogController > PDialogController; //= ControlDependencyManager diff --git a/include/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx index b08cf9908e17..bfcc817efcc2 100644 --- a/include/svtools/table/tableinputhandler.hxx +++ b/include/svtools/table/tableinputhandler.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX #define INCLUDED_SVTOOLS_TABLE_TABLEINPUTHANDLER_HXX -#include +#include class MouseEvent; class KeyEvent; @@ -62,7 +62,7 @@ namespace svt { namespace table virtual ~ITableInputHandler() { } }; - typedef ::boost::shared_ptr< ITableInputHandler > PTableInputHandler; + typedef std::shared_ptr< ITableInputHandler > PTableInputHandler; } } // namespace svt::table diff --git a/include/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx index 67a0e16b9034..ce2e002f3578 100644 --- a/include/svtools/table/tablemodel.hxx +++ b/include/svtools/table/tablemodel.hxx @@ -33,19 +33,12 @@ #include #include -#include #include -#include - +#include namespace svt { namespace table { - - - - //= ScrollbarVisibility - enum ScrollbarVisibility { /** enumeration value denoting that a scrollbar should never be visible, even @@ -79,7 +72,7 @@ namespace svt { namespace table /** declares an interface to be implemented by components interested in changes in an ->ITableModel */ - class SAL_NO_VTABLE ITableModelListener : public ::boost::enable_shared_from_this< ITableModelListener > + class SAL_NO_VTABLE ITableModelListener : public std::enable_shared_from_this< ITableModelListener > { public: /** notifies the listener that one or more rows have been inserted into @@ -157,7 +150,7 @@ namespace svt { namespace table /// deletes the listener instance virtual ~ITableModelListener(){}; }; - typedef ::boost::shared_ptr< ITableModelListener > PTableModelListener; + typedef std::shared_ptr< ITableModelListener > PTableModelListener; //= IColumnModel @@ -311,7 +304,7 @@ namespace svt { namespace table /// deletes the column model instance virtual ~IColumnModel() { } }; - typedef ::boost::shared_ptr< IColumnModel > PColumnModel; + typedef std::shared_ptr< IColumnModel > PColumnModel; //= ITableModel @@ -532,7 +525,7 @@ namespace svt { namespace table /// destroys the table model instance virtual ~ITableModel() { } }; - typedef ::boost::shared_ptr< ITableModel > PTableModel; + typedef std::shared_ptr< ITableModel > PTableModel; } } // namespace svt::table diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index 9e66e1b01326..a1984655b643 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -24,7 +24,7 @@ #include -#include +#include class StyleSettings; @@ -276,7 +276,7 @@ namespace svt { namespace table /// deletes the renderer instance virtual ~ITableRenderer() { } }; - typedef ::boost::shared_ptr< ITableRenderer > PTableRenderer; + typedef std::shared_ptr< ITableRenderer > PTableRenderer; } } // namespace svt::table diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index 93b11f4f17e0..cba7f020e735 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -24,7 +24,7 @@ #include #include -#include +#include namespace svt @@ -33,7 +33,7 @@ namespace svt class ToolPanelViewShell; class ToolPanelDrawer; - typedef ::boost::shared_ptr< ToolPanelDrawer > PToolPanelDrawer; + typedef std::shared_ptr< ToolPanelDrawer > PToolPanelDrawer; //= ToolPanelDrawer diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx index b7c350ba460a..73baeca50801 100644 --- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx +++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx @@ -83,7 +83,7 @@ namespace drawinglayer { namespace attribute { - typedef boost::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr; + typedef std::shared_ptr< SdrAllFillAttributesHelper > SdrAllFillAttributesHelperPtr; } // end of namespace attribute } // end of namespace drawinglayer -- cgit