sw/inc/pch/precompiled_msword.hxx | 1
sw/inc/pch/precompiled_sw.hxx | 1
sw/qa/extras/uiwriter/uiwriter.cxx | 3
sw/source/core/crsr/annotationmark.cxx | 3
sw/source/core/crsr/bookmrk.cxx | 9 -
sw/source/core/doc/DocumentContentOperationsManager.cxx | 21 +---
sw/source/core/doc/DocumentDeviceManager.cxx | 5
sw/source/core/doc/DocumentFieldsManager.cxx | 5
sw/source/core/doc/DocumentLayoutManager.cxx | 9 -
sw/source/core/doc/DocumentRedlineManager.cxx | 9 -
sw/source/core/doc/doc.cxx | 5
sw/source/core/doc/docbm.cxx | 7 -
sw/source/core/doc/doccomp.cxx | 5
sw/source/core/doc/docdesc.cxx | 7 -
sw/source/core/doc/docfly.cxx | 5
sw/source/core/doc/docfmt.cxx | 19 +--
sw/source/core/doc/docftn.cxx | 5
sw/source/core/doc/doclay.cxx | 3
sw/source/core/doc/docnum.cxx | 19 +--
sw/source/core/doc/docsort.cxx | 5
sw/source/core/doc/doctxm.cxx | 1
sw/source/core/doc/fmtcol.cxx | 3
sw/source/core/doc/sortopt.cxx | 3
sw/source/core/doc/swstylemanager.cxx | 3
sw/source/core/doc/tblafmt.cxx | 5
sw/source/core/doc/tblcpy.cxx | 3
sw/source/core/docnode/ndsect.cxx | 3
sw/source/core/docnode/ndtbl.cxx | 17 +--
sw/source/core/docnode/ndtbl1.cxx | 25 ++--
sw/source/core/draw/dcontact.cxx | 3
sw/source/core/draw/dflyobj.cxx | 23 ++--
sw/source/core/draw/dview.cxx | 3
sw/source/core/edit/acorrect.cxx | 3
sw/source/core/edit/edfcol.cxx | 4
sw/source/core/edit/edglbldc.cxx | 3
sw/source/core/fields/authfld.cxx | 3
sw/source/core/fields/ddefld.cxx | 3
sw/source/core/fields/docufld.cxx | 15 +-
sw/source/core/fields/flddropdown.cxx | 3
sw/source/core/fields/macrofld.cxx | 3
sw/source/core/fields/scrptfld.cxx | 3
sw/source/core/frmedt/fecopy.cxx | 3
sw/source/core/frmedt/fetab.cxx | 3
sw/source/core/layout/calcmove.cxx | 7 -
sw/source/core/layout/flowfrm.cxx | 9 -
sw/source/core/layout/hffrm.cxx | 5
sw/source/core/layout/tabfrm.cxx | 13 +-
sw/source/core/table/swnewtable.cxx | 3
sw/source/core/table/swtable.cxx | 3
sw/source/core/text/itradj.cxx | 3
sw/source/core/text/porfld.cxx | 3
sw/source/core/text/redlnitr.cxx | 5
sw/source/core/text/txtfly.cxx | 3
sw/source/core/tox/ToxLinkProcessor.cxx | 3
sw/source/core/undo/undobj.cxx | 1
sw/source/core/undo/undraw.cxx | 3
sw/source/core/undo/unins.cxx | 5
sw/source/core/undo/unsect.cxx | 5
sw/source/core/undo/unsort.cxx | 6 -
sw/source/core/undo/untbl.cxx | 22 ++--
sw/source/core/unocore/unofield.cxx | 3
sw/source/core/unocore/unoframe.cxx | 1
sw/source/core/unocore/unoport.cxx | 3
sw/source/core/unocore/unoportenum.cxx | 3
sw/source/core/unocore/unostyle.cxx | 3
sw/source/filter/ascii/parasc.cxx | 3
sw/source/filter/basflt/shellio.cxx | 3
sw/source/filter/html/htmlctxt.cxx | 3
sw/source/filter/html/htmlflywriter.cxx | 3
sw/source/filter/html/htmltab.cxx | 1
sw/source/filter/html/svxcss1.cxx | 3
sw/source/filter/writer/writer.cxx | 3
sw/source/filter/ww8/docxsdrexport.cxx | 3
sw/source/filter/ww8/docxtablestyleexport.cxx | 3
sw/source/filter/ww8/rtfattributeoutput.cxx | 7 -
sw/source/filter/ww8/rtfexport.cxx | 7 -
sw/source/filter/ww8/rtfexportfilter.cxx | 3
sw/source/filter/ww8/wrtww8.cxx | 5
sw/source/filter/ww8/ww8scan.cxx | 3
sw/source/filter/xml/xmlfmt.cxx | 3
sw/source/filter/xml/xmltbli.cxx | 9 -
sw/source/ui/config/optpage.cxx | 3
sw/source/ui/dbui/dbinsdlg.cxx | 7 -
sw/source/ui/dialog/ascfldlg.cxx | 3
sw/source/ui/dialog/swdlgfact.cxx | 84 ++++++++--------
sw/source/ui/misc/srtdlg.cxx | 7 -
sw/source/uibase/app/appopt.cxx | 3
sw/source/uibase/app/docsh.cxx | 3
sw/source/uibase/app/docstyle.cxx | 3
sw/source/uibase/app/swdll.cxx | 4
sw/source/uibase/dbui/dbmgr.cxx | 5
sw/source/uibase/docvw/AnnotationWin.cxx | 5
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 3
sw/source/uibase/docvw/edtwin.cxx | 5
sw/source/uibase/misc/glshell.cxx | 3
sw/source/uibase/shells/drawsh.cxx | 2
sw/source/uibase/shells/grfsh.cxx | 3
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/shells/txtattr.cxx | 3
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 3
sw/source/uibase/uiview/formatclipboard.cxx | 11 --
sw/source/uibase/uno/SwXDocumentSettings.cxx | 3
sw/source/uibase/uno/unotxdoc.cxx | 3
sw/source/uibase/utlui/content.cxx | 5
sw/source/uibase/utlui/glbltree.cxx | 3
sw/source/uibase/utlui/navipi.cxx | 4
106 files changed, 270 insertions(+), 368 deletions(-)
New commits:
commit a944b4bb5c5a599f9aa3d25e7556e298d50efc9b
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Mon Feb 4 19:14:42 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 7 09:02:36 2019 +0100
o3tl::make_unique -> std::make_unique in sw
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I871312c1077439377c67b76112f38b7019fa6fb1
Reviewed-on: https://gerrit.libreoffice.org/67376
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/inc/pch/precompiled_msword.hxx
b/sw/inc/pch/precompiled_msword.hxx
index 269911f451ad..8e68fe7adce1 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -494,7 +494,6 @@
#include <numrule.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/enumrange.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/sorted_vector.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index fea8c6a5fc5a..821f8570c7a0 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -390,7 +390,6 @@
#include <numrule.hxx>
#include <o3tl/any.hxx>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <pagedesc.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 730a3710cb50..6efcfba03fc4 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -91,7 +91,6 @@
#include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <o3tl/deleter.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/file.hxx>
#include <osl/thread.hxx>
#include <paratr.hxx>
@@ -588,7 +587,7 @@ std::unique_ptr<SwTextBlocks>
SwUiWriterTest::readDOCXAutotext(const OUString& s
SwReader aReader(aSrcMed, rURL, pDoc);
Reader* pDOCXReader = SwReaderWriter::GetDOCXReader();
- auto pGlossary = o3tl::make_unique<SwTextBlocks>(rURL);
+ auto pGlossary = std::make_unique<SwTextBlocks>(rURL);
CPPUNIT_ASSERT(pDOCXReader != nullptr);
CPPUNIT_ASSERT_EQUAL(!bEmpty, aReader.ReadGlossaries(*pDOCXReader,
*pGlossary, false));
diff --git a/sw/source/core/crsr/annotationmark.cxx
b/sw/source/core/crsr/annotationmark.cxx
index 4ab997dc48a3..280193f4b3b9 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -31,7 +31,6 @@
#include <UndoBookmark.hxx>
#include <ndtxt.hxx>
#include <txtfld.hxx>
-#include <o3tl/make_unique.hxx>
namespace sw { namespace mark
{
@@ -70,7 +69,7 @@ namespace sw { namespace mark
if (io_pDoc->GetIDocumentUndoRedo().DoesUndo())
{
- io_pDoc->GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoInsBookmark>(*this) );
+ io_pDoc->GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoInsBookmark>(*this) );
}
io_pDoc->getIDocumentState().SetModified();
}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index bd38b07be456..92bb4c67d786 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -32,7 +32,6 @@
#include <swtypes.hxx>
#include <UndoBookmark.hxx>
#include <unobookmark.hxx>
-#include <o3tl/make_unique.hxx>
#include <xmloff/odffields.hxx>
#include <libxml/xmlwriter.h>
#include <comphelper/random.hxx>
@@ -173,13 +172,13 @@ namespace sw { namespace mark
void MarkBase::SetMarkPos(const SwPosition& rNewPos)
{
- o3tl::make_unique<SwPosition>(rNewPos).swap(m_pPos1);
+ std::make_unique<SwPosition>(rNewPos).swap(m_pPos1);
m_pPos1->nContent.SetMark(this);
}
void MarkBase::SetOtherMarkPos(const SwPosition& rNewPos)
{
- o3tl::make_unique<SwPosition>(rNewPos).swap(m_pPos2);
+ std::make_unique<SwPosition>(rNewPos).swap(m_pPos2);
m_pPos2->nContent.SetMark(this);
}
@@ -297,7 +296,7 @@ namespace sw { namespace mark
if (io_pDoc->GetIDocumentUndoRedo().DoesUndo())
{
io_pDoc->GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoInsBookmark>(*this));
+ std::make_unique<SwUndoInsBookmark>(*this));
}
io_pDoc->getIDocumentState().SetModified();
}
@@ -309,7 +308,7 @@ namespace sw { namespace mark
if (io_pDoc->GetIDocumentUndoRedo().DoesUndo())
{
io_pDoc->GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoDeleteBookmark>(*this));
+ std::make_unique<SwUndoDeleteBookmark>(*this));
}
io_pDoc->getIDocumentState().SetModified();
}
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index e38d1ea866e5..eb7df745682f 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -78,7 +78,6 @@
#include <svx/svdouno.hxx>
#include <tools/globname.hxx>
#include <editeng/formatbreakitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <com/sun/star/i18n/Boundary.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
@@ -2523,7 +2522,7 @@ bool DocumentContentOperationsManager::Overwrite( const
SwPaM &rRg, const OUStri
if (!bMerged)
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoOverwrite>(&m_rDoc, rPt, c) );
+ std::make_unique<SwUndoOverwrite>(&m_rDoc, rPt, c) );
}
}
else
@@ -2608,7 +2607,7 @@ bool DocumentContentOperationsManager::InsertString(
const SwPaM &rRg, const OUS
if (bDoesUndo)
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoInsert>(rPos.nNode,
+ std::make_unique<SwUndoInsert>(rPos.nNode,
rPos.nContent.GetIndex(), ins.getLength(),
nInsertMode));
}
}
@@ -2828,7 +2827,7 @@ void DocumentContentOperationsManager::ReRead( SwPaM&
rPam, const OUString& rGrf
{
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
-
m_rDoc.GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoReRead>(rPam,
*pGrfNd));
+
m_rDoc.GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoReRead>(rPam,
*pGrfNd));
}
// Because we don't know if we can mirror the graphic, the mirror
attribute is always reset
@@ -2945,7 +2944,7 @@ SwDrawFrameFormat*
DocumentContentOperationsManager::InsertDrawObj(
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoInsLayFormat>(pFormat, 0, 0) );
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoInsLayFormat>(pFormat, 0, 0) );
}
m_rDoc.getIDocumentState().SetModified();
@@ -3113,7 +3112,7 @@ bool DocumentContentOperationsManager::AppendTextNode(
SwPosition& rPos )
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoInsert>( rPos.nNode ) );
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoInsert>( rPos.nNode ) );
}
// To-Do - add 'SwExtraRedlineTable' also ?
@@ -3697,7 +3696,7 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
std::vector<SwRangeRedline*> redlines;
{
- auto
pRedline(o3tl::make_unique<SwRangeRedline>(nsRedlineType_t::REDLINE_DELETE,
rPam));
+ auto
pRedline(std::make_unique<SwRangeRedline>(nsRedlineType_t::REDLINE_DELETE,
rPam));
if (pRedline->HasValidRange())
{
redlines.push_back(pRedline.release());
@@ -3725,7 +3724,7 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
{
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
-
MarkUndos.emplace_back(o3tl::make_unique<SwUndoDeleteBookmark>(**iter));
+
MarkUndos.emplace_back(std::make_unique<SwUndoDeleteBookmark>(**iter));
}
// iter is into annotation mark vector so must be dereferenced!
rDMA.deleteMark(&**iter);
@@ -3758,7 +3757,7 @@ bool
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
for (SwRangeRedline * pRedline : redlines)
{
assert(pRedline->HasValidRange());
- undos.emplace_back(o3tl::make_unique<SwUndoRedlineDelete>(
+ undos.emplace_back(std::make_unique<SwUndoRedlineDelete>(
*pRedline, SwUndoId::DELETE));
}
const SwRewriter aRewriter = undos.front()->GetRewriter();
@@ -3925,7 +3924,7 @@ bool
DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
}
if (!bMerged)
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoDelete>( rPam ) );
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoDelete>( rPam ) );
}
m_rDoc.getIDocumentState().SetModified();
@@ -4164,7 +4163,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl(
SwPaM& rPam, const OUSt
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoRedlineDelete>( aDelPam,
SwUndoId::REPLACE ));
+ std::make_unique<SwUndoRedlineDelete>( aDelPam,
SwUndoId::REPLACE ));
}
m_rDoc.getIDocumentRedlineAccess().AppendRedline( new
SwRangeRedline( nsRedlineType_t::REDLINE_DELETE, aDelPam ), true);
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx
b/sw/source/core/doc/DocumentDeviceManager.cxx
index 048b53825509..e0f913357f4b 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -28,7 +28,6 @@
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/printer.hxx>
#include <vcl/virdev.hxx>
#include <vcl/outdev.hxx>
@@ -207,7 +206,7 @@ void DocumentDeviceManager::setJobsetup(/*[in]*/ const
JobSetup &rJobSetup )
if( !mpPrt )
{
//The ItemSet is deleted by Sfx!
- auto pSet = o3tl::make_unique<SfxItemSet>(
+ auto pSet = std::make_unique<SfxItemSet>(
m_rDoc.GetAttrPool(),
svl::Items<
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
@@ -292,7 +291,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const
// We create a default SfxPrinter.
// The ItemSet is deleted by Sfx!
- auto pSet = o3tl::make_unique<SfxItemSet>(
+ auto pSet = std::make_unique<SfxItemSet>(
m_rDoc.GetAttrPool(),
svl::Items<
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index e122e6936ecd..18db8ba4937e 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -54,7 +54,6 @@
#include <ndindex.hxx>
#include <pam.hxx>
#include <o3tl/deleter.hxx>
-#include <o3tl/make_unique.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <com/sun/star/uno/Any.hxx>
@@ -506,7 +505,7 @@ void DocumentFieldsManager::PutValueToField(const
SwPosition & rPos,
pField->QueryValue(aOldVal, nWhich))
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoFieldFromAPI>(rPos, aOldVal, rVal,
nWhich));
+ std::make_unique<SwUndoFieldFromAPI>(rPos, aOldVal, rVal, nWhich));
}
pField->PutValue(rVal, nWhich);
@@ -534,7 +533,7 @@ bool DocumentFieldsManager::UpdateField(SwTextField *
pDstTextField, SwField & r
aPosition.nContent = pDstTextField->GetStart();
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoFieldFromDoc>( aPosition, *pDstField,
rSrcField, pMsgHint, bUpdateFields) );
+ std::make_unique<SwUndoFieldFromDoc>( aPosition, *pDstField,
rSrcField, pMsgHint, bUpdateFields) );
}
pDstFormatField->SetField(rSrcField.CopyField());
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 8fc63bfeb2a3..68e08bad1b80 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -40,7 +40,6 @@
#include <textboxhelper.hxx>
#include <ndindex.hxx>
#include <pam.hxx>
-#include <o3tl/make_unique.hxx>
#include <com/sun/star/embed/EmbedStates.hpp>
using namespace ::com::sun::star;
@@ -164,7 +163,7 @@ SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat(
RndStdIds eRequest, cons
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoInsLayFormat>(pFormat, 0, 0));
+ std::make_unique<SwUndoInsLayFormat>(pFormat, 0, 0));
}
}
break;
@@ -234,7 +233,7 @@ void DocumentLayoutManager::DelLayoutFormat( SwFrameFormat
*pFormat )
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
(RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh))
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoDelLayFormat>( pFormat ));
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoDelLayFormat>( pFormat ));
}
else
{
@@ -417,7 +416,7 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
-
m_rDoc.GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoInsLayFormat>(pDest,0,0));
+
m_rDoc.GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoInsLayFormat>(pDest,0,0));
}
// Make sure that FlyFrames in FlyFrames are copied
@@ -447,7 +446,7 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
-
m_rDoc.GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoInsLayFormat>(pDest,0,0));
+
m_rDoc.GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoInsLayFormat>(pDest,0,0));
}
}
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 39a083977b96..f01ab4b77fb1 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -40,7 +40,6 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -2412,7 +2411,7 @@ bool DocumentRedlineManager::AcceptRedline(
SwRedlineTable::size_type nPos, bool
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoAcceptRedline>(*pTmp) );
+ std::make_unique<SwUndoAcceptRedline>(*pTmp) );
}
bRet |= lcl_AcceptRedline( *mpRedlineTable, nPos, bCallDelete );
@@ -2471,7 +2470,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM&
rPam, bool bCallDelete
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().StartUndo( SwUndoId::ACCEPT_REDLINE,
nullptr );
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoAcceptRedline>( aPam ));
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoAcceptRedline>( aPam ));
}
int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTable,
@@ -2554,7 +2553,7 @@ bool DocumentRedlineManager::RejectRedline(
SwRedlineTable::size_type nPos, bool
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoRejectRedline>( *pTmp ) );
+ std::make_unique<SwUndoRejectRedline>( *pTmp ) );
}
bRet |= lcl_RejectRedline( *mpRedlineTable, nPos, bCallDelete );
@@ -2613,7 +2612,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM&
rPam, bool bCallDelete
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().StartUndo( SwUndoId::REJECT_REDLINE,
nullptr );
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoRejectRedline>(aPam) );
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoRejectRedline>(aPam) );
}
int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTable,
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 2c69bb7fa1fe..3691940ef2fb 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -45,7 +45,6 @@
#include <svx/svxids.hrc>
#include <comphelper/random.hxx>
-#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
#include <tools/poly.hxx>
#include <tools/multisel.hxx>
@@ -1422,7 +1421,7 @@ bool SwDoc::RemoveInvisibleContent()
for (SwFieldType* pType : *getIDocumentFieldsAccess().GetFieldTypes())
{
if (FieldCanHideParaWeight(pType->Which()))
-
aHidingFieldTypes.push_back(o3tl::make_unique<FieldTypeGuard>(pType));
+
aHidingFieldTypes.push_back(std::make_unique<FieldTypeGuard>(pType));
}
for (const auto& pTypeGuard : aHidingFieldTypes)
{
@@ -1736,7 +1735,7 @@ void SwDoc::ChangeTOX(SwTOXBase & rTOX, const SwTOXBase &
rNew,
GetIDocumentUndoRedo().DelAllUndoObj();
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoTOXChange>(this, &rTOX, rNew));
+ std::make_unique<SwUndoTOXChange>(this, &rTOX, rNew));
}
rTOX = rNew;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index f05e2a51a476..ff1c3e59d0eb 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -41,7 +41,6 @@
#include <pam.hxx>
#include <redline.hxx>
#include <rolbck.hxx>
-#include <o3tl/make_unique.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -156,7 +155,7 @@ namespace
return lcl_PositionFromContentNode( pNode, bPosAtEndOfNode );
}
- return o3tl::make_unique<SwPosition>(rOtherPosition);
+ return std::make_unique<SwPosition>(rOtherPosition);
}
IMark* lcl_getMarkAfter(const IDocumentMarkAccess::container_t& rMarks,
const SwPosition& rPos)
@@ -581,7 +580,7 @@ namespace sw { namespace mark
if (m_pDoc->GetIDocumentUndoRedo().DoesUndo())
{
m_pDoc->GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoRenameBookmark>(sOldName,
rNewName, m_pDoc));
+ std::make_unique<SwUndoRenameBookmark>(sOldName,
rNewName, m_pDoc));
}
m_pDoc->getIDocumentState().SetModified();
}
@@ -786,7 +785,7 @@ namespace sw { namespace mark
{
if ( pEndIdx != nullptr )
{
- pNewPos = o3tl::make_unique< SwPosition >( rEnd,
*pEndIdx );
+ pNewPos = std::make_unique< SwPosition >( rEnd,
*pEndIdx );
}
else
{
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index f8a1bf8f3488..be8979dc7107 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -21,7 +21,6 @@
#include <hintids.hxx>
#include <rtl/character.hxx>
#include <vcl/vclenum.hxx>
-#include <o3tl/make_unique.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/boxitem.hxx>
@@ -1680,7 +1679,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
if (rDoc.GetIDocumentUndoRedo().DoesUndo())
{
rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoCompDoc>( *pTmp, false ));
+ std::make_unique<SwUndoCompDoc>( *pTmp, false ));
}
rDoc.getIDocumentRedlineAccess().AppendRedline( new
SwRangeRedline( aRedlnData, *pTmp ), true );
@@ -1760,7 +1759,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
rDoc.GetIDocumentUndoRedo().DoesUndo())
{
rDoc.GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoCompDoc>( *pTmp, true ));
+ std::make_unique<SwUndoCompDoc>( *pTmp, true ));
}
} while( pInsRing.get() != ( pTmp = pTmp->GetNext()) );
}
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0cfc0efb98bd..fe9cb3fdef82 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -65,7 +65,6 @@
#include <svx/swframetypes.hxx>
#include <svx/svxids.hrc>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -393,7 +392,7 @@ void SwDoc::ChgPageDesc( size_t i, const SwPageDesc &rChged
)
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoPageDesc>(rDesc, rChged, this));
+ std::make_unique<SwUndoPageDesc>(rDesc, rChged, this));
}
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -634,7 +633,7 @@ void SwDoc::DelPageDesc( size_t i, bool bBroadcast )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoPageDescDelete>(rDel, this));
+ std::make_unique<SwUndoPageDescDelete>(rDel, this));
}
PreDelPageDesc(&rDel); // #i7983#
@@ -683,7 +682,7 @@ SwPageDesc* SwDoc::MakePageDesc(const OUString &rName,
const SwPageDesc *pCpy,
if (GetIDocumentUndoRedo().DoesUndo())
{
-
GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoPageDescCreate>(pNew,
this));
+
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoPageDescCreate>(pNew,
this));
}
getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 50e8594e4339..908d25de5176 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -62,7 +62,6 @@
#include <undoflystrattr.hxx>
#include <calbck.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xflftrit.hxx>
#include <svx/xlndsit.hxx>
@@ -586,7 +585,7 @@ void SwDoc::SetFlyFrameTitle( SwFlyFrameFormat&
rFlyFrameFormat,
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoFlyStrAttr>( rFlyFrameFormat,
+ GetIDocumentUndoRedo().AppendUndo( std::make_unique<SwUndoFlyStrAttr>(
rFlyFrameFormat,
SwUndoId::FLYFRMFMT_TITLE,
rFlyFrameFormat.GetObjTitle(),
sNewTitle ) );
@@ -609,7 +608,7 @@ void SwDoc::SetFlyFrameDescription( SwFlyFrameFormat&
rFlyFrameFormat,
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoFlyStrAttr>( rFlyFrameFormat,
+ GetIDocumentUndoRedo().AppendUndo( std::make_unique<SwUndoFlyStrAttr>(
rFlyFrameFormat,
SwUndoId::FLYFRMFMT_DESCRIPTION,
rFlyFrameFormat.GetObjDescription(),
sNewDescription ) );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 731120f0e263..22ff781213dd 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -35,7 +35,6 @@
#include <unotools/configmgr.hxx>
#include <unotools/misccfg.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <fmtpdsc.hxx>
@@ -628,7 +627,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
{
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoDefaultAttr>( aOld, this ) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoDefaultAttr>( aOld, this ) );
}
const SfxPoolItem* pTmpItem;
@@ -694,7 +693,7 @@ void SwDoc::DelCharFormat(size_t nFormat, bool bBroadcast)
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoCharFormatDelete>(pDel, this));
+ std::make_unique<SwUndoCharFormatDelete>(pDel, this));
}
delete (*mpCharFormatTable)[nFormat];
@@ -731,7 +730,7 @@ void SwDoc::DelFrameFormat( SwFrameFormat *pFormat, bool
bBroadcast )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoFrameFormatDelete>(pFormat, this));
+ std::make_unique<SwUndoFrameFormatDelete>(pFormat, this));
}
mpFrameFormatTable->erase( pFormat );
@@ -841,7 +840,7 @@ SwFrameFormat *SwDoc::MakeFrameFormat(const OUString
&rFormatName,
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoFrameFormatCreate>(pFormat, pDerivedFrom,
this));
+ std::make_unique<SwUndoFrameFormatCreate>(pFormat, pDerivedFrom,
this));
}
if (bBroadcast)
@@ -874,7 +873,7 @@ SwCharFormat *SwDoc::MakeCharFormat( const OUString
&rFormatName,
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoCharFormatCreate>(pFormat, pDerivedFrom,
this));
+ std::make_unique<SwUndoCharFormatCreate>(pFormat, pDerivedFrom,
this));
}
if (bBroadcast)
@@ -909,7 +908,7 @@ SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString
&rFormatName,
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoTextFormatCollCreate>(pFormatColl,
pDerivedFrom,
+ std::make_unique<SwUndoTextFormatCollCreate>(pFormatColl,
pDerivedFrom,
this));
}
@@ -943,7 +942,7 @@ SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl(
const OUString &rForma
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoCondTextFormatCollCreate>(pFormatColl,
pDerivedFrom,
+ std::make_unique<SwUndoCondTextFormatCollCreate>(pFormatColl,
pDerivedFrom,
this));
}
@@ -1713,7 +1712,7 @@ bool SwDoc::DontExpandFormat( const SwPosition& rPos,
bool bFlag )
bRet = pTextNd->DontExpandFormat( rPos.nContent, bFlag );
if( bRet && GetIDocumentUndoRedo().DoesUndo() )
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoDontExpandFormat>(rPos) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoDontExpandFormat>(rPos) );
}
}
return bRet;
@@ -1899,7 +1898,7 @@ void SwDoc::ChgFormat(SwFormat & rFormat, const
SfxItemSet & rSet)
}
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoFormatAttr>(aOldSet, rFormat,
/*bSaveDrawPt*/true));
+ std::make_unique<SwUndoFormatAttr>(aOldSet, rFormat,
/*bSaveDrawPt*/true));
}
rFormat.SetFormatAttr(rSet);
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 647b4a3d2884..20b3e344e356 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -36,7 +36,6 @@
#include <ndtxt.hxx>
#include <poolfmt.hxx>
#include <ftninfo.hxx>
-#include <o3tl/make_unique.hxx>
SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
{
@@ -298,7 +297,7 @@ void SwDoc::SetFootnoteInfo(const SwFootnoteInfo& rInfo)
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoFootNoteInfo>(rOld, this) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoFootNoteInfo>(rOld, this) );
}
bool bFootnotePos = rInfo.ePos != rOld.ePos;
@@ -370,7 +369,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
if(GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoEndNoteInfo>( GetEndNoteInfo(), this ) );
+ std::make_unique<SwUndoEndNoteInfo>( GetEndNoteInfo(), this ) );
}
bool bNumChg = rInfo.nFootnoteOffset != GetEndNoteInfo().nFootnoteOffset;
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 11f9e0ef571a..a0af3db35e37 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -35,7 +35,6 @@
#include <svx/svdouno.hxx>
#include <svx/fmpage.hxx>
#include <editeng/frmdiritem.hxx>
-#include <o3tl/make_unique.hxx>
#include <swmodule.hxx>
#include <modcfg.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -291,7 +290,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection_( const SwPosition&
rAnchPos,
sal_uLong nNodeIdx = rAnchPos.nNode.GetIndex();
const sal_Int32 nCntIdx = rAnchPos.nContent.GetIndex();
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoInsLayFormat>( pFormat, nNodeIdx, nCntIdx
));
+ std::make_unique<SwUndoInsLayFormat>( pFormat, nNodeIdx, nCntIdx
));
}
getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 441503027949..2f2d879cbec8 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -57,7 +57,6 @@
#include <comphelper/string.hxx>
#include <comphelper/random.hxx>
#include <tools/datetimeutils.hxx>
-#include <o3tl/make_unique.hxx>
#include <cstdlib>
#include <map>
@@ -391,7 +390,7 @@ bool SwDoc::OutlineUpDown(const SwPaM& rPam, short nOffset,
{
GetIDocumentUndoRedo().StartUndo(SwUndoId::OUTLINE_LR, nullptr);
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoOutlineLeftRight>(aPam, nOffset) );
+ std::make_unique<SwUndoOutlineLeftRight>(aPam, nOffset) );
}
// 2. Apply the new style to all Nodes
@@ -1019,7 +1018,7 @@ void SwDoc::SetNumRuleStart( const SwPosition& rPos, bool
bFlag )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoNumRuleStart>(rPos, bFlag) );
+ std::make_unique<SwUndoNumRuleStart>(rPos, bFlag) );
}
pTextNd->SetListRestart(bFlag);
@@ -1041,7 +1040,7 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos,
sal_uInt16 nStt )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoNumRuleStart>(rPos, nStt) );
+ std::make_unique<SwUndoNumRuleStart>(rPos, nStt) );
}
pTextNd->SetAttrListRestartValue( nStt );
@@ -1069,7 +1068,7 @@ bool SwDoc::DelNumRule( const OUString& rName, bool
bBroadcast )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
-
o3tl::make_unique<SwUndoNumruleDelete>(*(*mpNumRuleTable)[nPos], this));
+
std::make_unique<SwUndoNumruleDelete>(*(*mpNumRuleTable)[nPos], this));
}
if (bBroadcast)
@@ -1126,7 +1125,7 @@ bool SwDoc::RenameNumRule(const OUString & rOldName,
const OUString & rNewName,
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoNumruleRename>(rOldName, rNewName,
this));
+ std::make_unique<SwUndoNumruleRename>(rOldName, rNewName,
this));
}
SwNumRule::tTextNodeList aTextNodeList;
@@ -1791,7 +1790,7 @@ bool SwDoc::NumUpDown(const SwPaM& rPam, bool bDown,
SwRootFrame const*const pLa
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoNumUpDown>(aPam, nDiff) );
+ std::make_unique<SwUndoNumUpDown>(aPam, nDiff) );
}
SwTextNode* pPrev = nullptr;
@@ -2270,7 +2269,7 @@ bool SwDoc::MoveParagraphImpl(SwPaM& rPam, long const
nOffset,
getIDocumentRedlineAccess().SetRedlineFlags(
RedlineFlags::On | RedlineFlags::ShowInsert |
RedlineFlags::ShowDelete );
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoRedlineDelete>(aPam,
SwUndoId::DELETE));
+ std::make_unique<SwUndoRedlineDelete>(aPam,
SwUndoId::DELETE));
}
SwRangeRedline* pNewRedline = new SwRangeRedline(
nsRedlineType_t::REDLINE_DELETE, aPam );
@@ -2375,7 +2374,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool
bDel )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoNumOrNoNum>(rIdx, bOldNum,
bNewNum));
+ std::make_unique<SwUndoNumOrNoNum>(rIdx, bOldNum,
bNewNum));
}
}
else if (bDel && pTextNd->GetNumRule(false) &&
@@ -2491,7 +2490,7 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoNumruleCreate>(pNew, this));
+ std::make_unique<SwUndoNumruleCreate>(pNew, this));
}
if (bBroadcast)
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index ab4276b95c5b..1be8ffa88358 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <o3tl/make_unique.hxx>
#include <rtl/math.hxx>
#include <osl/diagnose.h>
#include <unotools/collatorwrapper.hxx>
@@ -753,7 +752,7 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_&
rBoxRef) :
// Create linear array
size_t nCount = static_cast<size_t>(nRows) * nCols;
- pArr = o3tl::make_unique<FndBox_ const *[]>(nCount);
+ pArr = std::make_unique<FndBox_ const *[]>(nCount);
memset(pArr.get(), 0, sizeof(const FndBox_*) * nCount);
FillFlat( rBoxRef );
@@ -888,7 +887,7 @@ void FlatFndBox::FillFlat(const FndBox_& rBox, bool
bLastBox)
SfxItemState::SET == pFormat->GetItemState(
RES_BOXATR_FORMULA ) ||
SfxItemState::SET == pFormat->GetItemState(
RES_BOXATR_VALUE ) )
{
- auto pSet = o3tl::make_unique<SfxItemSet>(
+ auto pSet = std::make_unique<SfxItemSet>(
pDoc->GetAttrPool(),
svl::Items<
RES_VERT_ORIENT, RES_VERT_ORIENT,
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 923cd9b1084f..8b0aa6a15cb0 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -70,7 +70,6 @@
#include <calbck.hxx>
#include <ToxTextGenerator.hxx>
#include <ToxTabStopTokenHandler.hxx>
-#include <o3tl/make_unique.hxx>
#include <tools/datetimeutils.hxx>
#include <tools/globname.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index be268424e35d..78e1952a3f98 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -37,7 +37,6 @@
#include <calbck.hxx>
#include <svl/intitem.hxx>
-#include <o3tl/make_unique.hxx>
namespace TextFormatCollFunc
{
// #i71574#
@@ -542,7 +541,7 @@ void SwConditionTextFormatColl::InsertCondition( const
SwCollCondition& rCond )
}
// Not found -> so insert it
- m_CondColls.push_back( o3tl::make_unique<SwCollCondition> (rCond) );
+ m_CondColls.push_back( std::make_unique<SwCollCondition> (rCond) );
}
void SwConditionTextFormatColl::RemoveCondition( const SwCollCondition& rCond )
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index e05767e27827..641885269bf0 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -19,7 +19,6 @@
#include <i18nlangtag/lang.h>
#include <sortopt.hxx>
-#include <o3tl/make_unique.hxx>
SwSortKey::SwSortKey() :
eSortOrder( SRT_ASCENDING ),
@@ -54,7 +53,7 @@ SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) :
{
for(auto const & pKey : rOpt.aKeys)
{
- aKeys.push_back( o3tl::make_unique<SwSortKey>(*pKey) );
+ aKeys.push_back( std::make_unique<SwSortKey>(*pKey) );
}
}
diff --git a/sw/source/core/doc/swstylemanager.cxx
b/sw/source/core/doc/swstylemanager.cxx
index 6a4a49a2da56..43bad5d40ca8 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -25,7 +25,6 @@
#include <swtypes.hxx>
#include <istyleaccess.hxx>
#include <unordered_map>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
typedef std::unordered_map< OUString,
@@ -80,7 +79,7 @@ public:
std::unique_ptr<IStyleAccess> createStyleManager( SfxItemSet const *
pIgnorableParagraphItems )
{
- return o3tl::make_unique<SwStyleManager>( pIgnorableParagraphItems );
+ return std::make_unique<SwStyleManager>( pIgnorableParagraphItems );
}
void SwStyleManager::clearCaches()
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 7b84e87e16d5..6fe546fc32b5 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <o3tl/make_unique.hxx>
#include <comphelper/fileformat.h>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
@@ -1170,7 +1169,7 @@ void SwTableAutoFormatTable::AddAutoFormat(const
SwTableAutoFormat& rTableStyle)
if (FindAutoFormat(rTableStyle.GetName()))
return;
- InsertAutoFormat(size(),
o3tl::make_unique<SwTableAutoFormat>(rTableStyle));
+ InsertAutoFormat(size(), std::make_unique<SwTableAutoFormat>(rTableStyle));
}
void SwTableAutoFormatTable::InsertAutoFormat(size_t const i,
std::unique_ptr<SwTableAutoFormat> pFormat)
@@ -1416,7 +1415,7 @@ SwCellStyleDescriptor SwCellStyleTable::operator[](size_t
i) const
void SwCellStyleTable::AddBoxFormat(const SwBoxAutoFormat& rBoxFormat, const
OUString& sName)
{
- m_aCellStyles.emplace_back(sName,
o3tl::make_unique<SwBoxAutoFormat>(rBoxFormat));
+ m_aCellStyles.emplace_back(sName,
std::make_unique<SwBoxAutoFormat>(rBoxFormat));
}
void SwCellStyleTable::RemoveBoxFormat(const OUString& sName)
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 672324930747..7d56989b5735 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -47,7 +47,6 @@
#include <deque>
#include <memory>
#include <numeric>
-#include <o3tl/make_unique.hxx>
static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
SwTable& rDstTable, SwTableBox* pDstBox,
@@ -211,7 +210,7 @@ namespace
SwTableLine *pLine2 = rLines[ ++nEndLn ];
SwTableBox *pTmpBox = pLine2->GetTabBoxes()[0];
FndLine_ *pInsLine = new FndLine_( pLine2, &rFndBox );
-
pInsLine->GetBoxes().insert(pInsLine->GetBoxes().begin(),
o3tl::make_unique<FndBox_>(pTmpBox, pInsLine));
+
pInsLine->GetBoxes().insert(pInsLine->GetBoxes().begin(),
std::make_unique<FndBox_>(pTmpBox, pInsLine));
rFndLines.push_back(std::unique_ptr<FndLine_>(pInsLine));
}
}
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index aaefcce05412..7d53274c94cf 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -58,7 +58,6 @@
#include <hints.hxx>
#include <memory>
#include "ndsect.hxx"
-#include <o3tl/make_unique.hxx>
#include <tools/datetimeutils.hxx>
// #i21457# - new implementation of local method <lcl_IsInSameTableBox(..)>.
@@ -537,7 +536,7 @@ void SwDoc::DelSectionFormat( SwSectionFormat *pFormat,
bool bDelNodes )
{
SwNodeIndex aUpdIdx( *pIdx );
SwPaM aPaM( *pSectNd->EndOfSectionNode(), *pSectNd );
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoDelete>( aPaM ));
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoDelete>( aPaM ));
if( pFootnoteEndAtTextEnd )
GetFootnoteIdxs().UpdateFootnote( aUpdIdx );
getIDocumentState().SetModified();
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 6a173ffab31d..2a0f97fe71a2 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -93,7 +93,6 @@
#include <fldupde.hxx>
#include <calbck.hxx>
#include <fntcache.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/numeric.hxx>
#include <tools/datetimeutils.hxx>
#include <sal/log.hxx>
@@ -359,7 +358,7 @@ const SwTable* SwDoc::InsertTable( const
SwInsertTableOptions& rInsTableOpts,
if( GetIDocumentUndoRedo().DoesUndo() )
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoInsTable>( rPos, nCols, nRows,
static_cast<sal_uInt16>(eAdjust),
+ std::make_unique<SwUndoInsTable>( rPos, nCols, nRows,
static_cast<sal_uInt16>(eAdjust),
rInsTableOpts, pTAFormat, pColArr,
aTableName));
}
@@ -2860,7 +2859,7 @@ void SwDoc::SetTabCols(SwTable& rTab, const SwTabCols
&rNew, const SwTabCols &rO
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoAttrTable>( *rTab.GetTableNode(), true ));
+ std::make_unique<SwUndoAttrTable>( *rTab.GetTableNode(), true ));
}
rTab.SetTabCols( rNew, rOld, pStart, bCurRowOnly );
::ClearFEShellTabCols(*this, nullptr);
@@ -2876,7 +2875,7 @@ void SwDoc::SetRowsToRepeat( SwTable &rTable, sal_uInt16
nSet )
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoTableHeadline>(rTable,
rTable.GetRowsToRepeat(), nSet) );
+ std::make_unique<SwUndoTableHeadline>(rTable,
rTable.GetRowsToRepeat(), nSet) );
}
SwMsgPoolItem aChg( RES_TBLHEADLINECHG );
@@ -4137,7 +4136,7 @@ void SwDoc::SetTableBoxFormulaAttrs( SwTableBox& rBox,
const SfxItemSet& rSet )
{
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoTableNumFormat>(rBox, &rSet) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoTableNumFormat>(rBox, &rSet) );
}
SwFrameFormat* pBoxFormat = rBox.ClaimFrameFormat();
@@ -4216,7 +4215,7 @@ void SwDoc::ClearBoxNumAttrs( const SwNodeIndex& rNode )
{
if (GetIDocumentUndoRedo().DoesUndo())
{
-
GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoTableNumFormat>(*pBox));
+
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoTableNumFormat>(*pBox));
}
SwFrameFormat* pBoxFormat = pBox->ClaimFrameFormat();
@@ -4545,7 +4544,7 @@ SwTableAutoFormat* SwDoc::MakeTableStyle(const OUString&
rName, bool bBroadcast)
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoTableStyleMake>(rName, this));
+ std::make_unique<SwUndoTableStyleMake>(rName, this));
}
if (bBroadcast)
@@ -4581,7 +4580,7 @@ std::unique_ptr<SwTableAutoFormat>
SwDoc::DelTableStyle(const OUString& rName, b
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
-
o3tl::make_unique<SwUndoTableStyleDelete>(std::move(pReleasedFormat),
vAffectedTables, this));
+
std::make_unique<SwUndoTableStyleDelete>(std::move(pReleasedFormat),
vAffectedTables, this));
}
}
@@ -4611,7 +4610,7 @@ void SwDoc::ChgTableStyle(const OUString& rName, const
SwTableAutoFormat& rNewFo
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoTableStyleUpdate>(*pFormat,
aOldFormat, this));
+ std::make_unique<SwUndoTableStyleUpdate>(*pFormat, aOldFormat,
this));
}
}
}
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 582cb226dc55..e61840d84f22 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -51,7 +51,6 @@
#include <calbck.hxx>
#include <UndoTable.hxx>
#include <o3tl/enumrange.hxx>
-#include <o3tl/make_unique.hxx>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -281,7 +280,7 @@ static void
lcl_ProcessRowAttr(std::vector<std::unique_ptr<SwTableFormatCmp>>& r
SwFrameFormat *pOld = pLine->GetFrameFormat();
SwFrameFormat *pNew = pLine->ClaimFrameFormat();
pNew->SetFormatAttr( rNew );
- rFormatCmp.push_back(o3tl::make_unique<SwTableFormatCmp>(pOld, pNew,
0));
+ rFormatCmp.push_back(std::make_unique<SwTableFormatCmp>(pOld, pNew,
0));
}
}
@@ -322,7 +321,7 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const
SwFormatRowSplit &rNew )
{
if (GetIDocumentUndoRedo().DoesUndo())
{
-
GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoAttrTable>(*pTableNd));
+
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoAttrTable>(*pTableNd));
}
std::vector<std::unique_ptr<SwTableFormatCmp>> aFormatCmp;
@@ -357,7 +356,7 @@ std::unique_ptr<SwFormatRowSplit> SwDoc::GetRowSplit( const
SwCursor& rCursor )
return nullptr;
}
}
- return o3tl::make_unique<SwFormatRowSplit>( *pSz );
+ return std::make_unique<SwFormatRowSplit>( *pSz );
}
/* Class: SwDoc
@@ -387,7 +386,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const
SwFormatFrameSize &rNew
{
if (GetIDocumentUndoRedo().DoesUndo())
{
-
GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoAttrTable>(*pTableNd));
+
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoAttrTable>(*pTableNd));
}
std::vector<std::unique_ptr<SwTableFormatCmp>> aFormatCmp;
@@ -419,7 +418,7 @@ std::unique_ptr<SwFormatFrameSize> SwDoc::GetRowHeight(
const SwCursor& rCursor
if ( *pSz != pLn->GetFrameFormat()->GetFrameSize() )
return nullptr;
}
- return o3tl::make_unique<SwFormatFrameSize>( *pSz );
+ return std::make_unique<SwFormatFrameSize>( *pSz );
}
bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly, const
bool bOptimize )
@@ -457,7 +456,7 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool
bTstOnly, const bool
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoAttrTable>(*pTableNd));
+ std::make_unique<SwUndoAttrTable>(*pTableNd));
}
std::vector<std::unique_ptr<SwTableFormatCmp>> aFormatCmp;
@@ -485,7 +484,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor,
const SvxBrushItem &rNew
{
if (GetIDocumentUndoRedo().DoesUndo())
{
-
GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoAttrTable>(*pTableNd));
+
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoAttrTable>(*pTableNd));
}
std::vector<std::unique_ptr<SwTableFormatCmp>> aFormatCmp;
@@ -572,7 +571,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const
SfxItemSet& rSet )
SwTable& rTable = pTableNd->GetTable();
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoAttrTable>(*pTableNd) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoAttrTable>(*pTableNd) );
}
std::vector<std::unique_ptr<SwTableFormatCmp>> aFormatCmp;
@@ -799,7 +798,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const
SfxItemSet& rSet )
SwFrameFormat *pOld = pBox->GetFrameFormat();
SwFrameFormat *pNew = pBox->ClaimFrameFormat();
pNew->SetFormatAttr( aBox );
- aFormatCmp.push_back(o3tl::make_unique<SwTableFormatCmp>(pOld,
pNew, nType));
+ aFormatCmp.push_back(std::make_unique<SwTableFormatCmp>(pOld,
pNew, nType));
}
}
@@ -857,7 +856,7 @@ void SwDoc::SetTabLineStyle( const SwCursor& rCursor,
SwTable& rTable = pTableNd->GetTable();
if (GetIDocumentUndoRedo().DoesUndo())
{
-
GetIDocumentUndoRedo().AppendUndo(o3tl::make_unique<SwUndoAttrTable>(*pTableNd));
+
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoAttrTable>(*pTableNd));
}
for( auto &rU : aUnions )
@@ -1143,7 +1142,7 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const
SfxPoolItem &rNew )
SwTable& rTable = pTableNd->GetTable();
if (GetIDocumentUndoRedo().DoesUndo())
{
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwUndoAttrTable>(*pTableNd) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwUndoAttrTable>(*pTableNd) );
}
std::vector<std::unique_ptr<SwTableFormatCmp>> aFormatCmp;
@@ -1160,7 +1159,7 @@ void SwDoc::SetBoxAttr( const SwCursor& rCursor, const
SfxPoolItem &rNew )
SwFrameFormat *pOld = pBox->GetFrameFormat();
SwFrameFormat *pNew = pBox->ClaimFrameFormat();
pNew->SetFormatAttr( rNew );
- aFormatCmp.push_back(o3tl::make_unique<SwTableFormatCmp>(pOld,
pNew, 0));
+ aFormatCmp.push_back(std::make_unique<SwTableFormatCmp>(pOld,
pNew, 0));
}
pBox->SetDirectFormatting(true);
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 958f159493f6..9efa66eef1bc 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -71,7 +71,6 @@
#include <calbck.hxx>
#include <algorithm>
#include <txtfly.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
@@ -2159,7 +2158,7 @@ namespace sdr
/// implementation of class <SwDrawVirtObj>
std::unique_ptr<sdr::contact::ViewContact>
SwDrawVirtObj::CreateObjectSpecificViewContact()
{
- return o3tl::make_unique<sdr::contact::VCOfDrawVirtObj>(*this);
+ return std::make_unique<sdr::contact::VCOfDrawVirtObj>(*this);
}
SwDrawVirtObj::SwDrawVirtObj(
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index a35152c4ca07..a78d78e51433 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -64,7 +64,6 @@
#include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <notxtfrm.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -112,14 +111,14 @@ namespace sdr
std::unique_ptr<sdr::properties::BaseProperties>
SwFlyDrawObj::CreateObjectSpecificProperties()
{
// create default properties
- return o3tl::make_unique<sdr::properties::DefaultProperties>(*this);
+ return std::make_unique<sdr::properties::DefaultProperties>(*this);
}
std::unique_ptr<sdr::contact::ViewContact>
SwFlyDrawObj::CreateObjectSpecificViewContact()
{
// needs an own VC since createViewIndependentPrimitive2DSequence()
// is called when RecalcBoundRect() is used
- return o3tl::make_unique<sdr::contact::VCOfSwFlyDrawObj>(*this);
+ return std::make_unique<sdr::contact::VCOfSwFlyDrawObj>(*this);
}
SwFlyDrawObj::SwFlyDrawObj(SdrModel& rSdrModel)
@@ -415,7 +414,7 @@ std::unique_ptr<sdr::contact::ViewContact>
SwVirtFlyDrawObj::CreateObjectSpecifi
{
// need an own ViewContact (VC) to allow creation of a specialized
primitive
// for being able to visualize the FlyFrames in primitive renderers
- return o3tl::make_unique<sdr::contact::VCOfSwVirtFlyDrawObj>(*this);
+ return std::make_unique<sdr::contact::VCOfSwVirtFlyDrawObj>(*this);
}
SwVirtFlyDrawObj::SwVirtFlyDrawObj(
@@ -1209,21 +1208,21 @@ void SwVirtFlyDrawObj::addCropHandles(SdrHdlList&
rTarget) const
basegfx::B2DPoint aPos;
aPos = aTargetTransform * basegfx::B2DPoint(0.0, 0.0);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::UpperLeft, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::UpperLeft, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.5, 0.0);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Upper, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Upper, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(1.0, 0.0);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::UpperRight, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::UpperRight, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.0, 0.5);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Left , fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Left , fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(1.0, 0.5);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Right, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Right, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.0, 1.0);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::LowerLeft, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::LowerLeft, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.5, 1.0);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Lower, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::Lower, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(1.0, 1.0);
-
rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::LowerRight, fShearX, fRotate));
+
rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()),
basegfx::fround(aPos.getY())), SdrHdlKind::LowerRight, fShearX, fRotate));
}
}
}
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 91a3febb660a..590885d8b7f1 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -60,7 +60,6 @@
#include <sortedobjs.hxx>
#include <flyfrms.hxx>
#include <UndoManager.hxx>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -245,7 +244,7 @@ void SwDrawView::AddCustomHdl()
}
// add anchor handle:
- maHdlList.AddHdl( o3tl::make_unique<SwSdrHdl>( aPos, ( pAnch->IsVertical()
&& !pAnch->IsVertLR() ) ||
+ maHdlList.AddHdl( std::make_unique<SwSdrHdl>( aPos, ( pAnch->IsVertical()
&& !pAnch->IsVertLR() ) ||
pAnch->IsRightToLeft() ) );
}
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index eaf61bec0451..9c0858e744dc 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -36,7 +36,6 @@
#include <viscrs.hxx>
#include <editeng/acorrcfg.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -503,7 +502,7 @@ void SwAutoCorrDoc::SaveCpltSttWord( ACFlags nFlag,
sal_Int32 nPos,
{
sal_uLong nNode = pIdx ? pIdx->GetIndex() :
rCursor.GetPoint()->nNode.GetIndex();
LanguageType eLang = GetLanguage(nPos);
- rEditSh.GetDoc()->SetAutoCorrExceptWord(
o3tl::make_unique<SwAutoCorrExceptWord>( nFlag,
+ rEditSh.GetDoc()->SetAutoCorrExceptWord(
std::make_unique<SwAutoCorrExceptWord>( nFlag,
nNode, nPos, rExceptWord, cChar, eLang
));
}
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 13fd5b3ce686..ab0b35bf18fa 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -676,7 +676,7 @@ void lcl_ValidateParagraphSignatures(SwDoc* pDoc, const
uno::Reference<text::XTe
{
pDoc->GetIDocumentUndoRedo().StartUndo(SwUndoId::PARA_SIGN_ADD,
nullptr);
pDoc->GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoParagraphSigning>(pDoc, xField,
xParagraph, false));
+ std::make_unique<SwUndoParagraphSigning>(pDoc, xField,
xParagraph, false));
lcl_RemoveParagraphMetadataField(xField);
pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::PARA_SIGN_ADD,
nullptr);
}
@@ -1812,7 +1812,7 @@ void SwEditShell::SignParagraph()
lcl_UpdateParagraphSignatureField(GetDoc(), xModel, xParagraph, xField,
utf8Text);
GetDoc()->GetIDocumentUndoRedo().AppendUndo(
- o3tl::make_unique<SwUndoParagraphSigning>(GetDoc(), xField,
xParagraph, true));
+ std::make_unique<SwUndoParagraphSigning>(GetDoc(), xField, xParagraph,
true));
GetDoc()->GetIDocumentUndoRedo().EndUndo(SwUndoId::PARA_SIGN_ADD, nullptr);
}
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index a018575edafa..edd9d0ed21cf 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -30,7 +30,6 @@
#include <section.hxx>
#include <doctxm.hxx>
#include <edglbldc.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
bool SwEditShell::IsGlobalDoc() const
@@ -118,7 +117,7 @@ void SwEditShell::GetGlobalDocContent( SwGlblDocContents&
rArr ) const
if( ( pNd = pMyDoc->GetNodes()[ nSttIdx ])->IsContentNode()
|| pNd->IsSectionNode() || pNd->IsTableNode() )
{
- rArr.insert( o3tl::make_unique<SwGlblDocContent>( nSttIdx ) );
+ rArr.insert( std::make_unique<SwGlblDocContent>( nSttIdx ) );
break;
}
}
diff --git a/sw/source/core/fields/authfld.cxx
b/sw/source/core/fields/authfld.cxx
index bd1ff9ff703c..1b2504f15660 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -24,7 +24,6 @@
#include <editeng/langitem.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <swtypes.hxx>
#include <strings.hrc>
#include <authfld.hxx>
@@ -538,7 +537,7 @@ OUString SwAuthorityField::ExpandCitation(ToxAuthorityField
eField,
std::unique_ptr<SwField> SwAuthorityField::Copy() const
{
SwAuthorityFieldType* pAuthType =
static_cast<SwAuthorityFieldType*>(GetTyp());
- return o3tl::make_unique<SwAuthorityField>(pAuthType, m_xAuthEntry.get());
+ return std::make_unique<SwAuthorityField>(pAuthType, m_xAuthEntry.get());
}
OUString SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 0bc07e7e59d2..6527887ef7b7 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <sfx2/linkmgr.hxx>
@@ -355,7 +354,7 @@ OUString SwDDEField::ExpandImpl(SwRootFrame const*const)
const
std::unique_ptr<SwField> SwDDEField::Copy() const
{
- return
o3tl::make_unique<SwDDEField>(static_cast<SwDDEFieldType*>(GetTyp()));
+ return
std::make_unique<SwDDEField>(static_cast<SwDDEFieldType*>(GetTyp()));
}
/// get field type name
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index e2044622aa1d..18604635d696 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Duration.hpp>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <unotools/localedatawrapper.hxx>
#include <editeng/unolingu.hxx>
#include <comphelper/processfactory.hxx>
@@ -645,7 +644,7 @@ OUString SwTemplNameField::ExpandImpl(SwRootFrame
const*const) const
std::unique_ptr<SwField> SwTemplNameField::Copy() const
{
- return
o3tl::make_unique<SwTemplNameField>(static_cast<SwTemplNameFieldType*>(GetTyp()),
GetFormat());
+ return
std::make_unique<SwTemplNameField>(static_cast<SwTemplNameFieldType*>(GetTyp()),
GetFormat());
}
bool SwTemplNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
@@ -772,7 +771,7 @@ OUString SwDocStatField::ExpandImpl(SwRootFrame
const*const) const
std::unique_ptr<SwField> SwDocStatField::Copy() const
{
- return o3tl::make_unique<SwDocStatField>(
+ return std::make_unique<SwDocStatField>(
static_cast<SwDocStatFieldType*>(GetTyp()), m_nSubType,
GetFormat() );
}
@@ -1776,7 +1775,7 @@ std::unique_ptr<SwField> SwPostItField::Copy() const
std::unique_ptr<SwPostItField> pRet(new SwPostItField(
static_cast<SwPostItFieldType*>(GetTyp()), m_sAuthor, m_sText, m_sInitials,
m_sName,
m_aDateTime, m_nPostItId));
if (mpText)
- pRet->SetTextObject( o3tl::make_unique<OutlinerParaObject>(*mpText) );
+ pRet->SetTextObject( std::make_unique<OutlinerParaObject>(*mpText) );
// Note: member <m_xTextObject> not copied.
@@ -1848,7 +1847,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny,
sal_uInt16 nWhichId ) const
{
SwPostItFieldType* pGetType =
static_cast<SwPostItFieldType*>(GetTyp());
SwDoc* pDoc = pGetType->GetDoc();
- auto pObj = o3tl::make_unique<SwTextAPIEditSource>( pDoc );
+ auto pObj = std::make_unique<SwTextAPIEditSource>( pDoc );
const_cast <SwPostItField*> (this)->m_xTextObject = new
SwTextAPIObject( std::move(pObj) );
}
@@ -2096,7 +2095,7 @@ OUString SwRefPageSetField::ExpandImpl(SwRootFrame
const*const) const
std::unique_ptr<SwField> SwRefPageSetField::Copy() const
{
- return o3tl::make_unique<SwRefPageSetField>(
static_cast<SwRefPageSetFieldType*>(GetTyp()), m_nOffset, m_bOn );
+ return std::make_unique<SwRefPageSetField>(
static_cast<SwRefPageSetFieldType*>(GetTyp()), m_nOffset, m_bOn );
}
OUString SwRefPageSetField::GetPar2() const
@@ -2473,7 +2472,7 @@ OUString SwJumpEditField::ExpandImpl(SwRootFrame
const*const) const
std::unique_ptr<SwField> SwJumpEditField::Copy() const
{
- return o3tl::make_unique<SwJumpEditField>(
static_cast<SwJumpEditFieldType*>(GetTyp()), GetFormat(),
+ return std::make_unique<SwJumpEditField>(
static_cast<SwJumpEditFieldType*>(GetTyp()), GetFormat(),
m_sText, m_sHelp );
}
@@ -2593,7 +2592,7 @@ OUString SwCombinedCharField::ExpandImpl(SwRootFrame
const*const) const
std::unique_ptr<SwField> SwCombinedCharField::Copy() const
{
- return o3tl::make_unique<SwCombinedCharField>(
static_cast<SwCombinedCharFieldType*>(GetTyp()),
+ return std::make_unique<SwCombinedCharField>(
static_cast<SwCombinedCharFieldType*>(GetTyp()),
m_sCharacters );
}
diff --git a/sw/source/core/fields/flddropdown.cxx
b/sw/source/core/fields/flddropdown.cxx
index b79e81f2220e..b0a7bd449756 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -23,7 +23,6 @@
#include <svl/poolitem.hxx>
#include <comphelper/sequence.hxx>
-#include <o3tl/make_unique.hxx>
#include <unofldmid.h>
#include <unoprnms.hxx>
@@ -79,7 +78,7 @@ OUString SwDropDownField::ExpandImpl(SwRootFrame const*const)
const
std::unique_ptr<SwField> SwDropDownField::Copy() const
{
- return o3tl::make_unique<SwDropDownField>(*this);
+ return std::make_unique<SwDropDownField>(*this);
}
OUString SwDropDownField::GetPar1() const
diff --git a/sw/source/core/fields/macrofld.cxx
b/sw/source/core/fields/macrofld.cxx
index 7785717b92c8..a15051ca4120 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
#include <comphelper/processfactory.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
using namespace ::com::sun::star;
@@ -55,7 +54,7 @@ OUString SwMacroField::ExpandImpl(SwRootFrame const*const)
const
std::unique_ptr<SwField> SwMacroField::Copy() const
{
- return
o3tl::make_unique<SwMacroField>(static_cast<SwMacroFieldType*>(GetTyp()),
m_aMacro, m_aText);
+ return
std::make_unique<SwMacroField>(static_cast<SwMacroFieldType*>(GetTyp()),
m_aMacro, m_aText);
}
OUString SwMacroField::GetFieldName() const
diff --git a/sw/source/core/fields/scrptfld.cxx
b/sw/source/core/fields/scrptfld.cxx
index 53e8aec6a44b..5773694d7efb 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -21,7 +21,6 @@
#include <unofldmid.h>
#include <strings.hrc>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <swtypes.hxx>
using namespace ::com::sun::star;
@@ -54,7 +53,7 @@ OUString SwScriptField::ExpandImpl(SwRootFrame const*const)
const
std::unique_ptr<SwField> SwScriptField::Copy() const
{
- return o3tl::make_unique<SwScriptField>(
static_cast<SwScriptFieldType*>(GetTyp()), m_sType, m_sCode, m_bCodeURL );
+ return std::make_unique<SwScriptField>(
static_cast<SwScriptFieldType*>(GetTyp()), m_sType, m_sCode, m_bCodeURL );
}
/// set type
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 209c93e50c38..b50b93f27a25 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -77,7 +77,6 @@
#include <textboxhelper.hxx>
#include <vcl/virdev.hxx>
#include <svx/svdundo.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -1571,7 +1570,7 @@ bool SwFEShell::Paste(const Graphic &rGrf, const
OUString& rURL)
}
else
{
- pView->AddUndo(o3tl::make_unique<SdrUndoAttrObj>(*pObj));
+ pView->AddUndo(std::make_unique<SdrUndoAttrObj>(*pObj));
SfxItemSet aSet(pView->GetModel()->GetItemPool(),
svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>{});
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 31ecad6276e3..61a995381a52 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -20,7 +20,6 @@
#include <memory>
#include <hintids.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/errinf.hxx>
#include <vcl/svapp.hxx>
#include <basegfx/vector/b2dvector.hxx>
@@ -83,7 +82,7 @@ class TableWait
{ return our_kLineLimit < nCnt || our_kLineLimit < nCnt2 || (pFrame &&
our_kLineLimit < pFrame->ImplFindTabFrame()->GetTable()->GetTabLines().size());
}
public:
TableWait(size_t nCnt, SwFrame *pFrame, SwDocShell &rDocShell, size_t
nCnt2 = 0)
- : m_pWait( ShouldWait(nCnt, pFrame, nCnt2) ?
o3tl::make_unique<SwWait>( rDocShell, true ) : nullptr )
+ : m_pWait( ShouldWait(nCnt, pFrame, nCnt2) ? std::make_unique<SwWait>(
rDocShell, true ) : nullptr )
{ }
};
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 96fa282153dc..c8541459aeda 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -44,7 +44,6 @@
#include <DocumentSettingManager.hxx>
#include <IDocumentLayoutAccess.hxx>
-#include <o3tl/make_unique.hxx>
// Move methods
@@ -775,7 +774,7 @@ void SwPageFrame::MakeAll(vcl::RenderContext*
pRenderContext)
{
if (!pAccess)
{
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
}
assert(pAttrs);
@@ -964,7 +963,7 @@ void SwLayoutFrame::MakeAll(vcl::RenderContext*
/*pRenderContext*/)
{
if ( !pAccess )
{
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
}
Format( getRootFrame()->GetCurrShell()->GetOut(), pAttrs );
@@ -1172,7 +1171,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext*
/*pRenderContext*/)
return;
}
- auto xDeleteGuard = o3tl::make_unique<SwFrameDeleteGuard>(this);
+ auto xDeleteGuard = std::make_unique<SwFrameDeleteGuard>(this);
LockJoin();
long nFormatCount = 0;
// - loop prevention
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 405cfcd0d16d..0042265acc2b 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -59,7 +59,6 @@
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <pam.hxx>
-#include <o3tl/make_unique.hxx>
bool SwFlowFrame::m_bMoveBwdJump = false;
@@ -1374,7 +1373,7 @@ static bool lcl_IdenticalStyles(const SwFrame*
pPrevFrame, const SwFrame* pFrame
static bool lcl_getContextualSpacing(const SwFrame* pPrevFrame)
{
bool bRet;
- auto pAccess = o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(),
pPrevFrame);
+ auto pAccess = std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(),
pPrevFrame);
const SwBorderAttrs *pAttrs = pAccess->Get();
bRet = pAttrs->GetULSpace().GetContext();
@@ -1405,7 +1404,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
}
else
pOwn = &m_rThis;
- pAccess = o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(),
pOwn);
+ pAccess = std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(),
pOwn);
pAttrs = pAccess->Get();
}
else
@@ -1668,7 +1667,7 @@ SwTwips SwFlowFrame::CalcLowerSpace( const SwBorderAttrs*
_pAttrs ) const
std::unique_ptr<SwBorderAttrAccess> pAttrAccess;
if ( !_pAttrs )
{
- pAttrAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), &m_rThis);
+ pAttrAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), &m_rThis);
_pAttrs = pAttrAccess->Get();
}
@@ -1726,7 +1725,7 @@ SwTwips SwFlowFrame::CalcAddLowerSpaceAsLastInTableCell(
std::unique_ptr<SwBorderAttrAccess> pAttrAccess;
if (pFrame && (!_pAttrs || pFrame != &m_rThis))
{
- pAttrAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), pFrame);
+ pAttrAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), pFrame);
_pAttrs = pAttrAccess->Get();
}
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index c3c5e34d2942..4d0c56241183 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -32,7 +32,6 @@
#include <sortedobjs.hxx>
#include <objectformatter.hxx>
#include <ndindex.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
static SwTwips lcl_GetFrameMinHeight(const SwLayoutFrame & rFrame)
@@ -455,7 +454,7 @@ SwTwips SwHeadFootFrame::GrowFrame( SwTwips nDist, bool
bTst, bool bInfo )
{
nResult = 0;
- auto pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ auto pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
OSL_ENSURE(pAccess, "no border attributes");
SwBorderAttrs * pAttrs = pAccess->Get();
@@ -585,7 +584,7 @@ SwTwips SwHeadFootFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
bool bNotifyFlys = false;
if (nRest > 0)
{
- auto pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ auto pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
OSL_ENSURE(pAccess, "no border attributes");
SwBorderAttrs * pAttrs = pAccess->Get();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index b201bbbe648d..3d0a64b4c92d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -57,7 +57,6 @@
#include <calbck.hxx>
#include <DocumentSettingManager.hxx>
#include <docary.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
@@ -1861,7 +1860,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
const bool bFootnotesInDoc =
!GetFormat()->GetDoc()->GetFootnoteIdxs().empty();
const bool bFly = IsInFly();
- auto pAccess = o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(),
this);
+ auto pAccess = std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(),
this);
const SwBorderAttrs *pAttrs = pAccess->Get();
const bool bLargeTable = GetTable()->GetTabLines().size() > 64;
//arbitrary value, virtually guaranteed to be larger than one page.
@@ -1976,7 +1975,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
pAccess.reset();
m_bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrame( *this ) );
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
}
@@ -2016,7 +2015,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
pAccess.reset();
m_bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrame( *this ) );
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
}
if ( aOldPrtPos != aRectFnSet.GetPos(getFramePrintArea()) )
@@ -2066,7 +2065,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
m_bCalcLowers |= pHTMLLayout->Resize(
pHTMLLayout->GetBrowseWidthByTabFrame( *this )
);
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
}
@@ -2255,7 +2254,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
// is found, get its first content.
const SwFrame* pTmpNxt = sw_FormatNextContentForKeep( this
);
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
// The last row wants to keep with the frame behind the
table.
@@ -2497,7 +2496,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
GetFollow()->MakeAll(pRenderContext);
- pAccess =
o3tl::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
+ pAccess =
std::make_unique<SwBorderAttrAccess>(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
GetFollow()->SetLowersFormatted(false);
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index d71edc38df84..37f5bb739283 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -41,7 +41,6 @@
#include <editeng/protitem.hxx>
#include <swtblfmt.hxx>
#include <calbck.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#ifdef DBG_UTIL
@@ -372,7 +371,7 @@ std::unique_ptr<SwBoxSelection>
SwTable::CollectBoxSelection( const SwPaM& rPam
bool bOkay = true;
long nMid = ( nMin + nMax ) / 2;
- auto pRet(o3tl::make_unique<SwBoxSelection>());
+ auto pRet(std::make_unique<SwBoxSelection>());
std::vector< std::pair< SwTableBox*, long > > aNewWidthVector;
size_t nCheckBottom = nBottom;
long nLeftSpan = 0;
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 93f53065a7ca..0f2b5aee412a 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -26,7 +26,6 @@
#include <editeng/colritem.hxx>
#include <sfx2/linkmgr.hxx>
#include <editeng/boxitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
#include <fmtpdsc.hxx>
@@ -2699,7 +2698,7 @@ bool SwTableCellInfo::Impl::getNext()
}
SwTableCellInfo::SwTableCellInfo(const SwTable * pTable)
- : m_pImpl(o3tl::make_unique<Impl>())
+ : m_pImpl(std::make_unique<Impl>())
{
m_pImpl->setTable(pTable);
}
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index edd57c030e77..880773f4e69b 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -30,7 +30,6 @@
#include "pordrop.hxx"
#include "pormulti.hxx"
#include "portab.hxx"
-#include <o3tl/make_unique.hxx>
#include <memory>
#define MIN_TAB_WIDTH 60
@@ -397,7 +396,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent
)
OSL_ENSURE( pCurrent->Height(), "SwTextAdjuster::CalcBlockAdjust: missing
CalcLine()" );
OSL_ENSURE( !pCurrent->GetpKanaComp(), "pKanaComp already exists!!" );
- pCurrent->SetKanaComp( o3tl::make_unique<std::deque<sal_uInt16>>() );
+ pCurrent->SetKanaComp( std::make_unique<std::deque<sal_uInt16>>() );
const sal_uInt16 nNull = 0;
size_t nKanaIdx = 0;
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 95bba3bbc791..1a9ad99b908c 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <vcl/graph.hxx>
-#include <o3tl/make_unique.hxx>
#include <editeng/brushitem.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
@@ -404,7 +403,7 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
SwFieldPortion *pField = Clone( aNew );
if( !aNew.isEmpty() && !pField->GetFont() )
{
- pField->SetFont( o3tl::make_unique<SwFont>( *rInf.GetFont() )
);
+ pField->SetFont( std::make_unique<SwFont>( *rInf.GetFont() ) );
}
pField->SetFollow( true );
SetHasFollow( true );
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index c66465ab953b..3b481b762914 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -22,7 +22,6 @@
#include <string_view>
#include <hintids.hxx>
-#include <o3tl/make_unique.hxx>
#include <svl/whiter.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <swmodule.hxx>
@@ -291,7 +290,7 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode &
rTextNode,
pSectionNode->DelFrames(rFrame.getRootFrame());
}
}
- auto pRet(o3tl::make_unique<sw::MergedPara>(rFrame, std::move(extents),
+ auto pRet(std::make_unique<sw::MergedPara>(rFrame, std::move(extents),
mergedText.makeStringAndClear(), pParaPropsNode, &rTextNode,
nodes.back()));
for (SwTextNode * pTmp : nodes)
@@ -574,7 +573,7 @@ short SwRedlineItr::Seek(SwFont& rFnt,
{
SwAttrPool& rPool =
const_cast<SwDoc&>(m_rDoc).GetAttrPool();
- m_pSet = o3tl::make_unique<SfxItemSet>(rPool,
svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>{});
+ m_pSet = std::make_unique<SfxItemSet>(rPool,
svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>{});
}
if( 1 < pRed->GetStackCount() )
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index a5a448e94fd3..e40d66855612 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <o3tl/make_unique.hxx>
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
@@ -248,7 +247,7 @@ const SwRect SwContourCache::ContourRect( const SwFormat*
pFormat,
const SvxULSpaceItem &rULSpace = pFormat->GetULSpace();
CacheItem item {
pObj, // due to #37347 the Object must be entered only after
GetContour()
- o3tl::make_unique<TextRanger>( aPolyPolygon, pPolyPolygon.get(),
20,
+ std::make_unique<TextRanger>( aPolyPolygon, pPolyPolygon.get(), 20,
static_cast<sal_uInt16>(rLRSpace.GetLeft()),
static_cast<sal_uInt16>(rLRSpace.GetRight()),
pFormat->GetSurround().IsOutside(), false,
pFrame->IsVertical() )
};
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx
b/sw/source/core/tox/ToxLinkProcessor.cxx
index 41052996ebc2..bc2a6450d7f8 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -12,7 +12,6 @@
#include <SwStyleNameMapper.hxx>
#include <ndtxt.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <stdexcept>
@@ -23,7 +22,7 @@ void
ToxLinkProcessor::StartNewLink(sal_Int32 startPosition, const OUString&
characterStyle)
{
SAL_INFO_IF(m_pStartedLink, "sw.core", "ToxLinkProcessor: LS without LE");
- m_pStartedLink = o3tl::make_unique<StartedLink>(
+ m_pStartedLink = std::make_unique<StartedLink>(
startPosition, characterStyle);
}
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 8f45e20e514d..5f5adbb1bfd7 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -40,7 +40,6 @@
#include <strings.hrc>
#include <docsh.hxx>
#include <view.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
// This class saves the Pam as integers and can recompose those into a PaM
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 8151736c7184..e5a7b6974541 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -45,7 +45,6 @@
#include <dview.hxx>
#include <rootfrm.hxx>
#include <viewsh.hxx>
-#include <o3tl/make_unique.hxx>
struct SwUndoGroupObjImpl
{
@@ -66,7 +65,7 @@ void SwDoc::AddDrawUndo( std::unique_ptr<SdrUndoAction> pUndo
)
if( pSh && pSh->HasDrawView() )
pMarkList = &pSh->GetDrawView()->GetMarkedObjectList();
- GetIDocumentUndoRedo().AppendUndo(
o3tl::make_unique<SwSdrUndo>(std::move(pUndo), pMarkList, this) );
+ GetIDocumentUndoRedo().AppendUndo(
std::make_unique<SwSdrUndo>(std::move(pUndo), pMarkList, this) );
}
}
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 1103e507d8c4..5b429992bbb5 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -24,7 +24,6 @@
#include <sot/storage.hxx>
#include <editeng/keepitem.hxx>
#include <svx/svdobj.hxx>
-#include <o3tl/make_unique.hxx>
#include <docsh.hxx>
#include <fmtcntnt.hxx>
@@ -513,7 +512,7 @@ public:
SwUndoReplace::SwUndoReplace(SwPaM const& rPam,
OUString const& rIns, bool const bRegExp)
: SwUndo( SwUndoId::REPLACE, rPam.GetDoc() )
- , m_pImpl(o3tl::make_unique<Impl>(rPam, rIns, bRegExp))
+ , m_pImpl(std::make_unique<Impl>(rPam, rIns, bRegExp))
{
}
@@ -755,7 +754,7 @@ void SwUndoReplace::Impl::RedoImpl(::sw::UndoRedoContext &
rContext)
if( pHistory )
{
- auto xSave = o3tl::make_unique<SwHistory>();
+ auto xSave = std::make_unique<SwHistory>();
std::swap(pHistory, xSave);
DelContentIndex( *rPam.GetMark(), *rPam.GetPoint() );
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index b2cc03fd707c..626088d63ca9 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -41,7 +41,6 @@
/// OD 04.10.2002 #102894#
/// class Calc needed for calculation of the hidden condition of a section.
#include <calc.hxx>
-#include <o3tl/make_unique.hxx>
static std::unique_ptr<SfxItemSet> lcl_GetAttrSet( const SwSection& rSect )
{
@@ -296,7 +295,7 @@ public:
std::unique_ptr<SwUndo> MakeUndoDelSection(SwSectionFormat const& rFormat)
{
- return o3tl::make_unique<SwUndoDelSection>(rFormat, *rFormat.GetSection(),
+ return std::make_unique<SwUndoDelSection>(rFormat, *rFormat.GetSection(),
rFormat.GetContent().GetContentIdx());
}
@@ -399,7 +398,7 @@ public:
std::unique_ptr<SwUndo>
MakeUndoUpdateSection(SwSectionFormat const& rFormat, bool const bOnlyAttr)
{
- return o3tl::make_unique<SwUndoUpdateSection>(*rFormat.GetSection(),
+ return std::make_unique<SwUndoUpdateSection>(*rFormat.GetSection(),
rFormat.GetContent().GetContentIdx(), bOnlyAttr);
}
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index b20d4e5b94a2..3765c71bd384 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -30,7 +30,7 @@
#include <docsort.hxx>
#include <redline.hxx>
#include <node2lay.hxx>
-#include <o3tl/make_unique.hxx>
+
// Undo for Sorting
SwSortUndoElement::~SwSortUndoElement()
{
@@ -243,12 +243,12 @@ void SwUndoSort::RepeatImpl(::sw::RepeatContext &
rContext)
void SwUndoSort::Insert( const OUString& rOrgPos, const OUString& rNewPos)
{
- m_SortList.push_back(o3tl::make_unique< SwSortUndoElement>(rOrgPos,
rNewPos));
+ m_SortList.push_back(std::make_unique< SwSortUndoElement>(rOrgPos,
rNewPos));
}
void SwUndoSort::Insert( sal_uLong nOrgPos, sal_uLong nNewPos)
{
- m_SortList.push_back(o3tl::make_unique<SwSortUndoElement>(nOrgPos,
nNewPos));
+ m_SortList.push_back(std::make_unique<SwSortUndoElement>(nOrgPos,
nNewPos));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 5b9957eea5f1..c96c5918ef33 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -67,7 +67,7 @@
#include <memory>
#include <utility>
#include <vector>
-#include <o3tl/make_unique.hxx>
+
#ifdef DBG_UTIL
#define CHECK_TABLE(t) (t).CheckConsistency();
#else
@@ -684,7 +684,7 @@ void SwUndoTableToText::SetRange( const SwNodeRange& rRg )
void SwUndoTableToText::AddBoxPos( SwDoc& rDoc, sal_uLong nNdIdx, sal_uLong
nEndIdx, sal_Int32 nContentIdx )
{
- m_vBoxSaves.push_back(o3tl::make_unique<SwTableToTextSave>(rDoc, nNdIdx,
nEndIdx, nContentIdx));
+ m_vBoxSaves.push_back(std::make_unique<SwTableToTextSave>(rDoc, nNdIdx,
nEndIdx, nContentIdx));
}
SwUndoTextToTable::SwUndoTextToTable( const SwPaM& rRg,
@@ -2485,11 +2485,11 @@ void
SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext)
else
*aPam.GetPoint() = SwPosition( aTmpIdx );
}
- pUndo = o3tl::make_unique<SwUndoDelete>( aPam,
bDeleteCompleteParagraph, true );
+ pUndo = std::make_unique<SwUndoDelete>( aPam,
bDeleteCompleteParagraph, true );
}
else
{
- pUndo = o3tl::make_unique<SwUndoDelete>( aPam, true );
+ pUndo = std::make_unique<SwUndoDelete>( aPam, true );
if( pEntry->pUndo )
{
pEntry->pUndo->UndoImpl(rContext);
@@ -2522,7 +2522,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext
& rContext)
if( aTmpSet.Count() )
{
- pEntry->pBoxNumAttr = o3tl::make_unique<SfxItemSet>(
+ pEntry->pBoxNumAttr = std::make_unique<SfxItemSet>(
rDoc.GetAttrPool(),
svl::Items<
RES_VERT_ORIENT, RES_VERT_ORIENT,
@@ -2566,7 +2566,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext
& rContext)
// b62341295: Redline for copying tables - Start.
rDoc.GetNodes().MakeTextNode( aInsIdx, rDoc.GetDfltTextFormatColl() );
SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode());
- std::unique_ptr<SwUndo> pUndo = IDocumentRedlineAccess::IsRedlineOn(
GetRedlineFlags() ) ? nullptr : o3tl::make_unique<SwUndoDelete>( aPam, true );
+ std::unique_ptr<SwUndo> pUndo = IDocumentRedlineAccess::IsRedlineOn(
GetRedlineFlags() ) ? nullptr : std::make_unique<SwUndoDelete>( aPam, true );
if( pEntry->pUndo )
{
pEntry->pUndo->UndoImpl(rContext);
@@ -2617,7 +2617,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext
& rContext)
if( aTmpSet.Count() )
{
- pEntry->pBoxNumAttr = o3tl::make_unique<SfxItemSet>(
+ pEntry->pBoxNumAttr = std::make_unique<SfxItemSet>(
rDoc.GetAttrPool(),
svl::Items<
RES_VERT_ORIENT, RES_VERT_ORIENT,
@@ -2647,10 +2647,10 @@ void SwUndoTableCpyTable::AddBoxBefore( const
SwTableBox& rBox, bool bDelContent
SwPaM aPam( aInsIdx.GetNode(), *rBox.GetSttNd()->EndOfSectionNode() );
if( !pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
- pEntry->pUndo = o3tl::make_unique<SwUndoDelete>( aPam, true );
+ pEntry->pUndo = std::make_unique<SwUndoDelete>( aPam, true );
}
- pEntry->pBoxNumAttr = o3tl::make_unique<SfxItemSet>(
+ pEntry->pBoxNumAttr = std::make_unique<SfxItemSet>(
pDoc->GetAttrPool(),
svl::Items<
RES_VERT_ORIENT, RES_VERT_ORIENT,
@@ -2739,7 +2739,7 @@ std::unique_ptr<SwUndo>
SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const
if( aDeleteStart != aCellEnd )
{ // If the old (deleted) part is not empty, here we are...
SwPaM aDeletePam( aDeleteStart, aCellEnd );
- pUndo = o3tl::make_unique<SwUndoRedlineDelete>( aDeletePam,
SwUndoId::DELETE );
+ pUndo = std::make_unique<SwUndoRedlineDelete>( aDeletePam,
SwUndoId::DELETE );
pDoc->getIDocumentRedlineAccess().AppendRedline( new SwRangeRedline(
nsRedlineType_t::REDLINE_DELETE, aDeletePam ), true );
}
else if( !rJoin ) // If the old part is empty and joined, we are finished
@@ -2747,7 +2747,7 @@ std::unique_ptr<SwUndo>
SwUndoTableCpyTable::PrepareRedline( SwDoc* pDoc, const
aCellEnd = SwPosition(
SwNodeIndex( *rBox.GetSttNd()->EndOfSectionNode() ));
SwPaM aTmpPam( aDeleteStart, aCellEnd );
- pUndo = o3tl::make_unique<SwUndoDelete>( aTmpPam, true );
+ pUndo = std::make_unique<SwUndoDelete>( aTmpPam, true );
}
SwPosition aCellStart( SwNodeIndex( *rBox.GetSttNd(), 2 ) );
pText = aCellStart.nNode.GetNode().GetTextNode();
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 7aca6eb4ff03..064da6df7ebc 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -89,7 +89,6 @@
#include <svl/listener.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <textapi.hxx>
@@ -2376,7 +2375,7 @@ uno::Any SAL_CALL SwXTextField::getPropertyValue(const
OUString& rPropertyName)
if (!m_pImpl->m_xTextObject.is())
{
m_pImpl->m_xTextObject
- = new SwTextAPIObject(
o3tl::make_unique<SwTextAPIEditSource>(m_pImpl->m_pDoc) );
+ = new SwTextAPIObject(
std::make_unique<SwTextAPIEditSource>(m_pImpl->m_pDoc) );
}
uno::Reference<text::XText>
xText(m_pImpl->m_xTextObject.get());
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 7d748b8984e3..02845dc8dd1c 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <svx/svxids.hrc>
#include <svx/xfillit0.hxx>
#include <svx/xflgrit.hxx>
diff --git a/sw/source/core/unocore/unoport.cxx
b/sw/source/core/unocore/unoport.cxx
index 3a88965eb55b..bd5cd91d95b2 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -20,7 +20,6 @@
#include <unoport.hxx>
#include <cmdid.h>
-#include <o3tl/make_unique.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <vcl/svapp.hxx>
@@ -358,7 +357,7 @@ void SwXTextPortion::GetPropertyValue(
{
if(!pSet)
{
- pSet = o3tl::make_unique<SfxItemSet>(
+ pSet = std::make_unique<SfxItemSet>(
pUnoCursor->GetDoc()->GetAttrPool(),
svl::Items<
RES_CHRATR_BEGIN, RES_FRMATR_END - 1,
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index 06e4240294cd..fca31f8ce66c 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -62,7 +62,6 @@
#include <comphelper/string.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <o3tl/make_unique.hxx>
#include <algorithm>
#include <memory>
#include <set>
@@ -161,7 +160,7 @@ namespace
else if (pCrossRefMark)
{
// Crossrefbookmarks only remember the start position but have
to span the whole paragraph
- pCrossRefEndPos = o3tl::make_unique<SwPosition>(rEndPos);
+ pCrossRefEndPos = std::make_unique<SwPosition>(rEndPos);
pCrossRefEndPos->nContent =
pCrossRefEndPos->nNode.GetNode().GetTextNode()->Len();
pEndPos = pCrossRefEndPos.get();
}
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 6c03614b793b..0ce7aeff4179 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -83,7 +83,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/sequence.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <svl/stylepool.hxx>
@@ -1300,7 +1299,7 @@ SwXStyle::SwXStyle(SwDoc* pDoc, SfxStyleFamily eFamily,
bool bConditional)
assert(!m_bIsConditional || m_rEntry.m_eFamily == SfxStyleFamily::Para);
// only paragraph styles are conditional
// Register ourselves as a listener to the document (via the page
descriptor)
SvtListener::StartListening(pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD)->GetNotifier());
- m_pPropertiesImpl = o3tl::make_unique<SwStyleProperties_Impl>(
+ m_pPropertiesImpl = std::make_unique<SwStyleProperties_Impl>(
aSwMapProvider.GetPropertySet(m_bIsConditional ?
PROPERTY_MAP_CONDITIONAL_PARA_STYLE :
m_rEntry.m_nPropMapType)->getPropertyMap());
}
diff --git a/sw/source/filter/ascii/parasc.cxx
b/sw/source/filter/ascii/parasc.cxx
index ef7faed07197..cbdae221ed1e 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -19,7 +19,6 @@
#include <memory>
-#include <o3tl/make_unique.hxx>
#include <tools/stream.hxx>
#include <hintids.hxx>
#include <rtl/tencinfo.h>
@@ -102,7 +101,7 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM&
rCursor, SvStream& rIn,
pPam.reset( new SwPaM( *rCursor.GetPoint() ) );
pArr.reset( new sal_Char [ ASC_BUFFLEN + 2 ] );
- pItemSet = o3tl::make_unique<SfxItemSet>( pDoc->GetAttrPool(),
+ pItemSet = std::make_unique<SfxItemSet>( pDoc->GetAttrPool(),
svl::Items<RES_CHRATR_FONT, RES_CHRATR_LANGUAGE,
RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_LANGUAGE,
RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE>{} );
diff --git a/sw/source/filter/basflt/shellio.cxx
b/sw/source/filter/basflt/shellio.cxx
index 60ff28d9210a..b66cb249ba22 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -60,7 +60,6 @@
#include <swerror.h>
#include <paratr.hxx>
#include <pausethreadstarting.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -270,7 +269,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
