diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-17 16:40:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-18 11:00:17 +0000 |
commit | c19c242ec0757d5d5f2936e2a57430e39c692b2b (patch) | |
tree | fe8f71cab2739904472e74597e04aadefd9d19dc /include/svtools/table | |
parent | 1215efbf616024bc262f94c38038d6de6d960b17 (diff) |
boost->std
Change-Id: I412137e7e7b9b2b87f401bc140a9499d1fc012c6
Diffstat (limited to 'include/svtools/table')
-rw-r--r-- | include/svtools/table/tableinputhandler.hxx | 4 | ||||
-rw-r--r-- | include/svtools/table/tablemodel.hxx | 17 | ||||
-rw-r--r-- | include/svtools/table/tablerenderer.hxx | 4 |
3 files changed, 9 insertions, 16 deletions
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 <boost/shared_ptr.hpp> +#include <memory> 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 <rtl/ref.hxx> #include <sal/types.h> -#include <boost/shared_ptr.hpp> #include <boost/optional.hpp> -#include <boost/enable_shared_from_this.hpp> - +#include <memory> 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 <vcl/outdev.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> 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 |