summaryrefslogtreecommitdiffstats
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/generic/glyphcache.hxx10
-rw-r--r--vcl/inc/impimagetree.hxx4
-rw-r--r--vcl/inc/pch/precompiled_vcl.hxx1
-rw-r--r--vcl/inc/printdlg.hxx6
-rw-r--r--vcl/inc/window.h4
5 files changed, 11 insertions, 14 deletions
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index b5e8d75cfd54..382e70c5206a 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -26,8 +26,6 @@
#include FT_FREETYPE_H
#include FT_GLYPH_H
-#include <boost/shared_ptr.hpp>
-
#include <basebmp/bitmapdevice.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <tools/gen.hxx>
@@ -176,8 +174,8 @@ public:
bool TestFont() const { return mbFaceOk;}
FT_Face GetFtFace() const;
int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); }
- void SetFontOptions( boost::shared_ptr<ImplFontOptions> );
- boost::shared_ptr<ImplFontOptions> GetFontOptions() const;
+ void SetFontOptions(std::shared_ptr<ImplFontOptions>);
+ std::shared_ptr<ImplFontOptions> GetFontOptions() const;
bool NeedsArtificialBold() const { return mbArtBold; }
bool NeedsArtificialItalic() const { return mbArtItalic; }
@@ -255,7 +253,7 @@ private:
FT_FaceRec_* maFaceFT;
FT_SizeRec_* maSizeFT;
- boost::shared_ptr<ImplFontOptions> mpFontOptions;
+ std::shared_ptr<ImplFontOptions> mxFontOptions;
bool mbFaceOk;
bool mbArtItalic;
@@ -280,7 +278,7 @@ public:
private:
ServerFont* mpServerFont;
- boost::shared_ptr<ImplFontOptions> mpFontOptions;
+ std::shared_ptr<ImplFontOptions> mxFontOptions;
bool mbGotFontOptions;
};
diff --git a/vcl/inc/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 0fbb2769e086..4a5e3a6be5e7 100644
--- a/vcl/inc/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
@@ -22,10 +22,10 @@
#include "sal/config.h"
+#include <memory>
#include <unordered_map>
#include <vector>
-#include "boost/noncopyable.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "rtl/ustring.hxx"
#include "salhelper/singletonref.hxx"
@@ -95,7 +95,7 @@ private:
void loadImageLinks();
- void parseLinkFile(boost::shared_ptr< SvStream > stream);
+ void parseLinkFile(std::shared_ptr<SvStream> stream);
/// Return name of a real .png according to links.txt.
OUString const & getRealImageName(OUString const & name);
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 715615e73846..56db30f8e284 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -137,7 +137,6 @@
#include <basegfx/vector/b2isize.hxx>
#include <boost/bind.hpp>
#include <boost/functional/hash.hpp>
-#include <boost/make_shared.hpp>
#include <boost/mem_fn.hpp>
#include <boost/optional.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 49c97e3467a1..ab6adbbdce55 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -36,7 +36,7 @@
#include "vcl/tabpage.hxx"
#include "vcl/virdev.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <map>
namespace vcl
@@ -186,7 +186,7 @@ namespace vcl
VclBuilder* mpCustomOptionsUIBuilder;
- boost::shared_ptr< PrinterController > maPController;
+ std::shared_ptr<PrinterController> maPController;
TabControl* mpTabCtrl;
NUpTabPage maNUpPage;
JobTabPage maJobPage;
@@ -258,7 +258,7 @@ namespace vcl
DECL_LINK( UIOption_ModifyHdl, Edit* );
public:
- PrintDialog( vcl::Window*, const boost::shared_ptr< PrinterController >& );
+ PrintDialog( vcl::Window*, const std::shared_ptr< PrinterController >& );
virtual ~PrintDialog();
bool isPrintToFile();
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 6e6129b1b1b4..e14c1c5fd334 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -258,8 +258,8 @@ public:
InputContext maInputContext;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > mxWindowPeer;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
- ::boost::shared_ptr< VclSizeGroup > m_xSizeGroup;
- ::std::vector< FixedText* > m_aMnemonicLabels;
+ std::shared_ptr<VclSizeGroup> m_xSizeGroup;
+ std::vector<FixedText*> m_aMnemonicLabels;
ImplAccessibleInfos* mpAccessibleInfos;
VCLXWindow* mpVCLXWindow;
vcl::Region maWinRegion; //< region to 'shape' the VCL window (frame coordinates)