summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/svtools/brwbox.hxx2
-rw-r--r--include/svtools/dialogcontrolling.hxx4
-rw-r--r--include/svtools/editbrowsebox.hxx2
-rw-r--r--include/svtools/parhtml.hxx9
-rw-r--r--include/svtools/toolpanel/paneltabbar.hxx2
-rw-r--r--include/svtools/toolpanel/tablayouter.hxx2
-rw-r--r--include/svtools/toolpanel/toolpaneldeck.hxx2
7 files changed, 13 insertions, 10 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index e16e0de43401..f0e47cad5c89 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -295,7 +295,7 @@ private:
typedef std::stack<CursorMoveAttempt> GotoStack;
GotoStack m_aGotoStack;
- ::std::auto_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object
+ ::std::unique_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object
bool m_bFocusOnlyCursor; // hide cursor if we don't have the focus
Color m_aCursorColor; // special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor
diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index cf455bea9f3b..150e934ca464 100644
--- a/include/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
@@ -90,7 +90,7 @@ namespace svt
class SVT_DLLPUBLIC DialogController
{
private:
- ::std::auto_ptr< DialogController_Data > m_pImpl;
+ ::std::unique_ptr< DialogController_Data > m_pImpl;
public:
DialogController( vcl::Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator );
@@ -138,7 +138,7 @@ namespace svt
class SVT_DLLPUBLIC ControlDependencyManager
{
private:
- ::std::auto_ptr< ControlDependencyManager_Data > m_pImpl;
+ ::std::unique_ptr< ControlDependencyManager_Data > m_pImpl;
public:
ControlDependencyManager();
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index cb696925e260..9a9722d36212 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -491,7 +491,7 @@ namespace svt
sal_Int32 m_nBrowserFlags;
ImageList m_aStatusImages;
- ::std::auto_ptr< EditBrowseBoxImpl> m_aImpl;
+ ::std::unique_ptr< EditBrowseBoxImpl> m_aImpl;
protected:
BrowserHeader* pHeader;
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index ed4f4c386fcf..09027f46e2c6 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -20,11 +20,14 @@
#ifndef INCLUDED_SVTOOLS_PARHTML_HXX
#define INCLUDED_SVTOOLS_PARHTML_HXX
+#include <sal/config.h>
+
+#include <memory>
+#include <vector>
+
#include <svtools/svtdllapi.h>
#include <svtools/svparser.hxx>
-#include <boost/ptr_container/ptr_vector.hpp>
-
namespace com { namespace sun { namespace star {
namespace document {
class XDocumentProperties;
@@ -118,7 +121,7 @@ public:
//SvxAdjust GetAdjust() const; // <P,TH,TD ALIGN=>
};
-typedef ::boost::ptr_vector<HTMLOption> HTMLOptions;
+typedef std::vector<std::unique_ptr<HTMLOption>> HTMLOptions;
class SVT_DLLPUBLIC HTMLParser : public SvParser
{
diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx
index 0964d79c9e40..18e4d1ea1197 100644
--- a/include/svtools/toolpanel/paneltabbar.hxx
+++ b/include/svtools/toolpanel/paneltabbar.hxx
@@ -84,7 +84,7 @@ namespace svt
GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE;
private:
- ::std::auto_ptr< PanelTabBar_Impl > m_pImpl;
+ ::std::unique_ptr< PanelTabBar_Impl > m_pImpl;
};
diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx
index 3ad6060df5df..fb106270b21f 100644
--- a/include/svtools/toolpanel/tablayouter.hxx
+++ b/include/svtools/toolpanel/tablayouter.hxx
@@ -83,7 +83,7 @@ namespace svt
) SAL_OVERRIDE;
private:
- ::std::auto_ptr< TabDeckLayouter_Data > m_pData;
+ ::std::unique_ptr< TabDeckLayouter_Data > m_pData;
};
diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx
index 48127c569fd6..d9c06ced6771 100644
--- a/include/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
@@ -172,7 +172,7 @@ namespace svt
GetComponentInterface( bool i_bCreate ) SAL_OVERRIDE;
private:
- ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl;
+ ::std::unique_ptr< ToolPanelDeck_Impl > m_pImpl;
};