summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx6
-rw-r--r--sw/source/uibase/docvw/DashedLine.cxx4
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx6
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx3
8 files changed, 17 insertions, 18 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index ef2218179941..17ab5200437c 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -51,7 +51,7 @@
#include <IDocumentUndoRedo.hxx>
#include <SwUndoField.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { namespace annotation {
@@ -126,7 +126,7 @@ void SwAnnotationWin::UpdateData()
{
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
- boost::scoped_ptr<SwField> pOldField;
+ std::unique_ptr<SwField> pOldField;
if (rUndoRedo.DoesUndo())
{
pOldField.reset(mpField->Copy());
@@ -268,7 +268,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
Engine()->SetModifyHdl( Link<LinkParamNone*,void>() );
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
- boost::scoped_ptr<SwField> pOldField;
+ std::unique_ptr<SwField> pOldField;
if (rUndoRedo.DoesUndo())
{
pOldField.reset(mpField->Copy());
diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
index ad08175554ff..6b766f8e79d5 100644
--- a/sw/source/uibase/docvw/DashedLine.cxx
+++ b/sw/source/uibase/docvw/DashedLine.cxx
@@ -17,7 +17,7 @@
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SwDashedLine::SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ) :
FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ),
@@ -32,7 +32,7 @@ SwDashedLine::~SwDashedLine( )
void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
// Compute the start and end points
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index af2b08ac77e3..a2577777d6ae 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -48,7 +48,7 @@
#include <vcl/menubtn.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define TEXT_PADDING 5
#define BOX_DISTANCE 10
@@ -362,7 +362,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
// Create the processor and process the primitives
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
// TODO Ghost it all if needed
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index b24cac66f940..9d6d1d2419d8 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -43,7 +43,7 @@
#include <svl/stritem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define BUTTON_WIDTH 30
#define BUTTON_HEIGHT 19
@@ -211,7 +211,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
// Create the processor and process the primitives
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
pProcessor->process(aGhostedSeq);
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 362919f7c763..c46f42844bb6 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -79,7 +79,7 @@
#include "swabstdlg.hxx"
#include "swevent.hxx"
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// distance between Anchor Y and initial note position
#define POSTIT_INITIAL_ANCHOR_DISTANCE 20
@@ -1394,7 +1394,7 @@ void SwPostItMgr::ExecuteFormatAllDialog(SwView& rView)
SfxItemSet aDlgAttr(*pPool, EE_ITEMS_START, EE_ITEMS_END);
aDlgAttr.Put(aEditAttr);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN));
sal_uInt16 nRet = pDlg->Execute();
if (RET_OK == nRet)
{
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 742aaa6c4317..1393fba85a25 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -52,7 +52,7 @@
#include <wrtsh.hxx>
#include <shellres.hxx>
#include <SwRewriter.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { namespace sidebarwindows {
@@ -345,7 +345,7 @@ void SidebarTextControl::Command( const CommandEvent& rCEvt )
}
else
{
- boost::scoped_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel()));
+ std::unique_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel()));
static_cast<PopupMenu*>(pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTextControl, Select) );
{
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 92dcd6c83f16..c82e10feabe6 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -79,7 +79,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <drawinglayer/primitive2d/shadowprimitive2d.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { namespace sidebarwindows {
@@ -270,7 +270,7 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, D
mpSidebarTextControl->Draw(pDev, rPt, rSz, nInFlags);
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
*pDev, aNewViewInfos ));
@@ -675,7 +675,7 @@ void SwSidebarWin::SetPosAndSize()
pCrsr->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
pTmpCrsr = pCrsr;
}
- ::boost::scoped_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
+ std::unique_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
pTmpCrsrForAnnotationTextRange->FillRects();
SwRects* pRects(pTmpCrsrForAnnotationTextRange.get());
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 09a24d25b2bf..d7852e42def4 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -153,7 +153,6 @@
#include <unotools/syslocaleoptions.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace sw::mark;
using namespace ::com::sun::star;
@@ -5179,7 +5178,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
if ( m_rView.GetDocShell()->IsReadOnly() )
{
- boost::scoped_ptr<SwReadOnlyPopup> pROPopup(new SwReadOnlyPopup( aDocPos, m_rView ));
+ std::unique_ptr<SwReadOnlyPopup> pROPopup(new SwReadOnlyPopup( aDocPos, m_rView ));
ui::ContextMenuExecuteEvent aEvent;
aEvent.SourceWindow = VCLUnoHelper::GetInterface( this );
generated by cgit (git 2.34.1) at 2024-06-18 06:18:20 +0000