avmedia/source/vlc/vlcframegrabber.cxx | 2
avmedia/source/vlc/vlcframegrabber.hxx | 1
basctl/source/basicide/basicbox.cxx | 2
basctl/source/basicide/baside2.hxx | 6 -
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/basides1.cxx | 4 -
basctl/source/basicide/basidesh.cxx | 2
basctl/source/dlged/managelang.cxx | 4 -
basctl/source/inc/basidesh.hxx | 6 -
basctl/source/inc/managelang.hxx | 8 +-
basctl/source/inc/scriptdocument.hxx | 4 -
basic/source/inc/sbunoobj.hxx | 3
canvas/source/directx/dx_bitmap.hxx | 4 -
canvas/source/directx/dx_bitmapprovider.hxx | 4 -
canvas/source/directx/dx_canvasbitmap.hxx | 4 -
canvas/source/directx/dx_canvasfont.hxx | 6 -
canvas/source/directx/dx_canvashelper_texturefill.cxx | 3
canvas/source/directx/dx_gdiplususer.hxx | 5 -
canvas/source/directx/dx_graphicsprovider.hxx | 5 -
canvas/source/directx/dx_ibitmap.hxx | 4 -
canvas/source/directx/dx_impltools.hxx | 6 -
canvas/source/directx/dx_rendermodule.hxx | 4 -
canvas/source/directx/dx_surfacebitmap.hxx | 2
canvas/source/directx/dx_textlayout_drawhelper.hxx | 4 -
canvas/source/directx/dx_vcltools.cxx | 8 +-
canvas/source/directx/dx_vcltools.hxx | 8 --
canvas/source/directx/dx_winstuff.hxx | 17 ++---
canvas/source/opengl/ogl_bitmapcanvashelper.hxx | 6 -
canvas/source/opengl/ogl_buffercontext.hxx | 5 -
canvas/source/opengl/ogl_canvasbitmap.hxx | 2
canvas/source/opengl/ogl_canvasfont.hxx | 1
canvas/source/opengl/ogl_spritedevicehelper.hxx | 3
canvas/source/tools/elapsedtime.cxx | 2
canvas/source/tools/page.hxx | 6 -
canvas/source/tools/pagemanager.hxx | 2
canvas/source/tools/surface.hxx | 2
canvas/source/tools/surfaceproxy.hxx | 2
canvas/source/vcl/backbuffer.hxx | 5 -
canvas/source/vcl/bitmapbackbuffer.hxx | 5 -
canvas/source/vcl/cachedbitmap.hxx | 6 -
canvas/source/vcl/outdevprovider.hxx | 5 -
comphelper/inc/pch/precompiled_comphelper.hxx | 1
comphelper/source/misc/threadpool.cxx | 10 +--
cppcanvas/source/inc/action.hxx | 5 -
cppcanvas/source/inc/implrenderer.hxx | 2
cppcanvas/source/wrapper/implbitmapcanvas.hxx | 2
cppcanvas/source/wrapper/implcolor.hxx | 4 -
cppcanvas/source/wrapper/implcustomsprite.hxx | 4 -
cppcanvas/source/wrapper/implfont.hxx | 4 -
cppcanvas/source/wrapper/implsprite.hxx | 4 -
cppcanvas/source/wrapper/implspritecanvas.hxx | 8 --
cppu/source/threadpool/jobqueue.hxx | 5 -
cppu/source/threadpool/thread.cxx | 1
cppu/source/threadpool/threadpool.cxx | 1
cppu/source/threadpool/threadpool.hxx | 4 -
cppuhelper/inc/pch/precompiled_cppuhelper.hxx | 2
cppuhelper/source/servicemanager.cxx | 52 +++++++---------
cppuhelper/source/servicemanager.hxx | 14 ++--
cui/inc/pch/precompiled_cui.hxx | 4 -
cui/source/customize/cfg.cxx | 1
cui/source/customize/macropg.cxx | 1
cui/source/dialogs/SpellDialog.cxx | 11 +--
cui/source/dialogs/cuifmsearch.cxx | 5 -
cui/source/dialogs/hltpbase.cxx | 3
cui/source/dialogs/pastedlg.cxx | 3
cui/source/dialogs/scriptdlg.cxx | 3
cui/source/factory/init.cxx | 1
cui/source/inc/cuioptgenrl.hxx | 5 -
cui/source/options/optaboutconfig.cxx | 7 --
cui/source/options/optaboutconfig.hxx | 6 -
cui/source/options/optbasic.cxx | 1
cui/source/options/optcolor.cxx | 16 ++--
cui/source/options/optgdlg.hxx | 4 -
cui/source/options/optgenrl.cxx | 7 --
cui/source/options/optlingu.cxx | 5 -
cui/source/options/optpath.cxx | 4 -
cui/source/options/treeopt.cxx | 4 -
cui/source/options/tsaurls.cxx | 4 -
cui/source/tabpages/autocdlg.cxx | 1
cui/source/tabpages/backgrnd.cxx | 7 --
cui/source/tabpages/chardlg.cxx | 1
cui/source/tabpages/grfpage.cxx | 3
cui/source/tabpages/numpages.cxx | 3
cui/source/tabpages/page.cxx | 3
cui/source/tabpages/paragrph.cxx | 9 +-
cui/source/tabpages/swpossizetabpage.cxx | 3
cui/source/tabpages/tparea.cxx | 11 +--
cui/source/tabpages/tpbitmap.cxx | 9 +-
cui/source/tabpages/tpcolor.cxx | 7 --
cui/source/tabpages/tpgradnt.cxx | 9 +-
cui/source/tabpages/tphatch.cxx | 9 +-
cui/source/tabpages/tpline.cxx | 19 ++---
cui/source/tabpages/tplnedef.cxx | 5 -
cui/source/tabpages/tplneend.cxx | 5 -
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 8 +-
drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 12 +--
hwpfilter/inc/pch/precompiled_hwp.hxx | 1
hwpfilter/source/hwpreader.cxx | 8 --
include/basebmp/debug.hxx | 4 -
include/canvas/debug.hxx | 2
include/canvas/elapsedtime.hxx | 7 --
include/canvas/rendering/bitmap.hxx | 15 ++--
include/canvas/rendering/icachedprimitive.hxx | 5 -
include/canvas/rendering/icolorbuffer.hxx | 6 -
include/canvas/rendering/irendermodule.hxx | 8 --
include/canvas/rendering/isurface.hxx | 6 -
include/canvas/rendering/isurfaceproxy.hxx | 5 -
include/canvas/rendering/isurfaceproxymanager.hxx | 8 --
include/comphelper/make_shared_from_uno.hxx | 12 +--
include/cppcanvas/bitmap.hxx | 5 -
include/cppcanvas/bitmapcanvas.hxx | 5 -
include/cppcanvas/canvas.hxx | 8 --
include/cppcanvas/canvasgraphic.hxx | 7 --
include/cppcanvas/color.hxx | 6 -
include/cppcanvas/customsprite.hxx | 6 -
include/cppcanvas/font.hxx | 6 -
include/cppcanvas/polypolygon.hxx | 5 -
include/cppcanvas/renderer.hxx | 5 -
include/cppcanvas/sprite.hxx | 5 -
include/cppcanvas/spritecanvas.hxx | 9 --
include/drawinglayer/processor3d/defaultprocessor3d.hxx | 10 +--
include/opencl/openclwrapper.hxx | 1
include/sfx2/sidebar/DeckDescriptor.hxx | 1
include/sfx2/sidebar/Panel.hxx | 2
include/sfx2/sidebar/PanelDescriptor.hxx | 1
include/sfx2/sidebar/ResourceManager.hxx | 1
include/sfx2/sidebar/SidebarController.hxx | 2
include/sfx2/sidebar/TabBar.hxx | 1
include/svtools/DocumentInfoPreview.hxx | 4 -
include/svx/charmap.hxx | 1
include/svx/fillctrl.hxx | 11 +--
include/svx/sidebar/AreaPropertyPanelBase.hxx | 15 ++--
opencl/source/opencl_device.cxx | 5 -
opencl/source/openclconfig.cxx | 1
opencl/source/openclwrapper.cxx | 8 +-
sfx2/source/sidebar/SidebarController.cxx | 6 -
slideshow/source/engine/activitiesqueue.cxx | 4 -
slideshow/source/engine/eventqueue.cxx | 4 -
slideshow/source/engine/rehearsetimingsactivity.cxx | 2
slideshow/source/engine/rehearsetimingsactivity.hxx | 6 -
slideshow/source/engine/shapes/viewmediashape.cxx | 6 -
slideshow/source/engine/slide/layermanager.cxx | 2
slideshow/source/engine/slideshowimpl.cxx | 4 -
slideshow/source/engine/slideview.cxx | 26 ++++----
slideshow/source/engine/transitions/slidechangebase.cxx | 2
slideshow/source/engine/transitions/slidechangebase.hxx | 16 ++--
slideshow/source/engine/wakeupevent.cxx | 2
slideshow/source/inc/activitiesqueue.hxx | 6 -
slideshow/source/inc/eventqueue.hxx | 6 -
slideshow/source/inc/shapeimporter.hxx | 6 -
slideshow/source/inc/tools.hxx | 6 -
slideshow/source/inc/unoview.hxx | 4 -
slideshow/source/inc/view.hxx | 4 -
slideshow/source/inc/viewlayer.hxx | 8 +-
slideshow/source/inc/wakeupevent.hxx | 2
156 files changed, 353 insertions(+), 511 deletions(-)
New commits:
commit 22b80ac8e213ff63ce4f60e7d491f12cb42db313
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 14 09:21:33 2015 +0100
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx
b/avmedia/source/vlc/vlcframegrabber.cxx
index e2634f9..6ba85f4 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -103,7 +103,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler&
eh, const rtl::OUString
rtl::OUString url;
osl::FileBase::getFileURLFromSystemPath( fileName, url );
- boost::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream(
url,
+ std::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url,
STREAM_STD_READ ) );
vcl::PNGReader reader( *stream );
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx
b/avmedia/source/vlc/vlcframegrabber.hxx
index 83fd08a..ce0fd80 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/media/XFrameGrabber.hpp>
#include <cppuhelper/implbase.hxx>
#include "vlccommon.hxx"
diff --git a/basctl/source/basicide/basicbox.cxx
b/basctl/source/basicide/basicbox.cxx
index 4bb502f..8801498 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -396,7 +396,7 @@ void LanguageBox::FillBox()
m_sCurrentText = GetSelectEntry();
ClearBox();
- boost::shared_ptr<LocalizationMgr>
pCurMgr(GetShell()->GetCurLocalizationMgr());
+ std::shared_ptr<LocalizationMgr>
pCurMgr(GetShell()->GetCurLocalizationMgr());
if ( pCurMgr->isLibraryLocalized() )
{
Enable();
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index b7135ce..7aab761 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -73,8 +73,8 @@ friend class CodeCompleteListBox;
private:
class ChangesListener;
- boost::scoped_ptr<ExtTextView> pEditView;
- boost::scoped_ptr<ExtTextEngine> pEditEngine;
+ std::unique_ptr<ExtTextView> pEditView;
+ std::unique_ptr<ExtTextEngine> pEditEngine;
ModulWindow& rModulWindow;
rtl::Reference< ChangesListener > listener_;
@@ -92,7 +92,7 @@ private:
// progress bar
class ProgressInfo;
- boost::scoped_ptr<ProgressInfo> pProgress;
+ std::unique_ptr<ProgressInfo> pProgress;
virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 971cb24..f97ffbe 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -221,8 +221,6 @@ private:
EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :
Window(pParent, WB_BORDER),
- pEditView(0),
- pEditEngine(0),
rModulWindow(*pModulWindow),
nCurTextWidth(0),
aHighlighter(HIGHLIGHT_BASIC),
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index 92d6837..5a3b9c5 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1088,7 +1088,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString&
rCurPath, const Script
bool bCopyResourcesForDialog = true;
if( bAddDialogLanguagesToLib )
{
- boost::shared_ptr<LocalizationMgr> pCurMgr =
pShell->GetCurLocalizationMgr();
+ std::shared_ptr<LocalizationMgr> pCurMgr =
pShell->GetCurLocalizationMgr();
lang::Locale aFirstLocale;
aFirstLocale = aOnlyInImportLanguages[0];
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index bcaa2a9..a4215bb 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -557,7 +557,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
break;
case SID_BASICIDE_SHOWWINDOW:
{
- boost::scoped_ptr< ScriptDocument > pDocument;
+ std::unique_ptr< ScriptDocument > pDocument;
SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem,
SID_BASICIDE_ARG_DOCUMENT, false );
if ( pDocumentItem )
@@ -906,7 +906,7 @@ void Shell::GetState(SfxItemSet &rSet)
else
{
OUString aItemStr;
- boost::shared_ptr<LocalizationMgr>
pCurMgr(GetCurLocalizationMgr());
+ std::shared_ptr<LocalizationMgr>
pCurMgr(GetCurLocalizationMgr());
if ( pCurMgr->isLibraryLocalized() )
{
Sequence< lang::Locale > aLocaleSeq =
pCurMgr->getStringResourceManager()->getLocales();
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index ab3c1ac..7410fea 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -950,7 +950,7 @@ void Shell::SetCurLibForLocalization( const ScriptDocument&
rDocument, const OUS
catch (const container::NoSuchElementException& )
{}
- m_pCurLocalizationMgr = boost::shared_ptr<LocalizationMgr>(new
LocalizationMgr(this, rDocument, aLibName, xStringResourceManager));
+ m_pCurLocalizationMgr = std::shared_ptr<LocalizationMgr>(new
LocalizationMgr(this, rDocument, aLibName, xStringResourceManager));
m_pCurLocalizationMgr->handleTranslationbar();
}
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index 47e765b..fcc515a 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -55,7 +55,7 @@ bool localesAreEqual( const Locale& rLocaleLeft, const
Locale& rLocaleRight )
return bRet;
}
-ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent,
boost::shared_ptr<LocalizationMgr> xLMgr)
+ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent,
std::shared_ptr<LocalizationMgr> xLMgr)
: ModalDialog(pParent, "ManageLanguagesDialog",
"modules/BasicIDE/ui/managelanguages.ui")
, m_xLocalizationMgr(xLMgr)
, m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG))
@@ -230,7 +230,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
// class SetDefaultLanguageDialog
-----------------------------------------------
-SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent,
boost::shared_ptr<LocalizationMgr> xLMgr)
+SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent,
std::shared_ptr<LocalizationMgr> xLMgr)
: ModalDialog(pParent, "DefaultLanguageDialog",
"modules/BasicIDE/ui/defaultlanguage.ui")
, m_pCheckLangLB(NULL)
, m_xLocalizationMgr(xLMgr)
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 9206e01..1dd3fc13 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -28,7 +28,7 @@
#include <svx/ifaceids.hxx>
#include <vcl/scrbar.hxx>
#include <map>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class SfxViewFactory;
class SdrView;
@@ -69,7 +69,7 @@ private:
VclPtr<BaseWindow> pCurWin;
ScriptDocument m_aCurDocument;
OUString m_aCurLibName;
- boost::shared_ptr<LocalizationMgr> m_pCurLocalizationMgr;
+ std::shared_ptr<LocalizationMgr> m_pCurLocalizationMgr;
VclPtr<ScrollBar> aHScrollBar;
VclPtr<ScrollBar> aVScrollBar;
@@ -160,7 +160,7 @@ public:
BaseWindow* GetCurWindow() const { return pCurWin; }
ScriptDocument const& GetCurDocument() const { return m_aCurDocument; }
OUString const& GetCurLibName() const { return m_aCurLibName; }
- boost::shared_ptr<LocalizationMgr> GetCurLocalizationMgr() const { return
m_pCurLocalizationMgr; }
+ std::shared_ptr<LocalizationMgr> GetCurLocalizationMgr() const { return
m_pCurLocalizationMgr; }
TabBar& GetTabBar() { return *pTabBar; }
WindowTable& GetWindowTable() { return aWindowTable; }
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 0bd64d7..469ee68 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -57,7 +57,7 @@ private:
VclPtr<PushButton> m_pDeletePB;
VclPtr<PushButton> m_pMakeDefPB;
- boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr;
+ std::shared_ptr<LocalizationMgr> m_xLocalizationMgr;
OUString m_sDefLangStr;
OUString m_sCreateLangStr;
@@ -72,7 +72,7 @@ private:
DECL_LINK(SelectHdl, void *);
public:
- ManageLanguageDialog( vcl::Window* pParent,
boost::shared_ptr<LocalizationMgr> _pLMgr );
+ ManageLanguageDialog( vcl::Window* pParent,
std::shared_ptr<LocalizationMgr> _pLMgr );
virtual ~ManageLanguageDialog();
virtual void dispose() SAL_OVERRIDE;
};
@@ -87,12 +87,12 @@ private:
VclPtr<FixedText> m_pDefinedFT;
VclPtr<FixedText> m_pAddedFT;
- boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr;
+ std::shared_ptr<LocalizationMgr> m_xLocalizationMgr;
void FillLanguageBox();
public:
- SetDefaultLanguageDialog(vcl::Window* pParent,
boost::shared_ptr<LocalizationMgr> xLMgr);
+ SetDefaultLanguageDialog(vcl::Window* pParent,
std::shared_ptr<LocalizationMgr> xLMgr);
virtual ~SetDefaultLanguageDialog();
virtual void dispose() SAL_OVERRIDE;
diff --git a/basctl/source/inc/scriptdocument.hxx
b/basctl/source/inc/scriptdocument.hxx
index 6b8dc90..815c78b 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/io/XInputStreamProvider.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
class SfxListener;
@@ -67,7 +67,7 @@ namespace basctl
{
private:
class Impl;
- boost::shared_ptr<Impl> m_pImpl;
+ std::shared_ptr<Impl> m_pImpl;
private:
/** creates a ScriptDocument instance which operates on the
application-wide
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index b9c2a6d9b..41a7852 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -37,7 +37,6 @@
#include <unordered_map>
#include <vector>
#include <map>
-#include <boost/shared_ptr.hpp>
void registerComponentToBeDisposedForBasic( css::uno::Reference<
css::lang::XComponent > xComponent, StarBASIC* pBasic );
@@ -110,7 +109,7 @@ class SbUnoObject: public SbxObject
bool bNeedIntrospection;
bool bNativeCOMObject;
css::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
- ::boost::shared_ptr< SbUnoStructRefObject > maStructInfo;
+ std::shared_ptr< SbUnoStructRefObject > maStructInfo;
// help method to establish the dbg_-properties
void implCreateDbgProperties();
diff --git a/canvas/source/directx/dx_bitmap.hxx
b/canvas/source/directx/dx_bitmap.hxx
index 90ebd05..b17c7f5 100644
--- a/canvas/source/directx/dx_bitmap.hxx
+++ b/canvas/source/directx/dx_bitmap.hxx
@@ -22,10 +22,10 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <boost/shared_ptr.hpp>
#include <basegfx/vector/b2ivector.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <memory>
#include "dx_winstuff.hxx"
#include "dx_ibitmap.hxx"
#include "dx_graphicsprovider.hxx"
@@ -79,7 +79,7 @@ namespace dxcanvas
bool mbAlpha;
};
- typedef ::boost::shared_ptr< DXBitmap > DXBitmapSharedPtr;
+ typedef std::shared_ptr< DXBitmap > DXBitmapSharedPtr;
}
#endif
diff --git a/canvas/source/directx/dx_bitmapprovider.hxx
b/canvas/source/directx/dx_bitmapprovider.hxx
index 1c9ae8f..f363f91 100644
--- a/canvas/source/directx/dx_bitmapprovider.hxx
+++ b/canvas/source/directx/dx_bitmapprovider.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
#include "dx_ibitmap.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace dxcanvas
{
@@ -31,7 +31,7 @@ namespace dxcanvas
virtual IBitmapSharedPtr getBitmap() const = 0;
};
- typedef boost::shared_ptr<BitmapProvider> BitmapProviderSharedPtr;
+ typedef std::shared_ptr<BitmapProvider> BitmapProviderSharedPtr;
}
#endif
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx
b/canvas/source/directx/dx_canvasbitmap.hxx
index 0ed123d..d23325b 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -24,11 +24,7 @@
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#include <com/sun/star/rendering/XIntegerBitmap.hpp>
#include <com/sun/star/beans/XFastPropertySet.hpp>
-
#include <basegfx/vector/b2isize.hxx>
-
-#include <boost/shared_ptr.hpp>
-
#include <cppuhelper/compbase.hxx>
#include <comphelper/uno3.hxx>
#include <canvas/base/basemutexhelper.hxx>
diff --git a/canvas/source/directx/dx_canvasfont.hxx
b/canvas/source/directx/dx_canvasfont.hxx
index d6a7880..fbbdb61 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -29,7 +29,7 @@
#include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/noncopyable.hpp>
#include "dx_winstuff.hxx"
@@ -40,8 +40,8 @@
namespace dxcanvas
{
- typedef ::boost::shared_ptr< Gdiplus::Font > FontSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::FontFamily > FontFamilySharedPtr;
+ typedef std::shared_ptr< Gdiplus::Font > FontSharedPtr;
+ typedef std::shared_ptr< Gdiplus::FontFamily > FontFamilySharedPtr;
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo >
CanvasFont_Base;
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx
b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index f776ec7..c2e0c96 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
#include <boost/tuple/tuple.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
@@ -50,7 +49,7 @@ namespace dxcanvas
{
namespace
{
- typedef ::boost::shared_ptr< Gdiplus::PathGradientBrush >
PathGradientBrushSharedPtr;
+ typedef std::shared_ptr< Gdiplus::PathGradientBrush >
PathGradientBrushSharedPtr;
bool fillLinearGradient( GraphicsSharedPtr&
rGraphics,
const
::canvas::ParametricPolyPolygon::Values& /*rValues*/,
diff --git a/canvas/source/directx/dx_gdiplususer.hxx
b/canvas/source/directx/dx_gdiplususer.hxx
index 2f11574..a050d24 100644
--- a/canvas/source/directx/dx_gdiplususer.hxx
+++ b/canvas/source/directx/dx_gdiplususer.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
#include <sal/config.h>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of GDIPlusUser class */
@@ -31,7 +30,7 @@ namespace dxcanvas
class GDIPlusUser
{
public:
- typedef ::boost::shared_ptr< GDIPlusUser > GDIPlusUserSharedPtr;
+ typedef std::shared_ptr< GDIPlusUser > GDIPlusUserSharedPtr;
static GDIPlusUserSharedPtr createInstance();
~GDIPlusUser();
diff --git a/canvas/source/directx/dx_graphicsprovider.hxx
b/canvas/source/directx/dx_graphicsprovider.hxx
index 1b7ec65..4e8e427 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.hxx
@@ -21,9 +21,8 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
#include "dx_winstuff.hxx"
-
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
+#include <memory>
namespace Gdiplus{ class Graphics; }
@@ -39,7 +38,7 @@ namespace dxcanvas
virtual GraphicsSharedPtr getGraphics() = 0;
};
- typedef ::boost::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
+ typedef std::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
}
#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
diff --git a/canvas/source/directx/dx_ibitmap.hxx
b/canvas/source/directx/dx_ibitmap.hxx
index 28d6ee1..c16faaf 100644
--- a/canvas/source/directx/dx_ibitmap.hxx
+++ b/canvas/source/directx/dx_ibitmap.hxx
@@ -22,10 +22,10 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <boost/shared_ptr.hpp>
#include <basegfx/vector/b2ivector.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <memory>
#include "dx_graphicsprovider.hxx"
namespace dxcanvas
@@ -56,7 +56,7 @@ namespace dxcanvas
const css::geometry::IntegerPoint2D& pos ) = 0;
};
- typedef boost::shared_ptr<IBitmap> IBitmapSharedPtr;
+ typedef std::shared_ptr<IBitmap> IBitmapSharedPtr;
}
#endif
diff --git a/canvas/source/directx/dx_impltools.hxx
b/canvas/source/directx/dx_impltools.hxx
index 62be92b..5601e21 100644
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.hxx
@@ -28,7 +28,7 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/numeric/ftools.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "dx_canvasfont.hxx"
namespace basegfx
@@ -106,11 +106,11 @@ namespace dxcanvas
bool drawGdiPlusBitmap( const GraphicsSharedPtr& rGraphics,
const BitmapSharedPtr& rBitmap );
- bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >&
rGraphics,
+ bool drawDIBits( const std::shared_ptr< Gdiplus::Graphics >& rGraphics,
const BITMAPINFO& rBI,
const void* pBits
);
- bool drawRGBABits( const ::boost::shared_ptr< Gdiplus::Graphics >&
rGraphics,
+ bool drawRGBABits( const std::shared_ptr< Gdiplus::Graphics >&
rGraphics,
const RawRGBABitmap&
rRawRGBAData );
BitmapSharedPtr bitmapFromXBitmap( const css::uno::Reference<
css::rendering::XBitmap >& xBitmap );
diff --git a/canvas/source/directx/dx_rendermodule.hxx
b/canvas/source/directx/dx_rendermodule.hxx
index 6a61a64..b486395 100644
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.hxx
@@ -23,7 +23,7 @@
#include <basegfx/vector/b2ivector.hxx>
#include <basegfx/range/b2irectangle.hxx>
#include <canvas/rendering/irendermodule.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "dx_winstuff.hxx"
namespace vcl { class Window; }
@@ -69,7 +69,7 @@ namespace dxcanvas
virtual HWND getHWND() const = 0;
};
- typedef ::boost::shared_ptr< IDXRenderModule > IDXRenderModuleSharedPtr;
+ typedef std::shared_ptr< IDXRenderModule > IDXRenderModuleSharedPtr;
/** Factory method, to create an IRenderModule instance for the
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx
b/canvas/source/directx/dx_surfacebitmap.hxx
index 6d1744e..85b2c610 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -130,7 +130,7 @@ namespace dxcanvas
bool mbAlpha;
};
- typedef ::boost::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr;
+ typedef std::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr;
}
#endif
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx
b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index fbbe023..b524254 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/rendering/StringContext.hpp>
@@ -46,7 +46,7 @@ namespace dxcanvas
~TextLayoutDrawHelper();
// draw text
- void drawText( const boost::shared_ptr<Gdiplus::Graphics>&
rGraphics,
+ void drawText( const std::shared_ptr<Gdiplus::Graphics>&
rGraphics,
const css::rendering::ViewState& rViewState,
const css::rendering::RenderState& rRenderState,
const ::basegfx::B2ISize& rOutputOffset,
diff --git a/canvas/source/directx/dx_vcltools.cxx
b/canvas/source/directx/dx_vcltools.cxx
index 336dc0b..38462b4 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -64,7 +64,7 @@ namespace dxcanvas
}
/// Draw DI bits to given Graphics
- bool drawDIBits( const ::boost::shared_ptr< Gdiplus::Graphics >&
rGraphics,
+ bool drawDIBits( const std::shared_ptr< Gdiplus::Graphics >&
rGraphics,
const void*
hDIB )
{
bool bRet( false );
@@ -94,7 +94,7 @@ namespace dxcanvas
Reference to bitmap. Might get modified, in such a way
that it will hold a DIB after a successful function call.
*/
- bool drawVCLBitmap( const ::boost::shared_ptr< Gdiplus::Graphics
>& rGraphics,
+ bool drawVCLBitmap( const std::shared_ptr< Gdiplus::Graphics >&
rGraphics,
::Bitmap&
rBmp )
{
BitmapSystemData aBmpSysData;
@@ -467,7 +467,7 @@ namespace dxcanvas
return aBmpData;
}
- bool drawVCLBitmapEx( const ::boost::shared_ptr< Gdiplus::Graphics
>& rGraphics,
+ bool drawVCLBitmapEx( const std::shared_ptr< Gdiplus::Graphics >&
rGraphics,
const ::BitmapEx&
rBmpEx )
{
if( !rBmpEx.IsTransparent() )
@@ -483,7 +483,7 @@ namespace dxcanvas
}
}
- bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr<
Gdiplus::Graphics >& rGraphics,
+ bool drawVCLBitmapFromXBitmap( const std::shared_ptr<
Gdiplus::Graphics >& rGraphics,
const uno::Reference<
rendering::XBitmap >& xBitmap )
{
// TODO(F2): add support for floating point bitmap formats
diff --git a/canvas/source/directx/dx_vcltools.hxx
b/canvas/source/directx/dx_vcltools.hxx
index 4222527..e3fb622 100644
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.hxx
@@ -22,9 +22,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/util/TriState.hpp>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
namespace Gdiplus { class Graphics; }
@@ -39,10 +37,10 @@ namespace dxcanvas
{
sal_Int32 mnWidth;
sal_Int32 mnHeight;
- ::boost::shared_ptr< sal_uInt8 > mpBitmapData;
+ std::shared_ptr< sal_uInt8 > mpBitmapData;
};
- bool drawVCLBitmapFromXBitmap( const ::boost::shared_ptr<
Gdiplus::Graphics >& rGraphics,
+ bool drawVCLBitmapFromXBitmap( const std::shared_ptr<
Gdiplus::Graphics >& rGraphics,
const css::uno::Reference<
css::rendering::XBitmap >&
xBitmap );
}
diff --git a/canvas/source/directx/dx_winstuff.hxx
b/canvas/source/directx/dx_winstuff.hxx
index 5ffd3ab..478acaf 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX
#include <algorithm>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <basegfx/numeric/ftools.hxx>
@@ -72,13 +71,13 @@ typedef IDirect3DSurface9 surface_type;
namespace dxcanvas
{
// some shared pointer typedefs to Gdiplus objects
- typedef ::boost::shared_ptr< Gdiplus::Graphics > GraphicsSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::GraphicsPath >
GraphicsPathSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::Bitmap > BitmapSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::CachedBitmap >
CachedBitmapSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::Font > FontSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::Brush > BrushSharedPtr;
- typedef ::boost::shared_ptr< Gdiplus::TextureBrush >
TextureBrushSharedPtr;
+ typedef std::shared_ptr< Gdiplus::Graphics > GraphicsSharedPtr;
+ typedef std::shared_ptr< Gdiplus::GraphicsPath > GraphicsPathSharedPtr;
+ typedef std::shared_ptr< Gdiplus::Bitmap > BitmapSharedPtr;
+ typedef std::shared_ptr< Gdiplus::CachedBitmap > CachedBitmapSharedPtr;
+ typedef std::shared_ptr< Gdiplus::Font > FontSharedPtr;
+ typedef std::shared_ptr< Gdiplus::Brush > BrushSharedPtr;
+ typedef std::shared_ptr< Gdiplus::TextureBrush > TextureBrushSharedPtr;
/** COM object RAII wrapper
diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
index c820d30..cfb8ff8 100644
--- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
+++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx
@@ -15,14 +15,8 @@
#include <basegfx/vector/b2isize.hxx>
#include <basegfx/vector/b2dsize.hxx>
-
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
#include "ogl_canvashelper.hxx"
-
namespace oglcanvas
{
/** Helper class for basic canvas functionality. */
diff --git a/canvas/source/opengl/ogl_buffercontext.hxx
b/canvas/source/opengl/ogl_buffercontext.hxx
index a99446b..202e063 100644
--- a/canvas/source/opengl/ogl_buffercontext.hxx
+++ b/canvas/source/opengl/ogl_buffercontext.hxx
@@ -13,8 +13,7 @@
#include <GL/glew.h>
#include <sal/config.h>
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
namespace oglcanvas
{
@@ -31,7 +30,7 @@ namespace oglcanvas
virtual GLuint getTextureId() = 0;
};
- typedef ::boost::shared_ptr<IBufferContext> IBufferContextSharedPtr;
+ typedef std::shared_ptr<IBufferContext> IBufferContextSharedPtr;
}
#endif
diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx
b/canvas/source/opengl/ogl_canvasbitmap.hxx
index ba2d0a6..99cc425 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.hxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.hxx
@@ -19,8 +19,6 @@
#include <canvas/base/basemutexhelper.hxx>
#include <basegfx/vector/b2isize.hxx>
-#include <boost/shared_ptr.hpp>
-
#include "ogl_bitmapcanvashelper.hxx"
#include "ogl_spritecanvas.hxx"
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx
b/canvas/source/opengl/ogl_canvasfont.hxx
index 12f6617..3a87a1c 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -18,7 +18,6 @@
#include <rtl/ref.hxx>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx
b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index 2a99145..e7a1076 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -16,7 +16,6 @@
#include <canvas/elapsedtime.hxx>
#include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include "ogl_buffercontext.hxx"
@@ -131,7 +130,7 @@ namespace oglcanvas
/// For the frame counter timings
::canvas::tools::ElapsedTime maLastUpdate;
- boost::shared_ptr<TextureCache> mpTextureCache;
+ std::shared_ptr<TextureCache> mpTextureCache;
unsigned int
mnLinearTwoColorGradientProgram;
unsigned int
mnLinearMultiColorGradientProgram;
diff --git a/canvas/source/tools/elapsedtime.cxx
b/canvas/source/tools/elapsedtime.cxx
index 4fa6477..8922f5c 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -123,7 +123,7 @@ ElapsedTime::ElapsedTime()
}
ElapsedTime::ElapsedTime(
- boost::shared_ptr<ElapsedTime> const & pTimeBase )
+ std::shared_ptr<ElapsedTime> const & pTimeBase )
: m_pTimeBase( pTimeBase ),
m_fLastQueriedTime( 0.0 ),
m_fStartTime( getCurrentTime() ),
diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index 75ef544..c456a29 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.hxx
@@ -27,15 +27,15 @@
#include <canvas/rendering/isurface.hxx>
#include <list>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include "surfacerect.hxx"
namespace canvas
{
class PageFragment;
- typedef ::boost::shared_ptr< PageFragment > FragmentSharedPtr;
+ typedef std::shared_ptr< PageFragment > FragmentSharedPtr;
/** One page of IRenderModule-provided texture space
*/
@@ -62,7 +62,7 @@ namespace canvas
bool isValidLocation( const SurfaceRect& r ) const;
};
- typedef ::boost::shared_ptr< Page > PageSharedPtr;
+ typedef std::shared_ptr< Page > PageSharedPtr;
/** A part of a page, which gets allocated to a surface
diff --git a/canvas/source/tools/pagemanager.hxx
b/canvas/source/tools/pagemanager.hxx
index 632d4d6..9161fe4 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -72,7 +72,7 @@ namespace canvas
// PageManagerSharedPtr
- typedef ::boost::shared_ptr< PageManager > PageManagerSharedPtr;
+ typedef std::shared_ptr< PageManager > PageManagerSharedPtr;
}
#endif
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index 33186c1..d6b8d90 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.hxx
@@ -142,7 +142,7 @@ namespace canvas
const ::basegfx::B2ISize& rSize )
const;
};
- typedef ::boost::shared_ptr< Surface > SurfaceSharedPtr;
+ typedef std::shared_ptr< Surface > SurfaceSharedPtr;
}
#endif
diff --git a/canvas/source/tools/surfaceproxy.hxx
b/canvas/source/tools/surfaceproxy.hxx
index 3eb7019..56f4ac7 100644
--- a/canvas/source/tools/surfaceproxy.hxx
+++ b/canvas/source/tools/surfaceproxy.hxx
@@ -115,7 +115,7 @@ namespace canvas
canvas::IColorBufferSharedPtr mpBuffer;
};
- typedef ::boost::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr;
+ typedef std::shared_ptr< SurfaceProxy > SurfaceProxySharedPtr;
}
#endif
diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 0beeda2..babdf93 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.hxx
@@ -25,8 +25,7 @@
#include <canvas/vclwrapper.hxx>
#include "outdevprovider.hxx"
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
namespace vclcanvas
{
@@ -54,7 +53,7 @@ namespace vclcanvas
VclPtr< VirtualDevice > maVDev;
};
- typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
+ typedef std::shared_ptr< BackBuffer > BackBufferSharedPtr;
}
#endif // INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX
diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx
b/canvas/source/vcl/bitmapbackbuffer.hxx
index b518679..1207369 100644
--- a/canvas/source/vcl/bitmapbackbuffer.hxx
+++ b/canvas/source/vcl/bitmapbackbuffer.hxx
@@ -26,8 +26,7 @@
#include <canvas/vclwrapper.hxx>
#include "outdevprovider.hxx"
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
namespace vclcanvas
{
@@ -88,7 +87,7 @@ namespace vclcanvas
mutable bool mbVDevContentIsCurrent;
};
- typedef ::boost::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr;
+ typedef std::shared_ptr< BitmapBackBuffer > BitmapBackBufferSharedPtr;
}
diff --git a/canvas/source/vcl/cachedbitmap.hxx
b/canvas/source/vcl/cachedbitmap.hxx
index ffb9d57..acf8391 100644
--- a/canvas/source/vcl/cachedbitmap.hxx
+++ b/canvas/source/vcl/cachedbitmap.hxx
@@ -21,17 +21,15 @@
#define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX
#include <canvas/base/cachedprimitivebase.hxx>
-
#include <svtools/grfmgr.hxx>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of CachedBitmap class */
namespace vclcanvas
{
- typedef ::boost::shared_ptr< GraphicObject > GraphicObjectSharedPtr;
+ typedef std::shared_ptr< GraphicObject > GraphicObjectSharedPtr;
class CachedBitmap : public ::canvas::CachedPrimitiveBase
{
diff --git a/canvas/source/vcl/outdevprovider.hxx
b/canvas/source/vcl/outdevprovider.hxx
index 37c48c6..c09b580 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
#include <sal/types.h>
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
class OutputDevice;
@@ -47,7 +46,7 @@ namespace vclcanvas
virtual const OutputDevice& getOutDev() const = 0;
};
- typedef ::boost::shared_ptr< OutDevProvider > OutDevProviderSharedPtr;
+ typedef std::shared_ptr< OutDevProvider > OutDevProviderSharedPtr;
}
#endif // INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx
b/comphelper/inc/pch/precompiled_comphelper.hxx
index 35bdc06..cfc8055 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -20,7 +20,6 @@
#include <boost/current_function.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
-#include <boost/shared_ptr.hpp>
#include <cassert>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index a916ba9..965a93c 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -10,9 +10,9 @@
#include <comphelper/threadpool.hxx>
#include <rtl/instance.hxx>
-#include <boost/shared_ptr.hpp>
-#include <thread>
#include <algorithm>
+#include <memory>
+#include <thread>
namespace comphelper {
@@ -111,12 +111,12 @@ ThreadPool::~ThreadPool()
waitAndCleanupWorkers();
}
-struct ThreadPoolStatic : public rtl::StaticWithInit< boost::shared_ptr<
ThreadPool >,
+struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr<
ThreadPool >,
ThreadPoolStatic >
{
- boost::shared_ptr< ThreadPool > operator () () {
+ std::shared_ptr< ThreadPool > operator () () {
sal_Int32 nThreads = std::max( std::thread::hardware_concurrency(), 1U
);
- return boost::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) );
+ return std::shared_ptr< ThreadPool >( new ThreadPool( nThreads ) );
};
};
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index c47bb29..aa63ffc 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace basegfx
{
@@ -146,7 +145,7 @@ namespace cppcanvas
virtual sal_Int32 getActionCount() const = 0;
};
- typedef ::boost::shared_ptr< Action > ActionSharedPtr;
+ typedef std::shared_ptr< Action > ActionSharedPtr;
}
}
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 6c62728..dbf205d 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -21,8 +21,6 @@
#define INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/renderer.hxx>
#include <cppcanvas/canvas.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 32cf790..08ea31f5 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -22,8 +22,6 @@
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
-
-#include <boost/shared_ptr.hpp>
#include <basegfx/vector/b2dsize.hxx>
#include <cppcanvas/bitmapcanvas.hxx>
diff --git a/cppcanvas/source/wrapper/implcolor.hxx
b/cppcanvas/source/wrapper/implcolor.hxx
index 7a317ad..f6949b2 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -21,13 +21,9 @@
#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
#include <com/sun/star/uno/Sequence.hxx>
-
-#include <boost/shared_ptr.hpp>
-
#include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <cppcanvas/color.hxx>
-
/* Definition of Color class */
namespace cppcanvas
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx
b/cppcanvas/source/wrapper/implcustomsprite.hxx
index ba3acdb..4e6674d 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -21,15 +21,11 @@
#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/canvas.hxx>
#include <cppcanvas/customsprite.hxx>
-
#include <implsprite.hxx>
#include <implspritecanvas.hxx>
-
namespace cppcanvas
{
namespace internal
diff --git a/cppcanvas/source/wrapper/implfont.hxx
b/cppcanvas/source/wrapper/implfont.hxx
index 710cb41..bb8793c 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -21,13 +21,9 @@
#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
-
#include <com/sun/star/rendering/XCanvas.hpp>
#include <cppcanvas/font.hxx>
-
namespace com { namespace sun { namespace star { namespace rendering
{
class XCanvasFont;
diff --git a/cppcanvas/source/wrapper/implsprite.hxx
b/cppcanvas/source/wrapper/implsprite.hxx
index 0947485..e5aeb29 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -23,13 +23,9 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <com/sun/star/rendering/XSprite.hpp>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/sprite.hxx>
-
#include <implspritecanvas.hxx>
-
namespace cppcanvas
{
namespace internal
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx
b/cppcanvas/source/wrapper/implspritecanvas.hxx
index b2af49d..51374bf 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -23,15 +23,9 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-
-#include <boost/shared_ptr.hpp>
-
-
#include <cppcanvas/spritecanvas.hxx>
-
#include <implcanvas.hxx>
-
namespace cppcanvas
{
namespace internal
@@ -76,7 +70,7 @@ namespace cppcanvas
::basegfx::B2DHomMatrix maTransformation;
};
- typedef ::boost::shared_ptr< TransformationArbiter >
TransformationArbiterSharedPtr;
+ typedef std::shared_ptr< TransformationArbiter >
TransformationArbiterSharedPtr;
private:
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& )
SAL_DELETED_FUNCTION;
diff --git a/cppu/source/threadpool/jobqueue.hxx
b/cppu/source/threadpool/jobqueue.hxx
index 3a55d6b..6d35798 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -21,13 +21,12 @@
#define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
#include <list>
+#include <memory>
#include <sal/types.h>
#include <osl/conditn.hxx>
#include <osl/mutex.hxx>
-#include <boost/shared_ptr.hpp>
-
namespace cppu_threadpool
{
extern "C" typedef void (SAL_CALL RequestFun)(void *);
@@ -43,7 +42,7 @@ namespace cppu_threadpool
typedef ::std::list < sal_Int64 > CallStackList;
class DisposedCallerAdmin;
- typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
+ typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
class JobQueue
{
diff --git a/cppu/source/threadpool/thread.cxx
b/cppu/source/threadpool/thread.cxx
index d1d448f..ead78c3 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -19,6 +19,7 @@
#include <sal/config.h>
+#include <algorithm>
#include <cstdlib>
#include <osl/diagnose.h>
#include <uno/threadpool.h>
diff --git a/cppu/source/threadpool/threadpool.cxx
b/cppu/source/threadpool/threadpool.cxx
index 6e7a2c0..9868d0c 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -20,6 +20,7 @@
#include "sal/config.h"
#include <cassert>
+#include <algorithm>
#include <unordered_map>
#include <osl/diagnose.h>
diff --git a/cppu/source/threadpool/threadpool.hxx
b/cppu/source/threadpool/threadpool.hxx
index b13dc0f..d1605d8 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -29,8 +29,6 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <boost/shared_ptr.hpp>
-
#include "jobqueue.hxx"
@@ -80,7 +78,7 @@ namespace cppu_threadpool {
typedef ::std::list < struct ::cppu_threadpool::WaitingThread * >
WaitingThreadList;
class DisposedCallerAdmin;
- typedef boost::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
+ typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
class DisposedCallerAdmin
{
diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
index 0eae678..d54a695 100644
--- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
+++ b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
@@ -17,8 +17,6 @@
#include <algorithm>
#include <boost/noncopyable.hpp>
#include <memory>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <cassert>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/Property.hpp>
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index 2140a2f..c58caf8 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -14,8 +14,6 @@
#include <vector>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/ElementExistException.hpp>
@@ -67,7 +65,7 @@ void insertImplementationMap(
i != source.end(); ++i)
{
std::vector<
- boost::shared_ptr<
+ std::shared_ptr<
cppuhelper::ServiceManager::Data::Implementation > > & impls
= (*destination)[i->first];
impls.insert(impls.end(), i->second.begin(), i->second.end());
@@ -77,7 +75,7 @@ void insertImplementationMap(
void removeFromImplementationMap(
cppuhelper::ServiceManager::Data::ImplementationMap * map,
std::vector< rtl::OUString > const & elements,
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
const & implementation)
{
// The underlying data structures make this function somewhat inefficient,
@@ -90,7 +88,7 @@ void removeFromImplementationMap(
map->find(*i));
assert(j != map->end());
std::vector<
- boost::shared_ptr<
+ std::shared_ptr<
cppuhelper::ServiceManager::Data::Implementation > >::iterator
k(std::find(j->second.begin(), j->second.end(), implementation));
assert(k != j->second.end());
@@ -129,7 +127,7 @@ private:
rtl::OUString attrUri_;
rtl::OUString attrEnvironment_;
rtl::OUString attrPrefix_;
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
implementation_;
};
@@ -495,7 +493,7 @@ class SingletonFactory:
public:
SingletonFactory(
rtl::Reference< cppuhelper::ServiceManager > const & manager,
- boost::shared_ptr<
+ std::shared_ptr<
cppuhelper::ServiceManager::Data::Implementation > const &
implementation):
manager_(manager), implementation_(implementation)
@@ -516,7 +514,7 @@ private:
throw (css::uno::Exception, css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
rtl::Reference< cppuhelper::ServiceManager > manager_;
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
implementation_;
};
@@ -549,7 +547,7 @@ class ImplementationWrapper:
public:
ImplementationWrapper(
rtl::Reference< cppuhelper::ServiceManager > const & manager,
- boost::shared_ptr<
+ std::shared_ptr<
cppuhelper::ServiceManager::Data::Implementation > const &
implementation):
manager_(manager), implementation_(implementation)
@@ -587,7 +585,7 @@ private:
getSupportedServiceNames() throw (css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
rtl::Reference< cppuhelper::ServiceManager > manager_;
- boost::weak_ptr< cppuhelper::ServiceManager::Data::Implementation >
+ std::weak_ptr< cppuhelper::ServiceManager::Data::Implementation >
implementation_;
};
@@ -596,7 +594,7 @@ ImplementationWrapper::createInstanceWithContext(
css::uno::Reference< css::uno::XComponentContext > const & Context)
throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl
= implementation_.lock();
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl =
implementation_.lock();
assert(impl);
manager_->loadImplementation(Context, impl);
return impl->createInstance(Context, false);
@@ -608,7 +606,7 @@
ImplementationWrapper::createInstanceWithArgumentsAndContext(
css::uno::Reference< css::uno::XComponentContext > const & Context)
throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl
= implementation_.lock();
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl =
implementation_.lock();
assert(impl);
manager_->loadImplementation(Context, impl);
return impl->createInstanceWithArguments(
@@ -634,7 +632,7 @@ ImplementationWrapper::createInstanceWithArguments(
rtl::OUString ImplementationWrapper::getImplementationName()
throw (css::uno::RuntimeException, std::exception)
{
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl
= implementation_.lock();
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl =
implementation_.lock();
assert(impl);
return impl->info->name;
}
@@ -649,7 +647,7 @@ css::uno::Sequence< rtl::OUString >
ImplementationWrapper::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception)
{
- boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl
= implementation_.lock();
+ std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl =
implementation_.lock();
assert(impl);
if (impl->info->services.size()
> static_cast< sal_uInt32 >(SAL_MAX_INT32))
@@ -773,7 +771,7 @@ void cppuhelper::ServiceManager::addSingletonContextEntries(
void cppuhelper::ServiceManager::loadImplementation(
css::uno::Reference< css::uno::XComponentContext > const & context,
- boost::shared_ptr< Data::Implementation > & implementation)
+ std::shared_ptr< Data::Implementation > & implementation)
{
assert(implementation.get() != 0);
{
@@ -1014,7 +1012,7 @@ cppuhelper::ServiceManager::createInstanceWithContext(
css::uno::Reference< css::uno::XComponentContext > const & Context)
throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
- boost::shared_ptr< Data::Implementation > impl(
+ std::shared_ptr< Data::Implementation > impl(
findServiceImplementation(Context, aServiceSpecifier));
return impl.get() == 0
? css::uno::Reference< css::uno::XInterface >()
@@ -1028,7 +1026,7 @@
cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
css::uno::Reference< css::uno::XComponentContext > const & Context)
throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
- boost::shared_ptr< Data::Implementation > impl(
+ std::shared_ptr< Data::Implementation > impl(
findServiceImplementation(Context, ServiceSpecifier));
return impl.get() == 0
? css::uno::Reference< css::uno::XInterface >()
@@ -1183,7 +1181,7 @@ cppuhelper::ServiceManager::createContentEnumeration(
rtl::OUString const & aServiceName)
throw (css::uno::RuntimeException, std::exception)
{
- std::vector< boost::shared_ptr< Data::Implementation > > impls;
+ std::vector< std::shared_ptr< Data::Implementation > > impls;
{
osl::MutexGuard g(rBHelper.rMutex);
Data::ImplementationMap::const_iterator i(
@@ -1194,7 +1192,7 @@ cppuhelper::ServiceManager::createContentEnumeration(
}
std::vector< css::uno::Any > factories;
for (std::vector<
- boost::shared_ptr< Data::Implementation > >::const_iterator i(
+ std::shared_ptr< Data::Implementation > >::const_iterator i(
impls.begin());
i != impls.end(); ++i)
{
@@ -1496,7 +1494,7 @@ bool
cppuhelper::ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
assert(implKey.getName().match("/IMPLEMENTATIONS/"));
rtl::OUString name(
implKey.getName().copy(RTL_CONSTASCII_LENGTH("/IMPLEMENTATIONS/")));
- boost::shared_ptr< Data::Implementation > impl(
+ std::shared_ptr< Data::Implementation > impl(
new Data::Implementation(
name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
readLegacyRdbString(uri, implKey, "UNO/LOCATION"), "", "", "",
@@ -1633,7 +1631,7 @@ void cppuhelper::ServiceManager::insertLegacyFactory(
}
css::uno::Reference< css::lang::XComponent > comp(
factoryInfo, css::uno::UNO_QUERY);
- boost::shared_ptr< Data::Implementation > impl(
+ std::shared_ptr< Data::Implementation > impl(
new Data::Implementation(name, f1, f2, comp));
Data extra;
if (!name.isEmpty()) {
@@ -1739,7 +1737,7 @@ void cppuhelper::ServiceManager::removeRdbFiles(
// The underlying data structures make this function somewhat inefficient,
// but the assumption is that it is rarely called (and that if it is
called,
// it is called with a uris vector of size one):
- std::vector< boost::shared_ptr< Data::Implementation > > clear;
+ std::vector< std::shared_ptr< Data::Implementation > > clear;
{
osl::MutexGuard g(rBHelper.rMutex);
for (std::vector< rtl::OUString >::const_iterator i(uris.begin());
@@ -1774,7 +1772,7 @@ bool cppuhelper::ServiceManager::removeLegacyFactory(
bool removeListener)
{
assert(factoryInfo.is());
- boost::shared_ptr< Data::Implementation > clear;
+ std::shared_ptr< Data::Implementation > clear;
css::uno::Reference< css::lang::XComponent > comp;
{
osl::MutexGuard g(rBHelper.rMutex);
@@ -1807,7 +1805,7 @@ bool cppuhelper::ServiceManager::removeLegacyFactory(
void cppuhelper::ServiceManager::removeImplementation(const rtl::OUString &
name) {
// The underlying data structures make this function somewhat inefficient,
// but the assumption is that it is rarely called:
- boost::shared_ptr< Data::Implementation > clear;
+ std::shared_ptr< Data::Implementation > clear;
{
osl::MutexGuard g(rBHelper.rMutex);
if (isDisposed()) {
@@ -1840,12 +1838,12 @@ void
cppuhelper::ServiceManager::removeImplementation(const rtl::OUString & name
}
}
-boost::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
+std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
cppuhelper::ServiceManager::findServiceImplementation(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & specifier)
{
- boost::shared_ptr< Data::Implementation > impl;
+ std::shared_ptr< Data::Implementation > impl;
bool loaded;
{
osl::MutexGuard g(rBHelper.rMutex);
@@ -1856,7 +1854,7 @@ cppuhelper::ServiceManager::findServiceImplementation(
data_.namedImplementations.find(specifier));
if (j == data_.namedImplementations.end()) {
SAL_INFO("cppuhelper", "No implementation for " << specifier);
- return boost::shared_ptr< Data::Implementation >();
+ return std::shared_ptr< Data::Implementation >();
}
impl = j->second;
} else {
diff --git a/cppuhelper/source/servicemanager.hxx
b/cppuhelper/source/servicemanager.hxx
index 903084b..03ed72a 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -14,10 +14,10 @@
#include <cassert>
#include <map>
+#include <memory>
#include <vector>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
@@ -138,7 +138,7 @@ public:
enum Status { STATUS_NEW, STATUS_WRAPPER, STATUS_LOADED };
- boost::shared_ptr< ImplementationInfo > info;
+ std::shared_ptr< ImplementationInfo > info;
ImplementationConstructorFn * constructor;
css::uno::Reference< css::lang::XSingleComponentFactory > factory1;
css::uno::Reference< css::lang::XSingleServiceFactory > factory2;
@@ -155,19 +155,19 @@ public:
css::uno::Reference<css::uno::XInterface> const & instance);
};
- typedef std::map< rtl::OUString, boost::shared_ptr< Implementation > >
+ typedef std::map< rtl::OUString, std::shared_ptr< Implementation > >
NamedImplementations;
typedef
std::map<
css::uno::Reference< css::lang::XServiceInfo >,
- boost::shared_ptr< Implementation > >
+ std::shared_ptr< Implementation > >
DynamicImplementations;
typedef
std::map<
rtl::OUString,
- std::vector< boost::shared_ptr< Implementation > > >
+ std::vector< std::shared_ptr< Implementation > > >
ImplementationMap;
NamedImplementations namedImplementations;
@@ -201,7 +201,7 @@ public:
void loadImplementation(
css::uno::Reference< css::uno::XComponentContext > const & context,
- boost::shared_ptr< Data::Implementation > & implementation);
+ std::shared_ptr< Data::Implementation > & implementation);
private:
virtual ~ServiceManager() {}
@@ -371,7 +371,7 @@ private:
void removeImplementation(const rtl::OUString & name);
- boost::shared_ptr< Data::Implementation > findServiceImplementation(
+ std::shared_ptr< Data::Implementation > findServiceImplementation(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & specifier);
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index a830a65..98943bb 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -61,11 +61,7 @@
#include <basic/sbx.hxx>
#include <basic/sbxmeth.hxx>
#include <bitset>
-#include <boost/make_shared.hpp>
-#include <boost/ref.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <cassert>
#include <cmath>
#include <com/sun/star/awt/ContainerWindowProvider.hpp>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a69e8a1..b6bae42 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -96,7 +96,6 @@
#include <com/sun/star/util/thePathSettings.hpp>
#include "dlgname.hxx"
-#include <boost/scoped_ptr.hpp>
#define PRTSTR(x) OUStringToOString(x, RTL_TEXTENCODING_ASCII_US).pData->buffer
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2e9e877..246d5d5 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -44,7 +44,6 @@
#include <algorithm>
#include <set>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 45d302f..0312c96 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -59,7 +59,6 @@
#include <svtools/langtab.hxx>
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1469,7 +1468,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent&
rNEvt )
//text has been added on the right and only the 'error
attribute has to be corrected
if(pErrorAttrLeft)
{
- boost::scoped_ptr<TextAttrib>
pNewError(pErrorAttrLeft->GetAttr().Clone());
+ std::unique_ptr<TextAttrib>
pNewError(pErrorAttrLeft->GetAttr().Clone());
const sal_Int32 nStart = pErrorAttrLeft->GetStart();
sal_Int32 nEnd = pErrorAttrLeft->GetEnd();
pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft );
@@ -1488,7 +1487,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent&
rNEvt )
//determine the change
sal_Int32 nAddedChars = GetText().getLength() -
nCurrentLen;
- boost::scoped_ptr<TextAttrib>
pNewError(pErrorAttr->GetAttr().Clone());
+ std::unique_ptr<TextAttrib>
pNewError(pErrorAttr->GetAttr().Clone());
sal_Int32 nStart = pErrorAttr->GetStart();
sal_Int32 nEnd = pErrorAttr->GetEnd();
pTextEngine->RemoveAttrib( 0, *pErrorAttr );
@@ -1504,7 +1503,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent&
rNEvt )
if(pBackAttrLeft)
{
- boost::scoped_ptr<TextAttrib>
pNewBack(pBackAttrLeft->GetAttr().Clone());
+ std::unique_ptr<TextAttrib>
pNewBack(pBackAttrLeft->GetAttr().Clone());
const sal_Int32 _nStart = pBackAttrLeft->GetStart();
const sal_Int32 _nEnd = pBackAttrLeft->GetEnd();
pTextEngine->RemoveAttrib( 0, *pBackAttrLeft );
@@ -1530,7 +1529,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent&
rNEvt )
m_nErrorEnd = pFontColor->GetEnd();
if(pErrorAttrib->GetStart() != m_nErrorStart ||
pErrorAttrib->GetEnd() != m_nErrorEnd)
{
- boost::scoped_ptr<TextAttrib>
pNewError(pErrorAttrib->GetAttr().Clone());
+ std::unique_ptr<TextAttrib>
pNewError(pErrorAttrib->GetAttr().Clone());
pTextEngine->RemoveAttrib( 0, *pErrorAttr );
SetAttrib( *pNewError, 0, m_nErrorStart, m_nErrorEnd );
}
@@ -1690,7 +1689,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const
OUString& rNewWord, Languag
// undo expanded attributes!
if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart &&
pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen)
{
- boost::scoped_ptr<TextAttrib>
pNewBackground(pBackAttrib->GetAttr().Clone());
+ std::unique_ptr<TextAttrib>
pNewBackground(pBackAttrib->GetAttr().Clone());
const sal_Int32 nStart = pBackAttrib->GetStart();
pTextEngine->RemoveAttrib(0, *pBackAttrib);
pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart);
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index 8929c98..26b18e1 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -36,7 +36,6 @@
#include <comphelper/string.hxx>
#include <svx/svxdlg.hxx>
#include <sal/macros.h>
-#include <boost/scoped_ptr.hpp>
using namespace css::uno;
using namespace css::i18n;
@@ -356,7 +355,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings,
Button*, pButton, void
{
if (m_ppbApproxSettings == pButton)
{
- boost::scoped_ptr<AbstractSvxSearchSimilarityDialog> pDlg;
+ std::unique_ptr<AbstractSvxSearchSimilarityDialog> pDlg;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -378,7 +377,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings,
Button*, pButton, void
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractSvxJSearchOptionsDialog>
aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet,
m_pSearchEngine->GetTransliterationFlags() ));
+ std::unique_ptr<AbstractSvxJSearchOptionsDialog>
aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet,
m_pSearchEngine->GetTransliterationFlags() ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bf221cd..caf9725 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -32,7 +32,6 @@
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
#include <vcl/builderfactory.hxx>
-#include <boost/scoped_ptr.hpp>
using namespace ::ucbhelper;
@@ -183,7 +182,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : 0;
if ( pFrame )
{
- boost::scoped_ptr<TargetList> pList(new TargetList);
+ std::unique_ptr<TargetList> pList(new TargetList);
pFrame->GetTargetList(*pList);
if( !pList->empty() )
{
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index e41cbc2..8aac59a7 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -35,7 +35,6 @@
#include <vcl/settings.hxx>
#include <dialmgr.hxx>
-#include <boost/scoped_ptr.hpp>
SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent )
: ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui")
@@ -186,7 +185,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const
TransferableDataHelpe
if( aTypeName.isEmpty() && aSourceName.isEmpty() )
{
- boost::scoped_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt",
Application::GetSettings().GetUILanguageTag() ));
+ std::unique_ptr<ResMgr> pMgr(ResMgr::CreateResMgr( "svt",
Application::GetSettings().GetUILanguageTag() ));
// global resource from svtools (former so3 resource)
if( pMgr )
aSourceName = OUString( ResId( STR_UNKNOWN_SOURCE, *pMgr ) );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index f689b51..1ac9818 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -62,7 +62,6 @@
#include <tools/urlobj.hxx>
#include <vector>
#include <algorithm>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace css::uno;
@@ -72,7 +71,7 @@ using namespace css::document;
void ShowErrorDialog( const Any& aException )
{
- boost::scoped_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog(
NULL, aException ));
+ std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( NULL,
aException ));
pDlg->Execute();
}
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index cdf2ed9..5f53852 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -19,7 +19,6 @@
#include <vcl/msgbox.hxx>
#include "cuicharmap.hxx"
-#include <boost/scoped_ptr.hpp>
// hook to call special character dialog for edits
// caution: needs C-Linkage since dynamically loaded via symbol name
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 8e91172..541d060 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -26,7 +26,6 @@
#include <vcl/fixed.hxx>
#include <vector>
-#include <boost/shared_ptr.hpp>
// forward ---------------------------------------------------------------
@@ -43,10 +42,10 @@ private:
VclPtr<CheckBox> m_pUseDataCB;
// rows
struct Row;
- std::vector<boost::shared_ptr<Row> > vRows;
+ std::vector<std::shared_ptr<Row> > vRows;
// fields
struct Field;
- std::vector<boost::shared_ptr<Field> > vFields;
+ std::vector<std::shared_ptr<Field> > vFields;
// "name" fields
unsigned nNameRow;
unsigned nShortNameField;
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 61e8f22..53eea6b 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -30,7 +30,6 @@
#include <unotools/textsearch.hxx>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <iostream>
using namespace svx;
@@ -239,7 +238,7 @@ bool CuiAboutConfigTabPage::FillItemSet()
{
bool bModified = false;
- std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter;
+ std::vector< std::shared_ptr< Prop_Impl > >::iterator pIter;
for( pIter = m_vectorOfModified.begin() ; pIter !=
m_vectorOfModified.end(); ++pIter )
{
Reference< XNameAccess > xUpdateAccess = getConfigAccess(
(*pIter)->Name , true );
@@ -511,7 +510,7 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess( const OUString&
return xNameAccess;
}
-void CuiAboutConfigTabPage::AddToModifiedVector( const boost::shared_ptr<
Prop_Impl >& rProp )
+void CuiAboutConfigTabPage::AddToModifiedVector( const std::shared_ptr<
Prop_Impl >& rProp )
{
bool isModifiedBefore = false;
//Check if value modified before
@@ -595,7 +594,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage,
StandardHdl_Impl, Button*, void )
OUString sPropertyType = SvTabListBox::GetEntryText( pEntry, 2 );
OUString sPropertyValue = SvTabListBox::GetEntryText( pEntry, 3 );
- boost::shared_ptr< Prop_Impl > pProperty (new Prop_Impl(
pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) );
+ std::shared_ptr< Prop_Impl > pProperty (new Prop_Impl(
pUserData->sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) );
bool bSaveChanges = false;
bool bOpenDialog = true;
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index daa9456..45d7fd5 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -19,8 +19,6 @@
#include <vcl/edit.hxx>
#include <vector>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
namespace svx { class OptHeaderTabListBox; }
class CuiAboutConfigTabPage;
@@ -50,14 +48,14 @@ private:
VclPtr<Edit> m_pSearchEdit;
SvTreeListEntries m_modifiedPrefBoxEntries;
- std::vector< boost::shared_ptr< Prop_Impl > > m_vectorOfModified;
+ std::vector< std::shared_ptr< Prop_Impl > > m_vectorOfModified;
VclPtr< SvSimpleTable > m_pPrefBox;
//for search
css::util::SearchOptions m_options;
SvTreeListEntries m_prefBoxEntries;
- void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp );
+ void AddToModifiedVector( const std::shared_ptr< Prop_Impl >& rProp );
static std::vector< OUString > commaStringToSequence( const OUString&
rCommaSepString );
void InsertEntry( SvTreeListEntry *pEntry);
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 913b8a2..3feb235a 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -22,7 +22,6 @@
#include <svtools/miscopt.hxx>
#include <iostream>
#include <officecfg/Office/BasicIDE.hxx>
-#include <boost/shared_ptr.hpp>
#include <cuires.hrc>
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const
SfxItemSet& rSet )
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index a6c5865..830b898 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -32,8 +32,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <svx/svxdlg.hxx>
#include <helpid.hrc>
#include <dialmgr.hxx>
@@ -253,9 +251,9 @@ private:
};
// vChapters -- groups (group headers)
- std::vector<boost::shared_ptr<Chapter> > vChapters;
+ std::vector<std::shared_ptr<Chapter> > vChapters;
// vEntries -- color options
- std::vector<boost::shared_ptr<Entry> > vEntries;
+ std::vector<std::shared_ptr<Entry> > vEntries;
// module options
SvtModuleOptions aModuleOptions;
@@ -551,7 +549,7 @@ void ColorConfigWindow_Impl::CreateEntries()
for (unsigned i = 0; i != nGroupCount; ++i)
{
aModulesInstalled[i] = IsGroupVisible(vGroupInfo[i].eGroup);
- vChapters.push_back(boost::shared_ptr<Chapter>(
+ vChapters.push_back(std::shared_ptr<Chapter>(
new Chapter(get<FixedText>(vGroupInfo[i].pGroup),
aModulesInstalled[i])));
}
@@ -577,7 +575,7 @@ void ColorConfigWindow_Impl::CreateEntries()
vEntries.reserve(ColorConfigEntryCount);
for (unsigned i = 0; i < SAL_N_ELEMENTS(vEntryInfo); ++i)
{
- vEntries.push_back(boost::shared_ptr<Entry>(new Entry(*this, i,
nCheckBoxLabelOffset,
+ vEntries.push_back(std::shared_ptr<Entry>(new Entry(*this, i,
nCheckBoxLabelOffset,
aModulesInstalled[vEntryInfo[i].eGroup])));
}
@@ -589,7 +587,7 @@ void ColorConfigWindow_Impl::CreateEntries()
for (unsigned j = 0; j != nExtGroupCount; ++j)
{
OUString const sComponentName = aExtConfig.GetComponentName(j);
- vChapters.push_back(boost::shared_ptr<Chapter>(new Chapter(
+ vChapters.push_back(std::shared_ptr<Chapter>(new Chapter(
m_pGrid, nLineNum,
aExtConfig.GetComponentDisplayName(sComponentName)
)));
@@ -599,7 +597,7 @@ void ColorConfigWindow_Impl::CreateEntries()
{
ExtendedColorConfigValue const aColorEntry =
aExtConfig.GetComponentColorConfigValue(sComponentName, i);
- vEntries.push_back(boost::shared_ptr<Entry>( new Entry (
+ vEntries.push_back(std::shared_ptr<Entry>( new Entry (
m_pGrid, nLineNum, aColorEntry, nCheckBoxLabelOffset
)));
++nLineNum;
@@ -1194,7 +1192,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage,
SaveDeleteHdl_Impl, Button*, pButton, vo
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog>
aNameDlg(pFact->CreateSvxNameDialog( pButton,
+ std::unique_ptr<AbstractSvxNameDialog>
aNameDlg(pFact->CreateSvxNameDialog( pButton,
sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) ));
DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage,
CheckNameHdl_Impl));
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 24558d5..baafb9d 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -25,8 +25,6 @@
#include <sfx2/tabdlg.hxx>
#include <svx/langbox.hxx>
-#include <boost/scoped_ptr.hpp>
-
class CanvasSettings;
class SvtOptionsDrawinglayer;
@@ -110,7 +108,7 @@ private:
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
SvtOptionsDrawinglayer* mpDrawinglayerOpt;
- boost::scoped_ptr<svt::OpenGLCfg> mpOpenGLConfig;
+ std::unique_ptr<svt::OpenGLCfg> mpOpenGLConfig;
std::vector<vcl::IconThemeInfo> mInstalledIconThemes;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index a179917..7903b1c 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -33,9 +33,6 @@
#include <svx/dlgutil.hxx>
#include <svx/svxids.hrc>
-#include <boost/ref.hpp>
-#include <boost/make_shared.hpp>
-
namespace
{
@@ -262,7 +259,7 @@ void SvxGeneralTabPage::InitControls ()
if (!(vRowInfo[iRow].nLangFlags & LangBit))
continue;
// creating row
- vRows.push_back(boost::make_shared<Row>(
+ vRows.push_back(std::make_shared<Row>(
get<FixedText>(vRowInfo[iRow].pTextId), eRow));
Row& rRow = *vRows.back();
// fields in the row
@@ -275,7 +272,7 @@ void SvxGeneralTabPage::InitControls ()
for ( ; iField != nFieldCount && vFieldInfo[iField].eRow == eRow;
++iField)
{
// creating edit field
- vFields.push_back(boost::make_shared<Field>(
+ vFields.push_back(std::make_shared<Field>(
get<Edit>(vFieldInfo[iField].pEditId), iField));
// "short name" field?
if (vFieldInfo[iField].nUserOptionsId == UserOptToken::ID)
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 7f07893..40b77cb 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -67,7 +67,6 @@
#include <vector>
#include <map>
-#include <boost/scoped_ptr.hpp>
using namespace ::ucbhelper;
using namespace ::com::sun::star;
@@ -1620,7 +1619,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button
*, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractSvxNewDictionaryDialog>
aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 ));
+ std::unique_ptr<AbstractSvxNewDictionaryDialog>
aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
uno::Reference< XDictionary > xNewDic;
if ( aDlg->Execute() == RET_OK )
@@ -1655,7 +1654,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button
*, pBtn, void )
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<VclAbstractDialog>
aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(),
xSpellChecker1, RID_SFXDLG_EDITDICT ));
+ std::unique_ptr<VclAbstractDialog>
aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(),
xSpellChecker1, RID_SFXDLG_EDITDICT ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 893c49e..002d16e 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -51,8 +51,6 @@
#include "optHeaderTabListbox.hxx"
#include <vcl/help.hxx>
-#include <boost/scoped_ptr.hpp>
-
using namespace css::beans;
using namespace css::lang;
using namespace css::ui::dialogs;
@@ -551,7 +549,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl,
Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr<AbstractSvxMultiPathDialog> pMultiDlg(
+ std::unique_ptr<AbstractSvxMultiPathDialog> pMultiDlg(
pFact->CreateSvxMultiPathDialog( this ));
DBG_ASSERT( pMultiDlg, "Dialog creation failed!" );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f386c7c..1495984 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -107,8 +107,6 @@
#include <sys/stat.h>
#endif
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
@@ -2141,7 +2139,7 @@ void OfaTreeOptionsDialog::InsertNodes( const
VectorOfNodes& rNodeList )
short OfaTreeOptionsDialog::Execute()
{
- boost::scoped_ptr< SvxDicListChgClamp > pClamp;
+ std::unique_ptr< SvxDicListChgClamp > pClamp;
if ( !bIsFromExtensionManager )
{
// collect all DictionaryList Events while the dialog is executed
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 8266826..b5b0988 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -15,8 +15,6 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star;
TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
@@ -101,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*,
void)
OUString aDesc( get<FixedText>("enteraurl")->GetText() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
m_pAddBtn, aURL, aDesc));
+ std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
m_pAddBtn, aURL, aDesc));
if ( pDlg->Execute() == RET_OK )
{
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f1e5f23..df4fbb1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -55,7 +55,6 @@
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
#include <svx/svxids.hrc>
-#include <boost/scoped_ptr.hpp>
static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 9939e63..0450870 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -51,7 +51,6 @@
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
#include <svtools/grfmgr.hxx>
-#include <boost/scoped_ptr.hpp>
using namespace css;
@@ -583,7 +582,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const
SfxItemSet& rSet )
const SvxBrushItem* pBgdAttr = NULL;
sal_uInt16 nSlot = SID_VIEW_FLD_PIC;
sal_uInt16 nWhich = GetWhich( nSlot );
- boost::scoped_ptr<SvxBrushItem> pTemp;
+ std::unique_ptr<SvxBrushItem> pTemp;
if ( rSet.GetItemState( nWhich, false ) >= SfxItemState::DEFAULT )
{
@@ -754,7 +753,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
}
else
{
- boost::scoped_ptr<SvxBrushItem> pTmpBrush;
+ std::unique_ptr<SvxBrushItem> pTmpBrush;
if ( m_pBtnLink->IsChecked() )
{
pTmpBrush.reset(new SvxBrushItem( aBgdGraphicPath,
@@ -1328,7 +1327,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl,
ListBox*, pBox )
sal_Int32 nSelPos = pBox->GetSelectEntryPos();
if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos)
{
- boost::scoped_ptr<SvxBrushItem> xItemHolder;
+ std::unique_ptr<SvxBrushItem> xItemHolder;
SvxBrushItem* pActItem = NULL;
sal_uInt16 nWhich = 0;
switch(pTableBck_Impl->nActPos)
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 6a3cdfe..3127082 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -71,7 +71,6 @@
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
#include "svx/flagsdef.hxx"
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 22521fd..1ef5ae4 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -34,7 +34,6 @@
#include <svx/dialogs.hrc>
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
#define CM_1_TO_TWIP 567
#define TWIP_TO_INCH 1440
@@ -304,7 +303,7 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
{
sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP );
FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW ));
- boost::scoped_ptr<SvxGrfCrop> pNew(static_cast<SvxGrfCrop*>(rSet->Get(
nW ).Clone()));
+ std::unique_ptr<SvxGrfCrop> pNew(static_cast<SvxGrfCrop*>(rSet->Get(
nW ).Clone()));
pNew->SetLeft( lcl_GetValue( *m_pLeftMF, eUnit ) );
pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 61c3d6f..fc8e3fd 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -71,7 +71,6 @@
#include <svl/aeitem.hxx>
#include <svl/stritem.hxx>
#include <svl/slstitm.hxx>
-#include <boost/scoped_ptr.hpp>
#include <sfx2/filedlghelper.hxx>
#include "svx/gallery1.hxx"
#include "svx/galtheme.hxx"
@@ -1030,7 +1029,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage,
ClickAddBrowseHdl_Impl, Button*, voi
{
xSimpleFileAccess->copy( aUserImageURL, aUserGalleryURL );
INetURLObject gURL( aUserGalleryURL );
- boost::scoped_ptr<SvStream>
pIn(::utl::UcbStreamHelper::CreateStream(
+ std::unique_ptr<SvStream>
pIn(::utl::UcbStreamHelper::CreateStream(
gURL.GetMainURL( INetURLObject::NO_DECODE ),
StreamMode::READ ));
if ( pIn )
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 1a7d7b0..0fcf338 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -61,7 +61,6 @@
#include <svx/unobrushitemhelper.hxx>
#include <numpages.hxx>
-#include <boost/scoped_ptr.hpp>
// static ----------------------------------------------------------------
@@ -903,7 +902,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
(m_pRegisterCB->IsChecked() ||
m_pRegisterCB->IsValueChangedFromSaved()))
{
const SfxBoolItem& rRegItem = static_cast<const
SfxBoolItem&>(rOldSet.Get(SID_SWREGISTER_MODE));
- boost::scoped_ptr<SfxBoolItem>
pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone()));
+ std::unique_ptr<SfxBoolItem>
pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone()));
bool bCheck = m_pRegisterCB->IsChecked();
pRegItem->SetValue(bCheck);
rSet->Put(*pRegItem);
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 9571163..71bbb4b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -51,7 +51,6 @@
#include <svl/eitem.hxx>
#include <sfx2/request.hxx>
#include <svl/intitem.hxx>
-#include <boost/scoped_ptr.hpp>
const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] =
{
@@ -384,7 +383,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet*
rOutSet )
*rOutSet, SID_ATTR_PARA_REGISTER));
if (!pBoolItem)
return bModified;
- boost::scoped_ptr<SfxBoolItem>
pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone()));
+ std::unique_ptr<SfxBoolItem>
pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone()));
sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_REGISTER );
bool bSet = pRegItem->GetValue();
@@ -2231,7 +2230,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
SfxItemPool* pPool = rSet->GetPool();
if (m_pScriptSpaceCB->IsEnabled() &&
m_pScriptSpaceCB->IsValueChangedFromSaved())
{
- boost::scoped_ptr<SfxBoolItem>
pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
+ std::unique_ptr<SfxBoolItem>
pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone()));
pNewItem->SetValue(m_pScriptSpaceCB->IsChecked());
rSet->Put(*pNewItem);
@@ -2239,7 +2238,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
}
if (m_pHangingPunctCB->IsEnabled() &&
m_pHangingPunctCB->IsValueChangedFromSaved())
{
- boost::scoped_ptr<SfxBoolItem>
pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
+ std::unique_ptr<SfxBoolItem>
pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone()));
pNewItem->SetValue(m_pHangingPunctCB->IsChecked());
rSet->Put(*pNewItem);
@@ -2247,7 +2246,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
}
if (m_pForbiddenRulesCB->IsEnabled() &&
m_pForbiddenRulesCB->IsValueChangedFromSaved())
{
- boost::scoped_ptr<SfxBoolItem>
pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
+ std::unique_ptr<SfxBoolItem>
pNewItem(static_cast<SfxBoolItem*>(rSet->Get(
pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone()));
pNewItem->SetValue(m_pForbiddenRulesCB->IsChecked());
rSet->Put(*pNewItem);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index 7b45ae1..997e55a 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::text;
#define SwFPos SvxSwFramePosString
@@ -891,7 +890,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
const SfxPoolItem* pItem = GetItem( rOldSet,
SID_SW_FOLLOW_TEXT_FLOW);
if(pItem)
{
- boost::scoped_ptr<SfxBoolItem>
pFollow(static_cast<SfxBoolItem*>(pItem->Clone()));
+ std::unique_ptr<SfxBoolItem>
pFollow(static_cast<SfxBoolItem*>(pItem->Clone()));
pFollow->SetValue(m_pFollowCB->IsChecked());
bModified |= 0 != rSet->Put(*pFollow);
}
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index e03c987..b604038 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -43,7 +43,6 @@
//UUUU
#include "sfx2/opengrf.hxx"
#include <vcl/layout.hxx>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -1300,7 +1299,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
m_pTsbOriginal->IsEnabled() &&
m_pTsbScale->GetSavedValue() != TRISTATE_TRUE ) )
{
- boost::scoped_ptr<XFillBmpSizeLogItem> pItem;
+ std::unique_ptr<XFillBmpSizeLogItem> pItem;
if( m_pTsbScale->IsEnabled() )
pItem.reset(new XFillBmpSizeLogItem( eState == TRISTATE_FALSE
));
else if( m_pTsbOriginal->IsEnabled() && m_pTsbOriginal->GetState()
== TRISTATE_TRUE )
@@ -1320,7 +1319,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
//aMtrFldXSize
OUString aStr = m_pMtrFldXSize->GetText();
{
- boost::scoped_ptr<XFillBmpSizeXItem> pItem;
+ std::unique_ptr<XFillBmpSizeXItem> pItem;
TriState eScaleState = m_pTsbScale->GetState();
if( m_pMtrFldXSize->IsEnabled() &&
@@ -1355,7 +1354,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
//aMtrFldYSize
aStr = m_pMtrFldYSize->GetText();
{
- boost::scoped_ptr<XFillBmpSizeYItem> pItem;
+ std::unique_ptr<XFillBmpSizeYItem> pItem;
TriState eScaleState = m_pTsbScale->GetState();
if( m_pMtrFldYSize->IsEnabled() &&
@@ -2343,7 +2342,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
if( m_pMtrFldXSize->IsEnabled() )
{
- boost::scoped_ptr<XFillBmpSizeXItem> pItem;
+ std::unique_ptr<XFillBmpSizeXItem> pItem;
TriState eScaleState = m_pTsbScale->GetState();
if( eScaleState == TRISTATE_FALSE )
@@ -2362,7 +2361,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
if( m_pMtrFldYSize->IsEnabled() )
{
- boost::scoped_ptr<XFillBmpSizeYItem> pItem;
+ std::unique_ptr<XFillBmpSizeYItem> pItem;
TriState eScaleState = m_pTsbScale->GetState();
if( eScaleState == TRISTATE_FALSE )
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 69e5937..462e9ab 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -46,7 +46,6 @@
#include <dialmgr.hxx>
#include "sfx2/opengrf.hxx"
#include "paragrph.hrc"
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -319,7 +318,7 @@ VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window*
pWindow,
IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
{
- boost::scoped_ptr<GraphicObject> pGraphicObject;
+ std::unique_ptr<GraphicObject> pGraphicObject;
int nPos(m_pLbBitmaps->GetSelectEntryPos());
if(LISTBOX_ENTRY_NOTFOUND != nPos)
@@ -507,7 +506,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl,
Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError(1);
@@ -615,7 +614,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage,
ClickImportHdl_Impl, Button*, void)
INetURLObject aURL( aDlg.GetPath() );
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0,
'.' ), aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aURL.GetName().getToken( 0,
'.' ), aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
nError = 1;
@@ -686,7 +685,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage,
ClickModifyHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = m_pBitmapList->Count();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 2f16de2..53c04b0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -45,7 +45,6 @@
#include <cuitabline.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -713,7 +712,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl,
Button*, void)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError = 1;
@@ -797,7 +796,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl,
Button*, void)
aWarningBox->Execute();
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
bool bLoop = true;
while ( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
@@ -841,7 +840,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl,
Button*, void)
IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void)
{
- boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog(
GetParentDialog() ));
+ std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog(
GetParentDialog() ));
pColorDlg->SetColor (aCurrentColor);
pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 0c4a25c..0396464 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -40,7 +40,6 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include "paragrph.hrc"
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -340,7 +339,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
{
// CheckChanges(); <-- duplicate inquiry ?
- boost::scoped_ptr<XGradient> pXGradient;
+ std::unique_ptr<XGradient> pXGradient;
OUString aString;
sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -453,7 +452,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl,
Button*, void)
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError = 1;
@@ -544,7 +543,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage,
ClickModifyHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = m_pGradientList->Count();
@@ -806,7 +805,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage,
ClickSaveHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
{
- boost::scoped_ptr<XGradient> pGradient;
+ std::unique_ptr<XGradient> pGradient;
int nPos = m_pLbGradients->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 1dae3a3..cbe5052 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -42,7 +42,6 @@
#include <svx/dialmgr.hxx>
#include "paragrph.hrc"
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
@@ -307,7 +306,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
{
// CheckChanges(); <-- duplicate inquiry ?
- boost::scoped_ptr<XHatch> pXHatch;
+ std::unique_ptr<XHatch> pXHatch;
OUString aString;
sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -402,7 +401,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
{
- boost::scoped_ptr<XHatch> pHatch;
+ std::unique_ptr<XHatch> pHatch;
int nPos = m_pLbHatchings->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -497,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl,
Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
ScopedVclPtr<MessageDialog> pWarnBox;
sal_uInt16 nError = 1;
@@ -581,7 +580,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl,
Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
+ std::unique_ptr<AbstractSvxNameDialog>
pDlg(pFact->CreateSvxNameDialog( GetParentDialog(), aName, aDesc ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
long nCount = m_pHatchingList->Count();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 0ff3f60..e044eb3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -51,7 +51,6 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
#define MAX_BMP_WIDTH 16
#define MAX_BMP_HEIGHT 16
@@ -360,7 +359,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
ScopedVclPtrInstance< VirtualDevice > pVDev;
pVDev->SetMapMode(MapMode(MAP_100TH_MM));
- boost::scoped_ptr<SdrModel> pModel(new SdrModel);
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
