[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 29 06:15:43 UTC 2019
sc/inc/pch/precompiled_sc.hxx | 1
sc/inc/pch/precompiled_scfilt.hxx | 1
sc/inc/pch/precompiled_scui.hxx | 1
sc/qa/unit/ucalc_condformat.cxx | 13 -
sc/qa/unit/ucalc_formula.cxx | 3
sc/source/core/data/attarray.cxx | 3
sc/source/core/data/bcaslot.cxx | 4
sc/source/core/data/cellvalues.cxx | 5
sc/source/core/data/colorscale.cxx | 5
sc/source/core/data/column2.cxx | 12 -
sc/source/core/data/column4.cxx | 3
sc/source/core/data/docpool.cxx | 3
sc/source/core/data/documen2.cxx | 3
sc/source/core/data/documen8.cxx | 3
sc/source/core/data/documen9.cxx | 3
sc/source/core/data/documentimport.cxx | 7
sc/source/core/data/dpcache.cxx | 7
sc/source/core/data/dpobject.cxx | 3
sc/source/core/data/dpresfilter.cxx | 3
sc/source/core/data/dpsave.cxx | 3
sc/source/core/data/drwlayer.cxx | 33 +--
sc/source/core/data/fillinfo.cxx | 3
sc/source/core/data/formulacell.cxx | 5
sc/source/core/data/mtvelements.cxx | 4
sc/source/core/data/patattr.cxx | 3
sc/source/core/data/pivot2.cxx | 3
sc/source/core/data/postit.cxx | 13 -
sc/source/core/data/table3.cxx | 3
sc/source/core/tool/autoform.cxx | 1
sc/source/core/tool/callform.cxx | 3
sc/source/core/tool/chartarr.cxx | 1
sc/source/core/tool/chartpos.cxx | 3
sc/source/core/tool/dbdata.cxx | 3
sc/source/core/tool/detfunc.cxx | 17 -
sc/source/core/tool/formulagroup.cxx | 5
sc/source/core/tool/formulalogger.cxx | 5
sc/source/core/tool/queryparam.cxx | 13 -
sc/source/core/tool/rangenam.cxx | 3
sc/source/core/tool/userlist.cxx | 13 -
sc/source/filter/excel/excimp8.cxx | 3
sc/source/filter/excel/fontbuff.cxx | 3
sc/source/filter/excel/frmbase.cxx | 5
sc/source/filter/excel/impop.cxx | 3
sc/source/filter/excel/xechart.cxx | 6
sc/source/filter/excel/xeescher.cxx | 3
sc/source/filter/excel/xepivotxml.cxx | 4
sc/source/filter/excel/xestyle.cxx | 3
sc/source/filter/excel/xichart.cxx | 3
sc/source/filter/excel/xicontent.cxx | 3
sc/source/filter/excel/xihelper.cxx | 3
sc/source/filter/excel/xilink.cxx | 11 -
sc/source/filter/excel/xiname.cxx | 3
sc/source/filter/excel/xistyle.cxx | 3
sc/source/filter/ftools/fprogressbar.cxx | 3
sc/source/filter/html/htmlimp.cxx | 3
sc/source/filter/html/htmlpars.cxx | 13 -
sc/source/filter/oox/extlstcontext.cxx | 5
sc/source/filter/oox/formulabuffer.cxx | 5
sc/source/filter/oox/workbookfragment.cxx | 3
sc/source/filter/orcus/interface.cxx | 11 -
sc/source/filter/orcus/xmlcontext.cxx | 3
sc/source/filter/rtf/rtfimp.cxx | 3
sc/source/filter/xcl97/xcl97esc.cxx | 3
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 21 --
sc/source/filter/xml/XMLStylesExportHelper.cxx | 3
sc/source/filter/xml/xmlcelli.cxx | 11 -
sc/source/filter/xml/xmlimprt.cxx | 4
sc/source/filter/xml/xmllabri.cxx | 4
sc/source/ui/Accessibility/AccessibleCell.cxx | 4
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 4
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 6
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 6
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 6
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 6
sc/source/ui/app/inputhdl.cxx | 7
sc/source/ui/app/inputwin.cxx | 13 -
sc/source/ui/app/scdll.cxx | 3
sc/source/ui/app/scmod.cxx | 3
sc/source/ui/attrdlg/scdlgfact.cxx | 49 ++--
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 3
sc/source/ui/dbgui/filtdlg.cxx | 4
sc/source/ui/docshell/arealink.cxx | 5
sc/source/ui/docshell/dbdocfun.cxx | 39 +--
sc/source/ui/docshell/dbdocimp.cxx | 3
sc/source/ui/docshell/docfunc.cxx | 111 +++++------
sc/source/ui/docshell/docfuncutil.cxx | 4
sc/source/ui/docshell/docsh.cxx | 5
sc/source/ui/docshell/docsh4.cxx | 8
sc/source/ui/docshell/docsh5.cxx | 19 -
sc/source/ui/docshell/docsh6.cxx | 5
sc/source/ui/docshell/externalrefmgr.cxx | 3
sc/source/ui/docshell/impex.cxx | 3
sc/source/ui/docshell/olinefun.cxx | 19 -
sc/source/ui/docshell/tablink.cxx | 9
sc/source/ui/drawfunc/drawsh5.cxx | 2
sc/source/ui/drawfunc/fuins2.cxx | 5
sc/source/ui/drawfunc/futext3.cxx | 5
sc/source/ui/drawfunc/graphsh.cxx | 3
sc/source/ui/inc/ChildWindowWrapper.hxx | 4
sc/source/ui/miscdlgs/solveroptions.cxx | 9
sc/source/ui/namedlg/namedefdlg.cxx | 2
sc/source/ui/namedlg/namedlg.cxx | 3
sc/source/ui/namedlg/namepast.cxx | 4
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/undo/refundo.cxx | 3
sc/source/ui/undo/undodat.cxx | 3
sc/source/ui/undo/undorangename.cxx | 6
sc/source/ui/unoobj/TablePivotCharts.cxx | 5
sc/source/ui/unoobj/cellsuno.cxx | 15 -
sc/source/ui/unoobj/chartuno.cxx | 7
sc/source/ui/unoobj/confuno.cxx | 3
sc/source/ui/unoobj/docuno.cxx | 1
sc/source/ui/unoobj/fielduno.cxx | 5
sc/source/ui/unoobj/textuno.cxx | 3
sc/source/ui/view/cellsh1.cxx | 11 -
sc/source/ui/view/dbfunc.cxx | 7
sc/source/ui/view/dbfunc3.cxx | 7
sc/source/ui/view/drawvie3.cxx | 5
sc/source/ui/view/drawvie4.cxx | 5
sc/source/ui/view/drawview.cxx | 7
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/gridwin3.cxx | 3
sc/source/ui/view/output2.cxx | 5
sc/source/ui/view/preview.cxx | 5
sc/source/ui/view/prevloc.cxx | 14 -
sc/source/ui/view/spelldialog.cxx | 2
sc/source/ui/view/tabview5.cxx | 1
sc/source/ui/view/tabvwsh2.cxx | 1
sc/source/ui/view/tabvwsh4.cxx | 1
sc/source/ui/view/viewfun2.cxx | 26 +-
sc/source/ui/view/viewfun3.cxx | 11 -
sc/source/ui/view/viewfun4.cxx | 9
sc/source/ui/view/viewfun7.cxx | 3
sc/source/ui/view/viewfunc.cxx | 23 +-
136 files changed, 417 insertions(+), 547 deletions(-)
New commits:
commit 6d5af783bfd899253908c926853233a99df6f4e0
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sat Jan 26 19:58:39 2019 +0100
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jan 29 07:15:17 2019 +0100
o3tl::make_unique -> std::make_unique in sc
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib69a4a2a08b1edbc0f40beac00f7f68075b479a1
Reviewed-on: https://gerrit.libreoffice.org/66967
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 4e42f9be0c38..a3560a3b8baf 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -421,7 +421,6 @@
#include <miscuno.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/enumarray.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/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 3ad0ca074e95..296250160562 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -216,7 +216,6 @@
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <oox/core/contexthandler.hxx>
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index e4b00da4a333..51b4fefecbcb 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -103,7 +103,6 @@
#include <globalnames.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <miscuno.hxx>
-#include <o3tl/make_unique.hxx>
#include <officecfg/Office/Calc.hxx>
#include <optutil.hxx>
#include <patattr.hxx>
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index bb469678ab52..e3aa885211da 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -25,7 +25,6 @@
#include <tokenarray.hxx>
#include <svl/sharedstringpool.hxx>
-#include <o3tl/make_unique.hxx>
void Test::testCopyPasteSkipEmptyConditionalFormatting()
{
@@ -555,9 +554,9 @@ void Test::testIconSet()
ScIconSetFormat* pEntry = new ScIconSetFormat(m_pDoc);
ScIconSetFormatData* pData = new ScIconSetFormatData;
- pData->m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(0, COL_BLUE));
- pData->m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(1, COL_GREEN));
- pData->m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(2, COL_RED));
+ pData->m_Entries.push_back(std::make_unique<ScColorScaleEntry>(0, COL_BLUE));
+ pData->m_Entries.push_back(std::make_unique<ScColorScaleEntry>(1, COL_GREEN));
+ pData->m_Entries.push_back(std::make_unique<ScColorScaleEntry>(2, COL_RED));
pEntry->SetIconSetData(pData);
m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, 1);
@@ -1200,9 +1199,9 @@ void Test::testCondFormatListenToOwnRange()
ScIconSetFormat* pEntry = new ScIconSetFormat(m_pDoc);
ScIconSetFormatData* pData = new ScIconSetFormatData;
- pData->m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(0, COL_BLUE));
- pData->m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(1, COL_GREEN));
- pData->m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(2, COL_RED));
+ pData->m_Entries.push_back(std::make_unique<ScColorScaleEntry>(0, COL_BLUE));
+ pData->m_Entries.push_back(std::make_unique<ScColorScaleEntry>(1, COL_GREEN));
+ pData->m_Entries.push_back(std::make_unique<ScColorScaleEntry>(2, COL_RED));
pEntry->SetIconSetData(pData);
pEntry->SetParent(pFormat);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 9577a8fe1fab..dca8abcf8d70 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -35,7 +35,6 @@
#include <svl/itemset.hxx>
#include <formula/vectortoken.hxx>
-#include <o3tl/make_unique.hxx>
#include <svl/broadcast.hxx>
#include <svl/intitem.hxx>
#include <sfx2/docfile.hxx>
@@ -3955,7 +3954,7 @@ void Test::testFormulaRefUpdateValidity()
SfxUInt32Item aItem(ATTR_VALIDDATA, nIndex);
ScPatternAttr aNewAttrs(
- o3tl::make_unique<SfxItemSet>(*m_pDoc->GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{}));
+ std::make_unique<SfxItemSet>(*m_pDoc->GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{}));
aNewAttrs.GetItemSet().Put(aItem);
m_pDoc->ApplyPattern(0, 1, 0, aNewAttrs);
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index ae181b7381fc..48177814b8df 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -19,7 +19,6 @@
#include <attarray.hxx>
#include <scitems.hxx>
-#include <o3tl/make_unique.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lineitem.hxx>
#include <editeng/shaditem.hxx>
@@ -994,7 +993,7 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow,
else
{
// first pattern - copied from parent
- rState.pItemSet = o3tl::make_unique<SfxItemSet>( *rThisSet.GetPool(), rThisSet.GetRanges() );
+ rState.pItemSet = std::make_unique<SfxItemSet>( *rThisSet.GetPool(), rThisSet.GetRanges() );
rState.pItemSet->Set( rThisSet, bDeep );
rState.mnPatternId = pPattern->GetKey();
}
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 14555512fd35..bf94a3b6b397 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -35,8 +35,6 @@
#include <grouparealistener.hxx>
#endif
-#include <o3tl/make_unique.hxx>
-
// Number of slots per dimension
// must be integer divisors of MAXCOLCOUNT respectively MAXROWCOUNT
#define BCA_SLOTS_COL ((MAXCOLCOUNT_DEFINE) / 16)
@@ -1096,7 +1094,7 @@ void ScBroadcastAreaSlotMachine::InsertBulkGroupArea( ScBroadcastArea* pArea, co
if (it == m_BulkGroupAreas.end() || m_BulkGroupAreas.key_comp()(pArea, it->first))
{
// Insert a new one.
- it = m_BulkGroupAreas.insert(it, std::make_pair(pArea, o3tl::make_unique<sc::ColumnSpanSet>(false)));
+ it = m_BulkGroupAreas.insert(it, std::make_pair(pArea, std::make_unique<sc::ColumnSpanSet>(false)));
}
sc::ColumnSpanSet *const pSet = it->second.get();
diff --git a/sc/source/core/data/cellvalues.cxx b/sc/source/core/data/cellvalues.cxx
index 7dae4497da9a..5b065e1ff3b3 100644
--- a/sc/source/core/data/cellvalues.cxx
+++ b/sc/source/core/data/cellvalues.cxx
@@ -10,7 +10,6 @@
#include <memory>
#include <cellvalues.hxx>
#include <column.hxx>
-#include <o3tl/make_unique.hxx>
#include <cassert>
@@ -266,10 +265,10 @@ struct TableValues::Impl
for (size_t nTab = 0; nTab < nTabs; ++nTab)
{
- m_Tables.push_back(o3tl::make_unique<TableType>());
+ m_Tables.push_back(std::make_unique<TableType>());
std::unique_ptr<TableType>& rTab2 = m_Tables.back();
for (size_t nCol = 0; nCol < nCols; ++nCol)
- rTab2->push_back(o3tl::make_unique<CellValues>());
+ rTab2->push_back(std::make_unique<CellValues>());
}
}
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 067fb3ca871e..a991cc05a79f 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -18,7 +18,6 @@
#include <refdata.hxx>
#include <formula/token.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/bitmapex.hxx>
#include <algorithm>
@@ -377,7 +376,7 @@ ScColorScaleFormat::ScColorScaleFormat(ScDocument* pDoc, const ScColorScaleForma
{
for(ScColorScaleEntries::const_iterator itr = rFormat.begin(); itr != rFormat.end(); ++itr)
{
- maColorScales.push_back(o3tl::make_unique<ScColorScaleEntry>(pDoc, **itr));
+ maColorScales.push_back(std::make_unique<ScColorScaleEntry>(pDoc, **itr));
}
}
@@ -978,7 +977,7 @@ ScIconSetFormatData::ScIconSetFormatData(ScIconSetFormatData const& rOther)
m_Entries.reserve(rOther.m_Entries.size());
for (auto const& it : rOther.m_Entries)
{
- m_Entries.push_back(o3tl::make_unique<ScColorScaleEntry>(*it));
+ m_Entries.push_back(std::make_unique<ScColorScaleEntry>(*it));
}
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index ac6b06d7f4e0..5f093d4c660e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -59,8 +59,6 @@
#include <formula/errorcodes.hxx>
#include <formula/vectortoken.hxx>
-#include <o3tl/make_unique.hxx>
-
#include <algorithm>
#include <memory>
@@ -2632,7 +2630,7 @@ copyFirstFormulaBlock(
if (!pNumArray)
{
rCxt.m_NumArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::NumArrayType>(nArrayLen, fNan));
+ std::make_unique<sc::FormulaGroupContext::NumArrayType>(nArrayLen, fNan));
pNumArray = rCxt.m_NumArrays.back().get();
}
@@ -2643,7 +2641,7 @@ copyFirstFormulaBlock(
if (!pStrArray)
{
rCxt.m_StrArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::StrArrayType>(nArrayLen, nullptr));
+ std::make_unique<sc::FormulaGroupContext::StrArrayType>(nArrayLen, nullptr));
pStrArray = rCxt.m_StrArrays.back().get();
}
@@ -2732,7 +2730,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( SCROW nRow1, SCROW nRow2
sc::numeric_block::const_iterator it = sc::numeric_block::begin(*itBlk->data);
sc::numeric_block::const_iterator itEnd = sc::numeric_block::end(*itBlk->data);
rCxt.m_NumArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::NumArrayType>(it, itEnd));
+ std::make_unique<sc::FormulaGroupContext::NumArrayType>(it, itEnd));
sc::FormulaGroupContext::NumArrayType& rArray = *rCxt.m_NumArrays.back();
rArray.resize(nRow2+1, fNan); // allocate to the requested length.
@@ -2761,7 +2759,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( SCROW nRow1, SCROW nRow2
case sc::element_type_edittext:
{
rCxt.m_StrArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::StrArrayType>(nRow2+1, nullptr));
+ std::make_unique<sc::FormulaGroupContext::StrArrayType>(nRow2+1, nullptr));
sc::FormulaGroupContext::StrArrayType& rArray = *rCxt.m_StrArrays.back();
pColArray = rCxt.setCachedColArray(nTab, nCol, nullptr, &rArray);
if (!pColArray)
@@ -2848,7 +2846,7 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( SCROW nRow1, SCROW nRow2
{
// Fill the whole length with NaN's.
rCxt.m_NumArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::NumArrayType>(nRow2+1, fNan));
+ std::make_unique<sc::FormulaGroupContext::NumArrayType>(nRow2+1, fNan));
sc::FormulaGroupContext::NumArrayType& rArray = *rCxt.m_NumArrays.back();
pColArray = rCxt.setCachedColArray(nTab, nCol, &rArray, nullptr);
if (!pColArray)
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 379d6e24a389..7448ef02dbab 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -30,7 +30,6 @@
#include <compiler.hxx>
#include <svl/sharedstringpool.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <vector>
@@ -1640,7 +1639,7 @@ std::unique_ptr<sc::ColumnIterator> ScColumn::GetColumnIterator( SCROW nRow1, SC
if (!ValidRow(nRow1) || !ValidRow(nRow2) || nRow1 > nRow2)
return std::unique_ptr<sc::ColumnIterator>();
- return o3tl::make_unique<sc::ColumnIterator>(maCells, nRow1, nRow2);
+ return std::make_unique<sc::ColumnIterator>(maCells, nRow1, nRow2);
}
void ScColumn::EnsureFormulaCellResults( SCROW nRow1, SCROW nRow2 )
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 0a0819b533e0..0f19f8561b14 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -25,7 +25,6 @@
#include <comphelper/string.hxx>
#include <i18nutil/unicode.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -201,7 +200,7 @@ ScDocumentPool::ScDocumentPool()
SvxFontItem* pCtlFont = getDefaultFontItem(nCtlLang, DefaultFontType::CTL_SPREADSHEET, ATTR_CTL_FONT);
SvxBoxInfoItem* pGlobalBorderInnerAttr = new SvxBoxInfoItem( ATTR_BORDER_INNER );
- auto pSet = o3tl::make_unique<SfxItemSet>( *this, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} );
+ auto pSet = std::make_unique<SfxItemSet>( *this, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} );
SfxItemSet aSetItemItemSet( *this,
svl::Items<ATTR_BACKGROUND, ATTR_BACKGROUND,
ATTR_BORDER, ATTR_SHADOW,
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index ebcae2c95774..7dbab52dd3f0 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -33,7 +33,6 @@
#include <rtl/crc.h>
#include <basic/basmgr.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
#include <document.hxx>
#include <table.hxx>
@@ -1128,7 +1127,7 @@ ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange, ScInterprete
if (findIt == rpCacheMap->aCacheMap.end())
{
auto insertIt = rpCacheMap->aCacheMap.emplace_hint(findIt,
- rRange, o3tl::make_unique<ScLookupCache>(this, rRange, *rpCacheMap) );
+ rRange, std::make_unique<ScLookupCache>(this, rRange, *rpCacheMap) );
pCache = insertIt->second.get();
// The StartListeningArea() call is not thread-safe, as all threads
// would access the same SvtBroadcaster.
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 383ad69bb3b3..f9525ba3b1d8 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -18,7 +18,6 @@
*/
#include <scitems.hxx>
-#include <o3tl/make_unique.hxx>
#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <tools/urlobj.hxx>
@@ -113,7 +112,7 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist)
if ( !mpPrinter && bCreateIfNotExist )
{
auto pSet =
- o3tl::make_unique<SfxItemSet>( *mxPoolHelper->GetDocPool(),
+ std::make_unique<SfxItemSet>( *mxPoolHelper->GetDocPool(),
svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
SID_PRINT_SELECTEDSHEET, SID_PRINT_SELECTEDSHEET,
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 72204133dc6a..ae3b481b2a87 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -33,7 +33,6 @@
#include <svx/xtable.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
-#include <o3tl/make_unique.hxx>
#include <document.hxx>
#include <docoptio.hxx>
@@ -81,7 +80,7 @@ void ScDocument::TransferDrawPage(const ScDocument* pSrcDoc, SCTAB nSrcPos, SCTA
pNewPage->InsertObject( pNewObject );
if (mpDrawLayer->IsRecording())
- mpDrawLayer->AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pNewObject ) );
+ mpDrawLayer->AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pNewObject ) );
pOldObject = aIter.Next();
}
diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index c5d1be2dfdc6..4da6d7473894 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -26,7 +26,6 @@
#include <svl/sharedstringpool.hxx>
#include <svl/languageoptions.hxx>
-#include <o3tl/make_unique.hxx>
#include <unotools/configmgr.hxx>
namespace {
@@ -290,7 +289,7 @@ void ScDocumentImport::setFormulaCell(
return;
std::unique_ptr<ScFormulaCell> pFC =
- o3tl::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, rFormula, eGrammar);
+ std::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, rFormula, eGrammar);
mpImpl->mrDoc.CheckLinkFormulaNeedingCheck( *pFC->GetCode());
@@ -319,7 +318,7 @@ void ScDocumentImport::setFormulaCell(
return;
std::unique_ptr<ScFormulaCell> pFC =
- o3tl::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, rFormula, eGrammar);
+ std::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, rFormula, eGrammar);
mpImpl->mrDoc.CheckLinkFormulaNeedingCheck( *pFC->GetCode());
@@ -343,7 +342,7 @@ void ScDocumentImport::setFormulaCell(const ScAddress& rPos, std::unique_ptr<ScT
return;
std::unique_ptr<ScFormulaCell> pFC =
- o3tl::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, std::move(pArray));
+ std::make_unique<ScFormulaCell>(&mpImpl->mrDoc, rPos, std::move(pArray));
mpImpl->mrDoc.CheckLinkFormulaNeedingCheck( *pFC->GetCode());
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 7820e9090571..1be6e523966c 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -37,7 +37,6 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/collatorwrapper.hxx>
#include <svl/zforlist.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
#if DUMP_PIVOT_TABLE
@@ -550,7 +549,7 @@ void ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
std::vector<InitColumnData> aColData(mnColumnCount);
maFields.reserve(mnColumnCount);
for (size_t i = 0; i < static_cast<size_t>(mnColumnCount); ++i)
- maFields.push_back(o3tl::make_unique<Field>());
+ maFields.push_back(std::make_unique<Field>());
maLabelNames.reserve(mnColumnCount+1);
@@ -629,7 +628,7 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB)
maFields.clear();
maFields.reserve(mnColumnCount);
for (size_t i = 0; i < static_cast<size_t>(mnColumnCount); ++i)
- maFields.push_back(o3tl::make_unique<Field>());
+ maFields.push_back(std::make_unique<Field>());
// Get column titles and types.
maLabelNames.clear();
@@ -1297,7 +1296,7 @@ SvNumberFormatter* ScDPCache::GetNumberFormatter() const
long ScDPCache::AppendGroupField()
{
- maGroupFields.push_back(o3tl::make_unique<GroupItems>());
+ maGroupFields.push_back(std::make_unique<GroupItems>());
return static_cast<long>(maFields.size() + maGroupFields.size() - 1);
}
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index a362be2bf457..24ff05b2df16 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -72,7 +72,6 @@
#include <svl/zforlist.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <o3tl/make_unique.hxx>
#include <utility>
#include <vector>
@@ -3705,7 +3704,7 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
if (!bFound)
{
// none found, re-insert deleted object (see ScUndoDataPilot::Undo)
- r.InsertNewTable(o3tl::make_unique<ScDPObject>(rSrcObj));
+ r.InsertNewTable(std::make_unique<ScDPObject>(rSrcObj));
}
}
OSL_ENSURE( maTables.size() == r.maTables.size(), "WriteRefsTo: couldn't restore all entries" );
diff --git a/sc/source/core/data/dpresfilter.cxx b/sc/source/core/data/dpresfilter.cxx
index 5201ad908b82..e1b37f3dfc2d 100644
--- a/sc/source/core/data/dpresfilter.cxx
+++ b/sc/source/core/data/dpresfilter.cxx
@@ -13,7 +13,6 @@
#include <unotools/charclass.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -111,7 +110,7 @@ void ScDPResultTree::add(
if (itDim == rDims.end())
{
// New dimension. Insert it.
- auto r = rDims.emplace(aUpperName, o3tl::make_unique<DimensionNode>());
+ auto r = rDims.emplace(aUpperName, std::make_unique<DimensionNode>());
assert(r.second);
itDim = r.first;
}
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 1a0a31b73ef3..ceb9fa8d7227 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -29,7 +29,6 @@
#include <sal/types.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <comphelper/stl_types.hxx>
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
@@ -740,7 +739,7 @@ ScDPSaveData::ScDPSaveData(const ScDPSaveData& r) :
for (auto const& it : r.m_DimList)
{
- m_DimList.push_back(o3tl::make_unique<ScDPSaveDimension>(*it));
+ m_DimList.push_back(std::make_unique<ScDPSaveDimension>(*it));
}
}
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 13d1fbb3d7d6..162211e59074 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -46,7 +46,6 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/globname.hxx>
-#include <o3tl/make_unique.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -388,7 +387,7 @@ bool ScDrawLayer::ScAddPage( SCTAB nTab )
ScDrawPage* pPage = static_cast<ScDrawPage*>(AllocPage( false ));
InsertPage(pPage, static_cast<sal_uInt16>(nTab));
if (bRecording)
- AddCalcUndo(o3tl::make_unique<SdrUndoNewPage>(*pPage));
+ AddCalcUndo(std::make_unique<SdrUndoNewPage>(*pPage));
ResetTab(nTab, pDoc->GetTableCount()-1);
return true; // inserted
@@ -403,7 +402,7 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab )
if (bRecording)
{
SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
- AddCalcUndo(o3tl::make_unique<SdrUndoDelPage>(*pPage)); // Undo-Action becomes the page owner
+ AddCalcUndo(std::make_unique<SdrUndoDelPage>(*pPage)); // Undo-Action becomes the page owner
RemovePage( static_cast<sal_uInt16>(nTab) ); // just deliver, not deleting
}
else
@@ -464,7 +463,7 @@ void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
}
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pNewObject ) );
+ AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pNewObject ) );
pOldObject = aIter.Next();
}
@@ -554,7 +553,7 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
pNoRotatedAnchor->maEnd = pData->maEnd;
}
- AddCalcUndo( o3tl::make_unique<ScUndoObjData>( pObj, aOldStt, aOldEnd, pData->maStart, pData->maEnd ) );
+ AddCalcUndo( std::make_unique<ScUndoObjData>( pObj, aOldStt, aOldEnd, pData->maStart, pData->maEnd ) );
RecalcPos( pObj, *pData, bNegativePage, bUpdateNoteCaptionPos );
}
}
@@ -837,7 +836,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
if ( pObj->GetLogicRect() != aRect )
{
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
rData.setShapeRect(GetDocument(), lcl_makeSafeRectangle(aRect));
pObj->SetLogicRect(rData.getShapeRect());
}
@@ -869,7 +868,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
if ( pObj->GetPoint( 0 ) != aStartPos )
{
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
rData.setShapeRect(GetDocument(), lcl_UpdateCalcPoly(aCalcPoly, 0, aStartPos));
pObj->SetPoint( aStartPos, 0 );
@@ -885,7 +884,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
if ( pObj->GetPoint( 1 ) != aEndPos )
{
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
rData.setShapeRect(GetDocument(), lcl_UpdateCalcPoly(aCalcPoly, 1, aEndPos));
pObj->SetPoint( aEndPos, 1 );
@@ -907,7 +906,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
if ( pObj->GetPoint( 1 ) != aEndPos )
{
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
rData.setShapeRect(GetDocument(), lcl_UpdateCalcPoly(aCalcPoly, 1, aEndPos));
pObj->SetPoint( aEndPos, 1 );
@@ -925,7 +924,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
if ( pObj->GetPoint( 0 ) != aStartPos )
{
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
rData.setShapeRect(GetDocument(), lcl_UpdateCalcPoly(aCalcPoly, 0, aStartPos));
pObj->SetPoint( aStartPos, 0 );
@@ -1020,7 +1019,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
tools::Rectangle aOld(pObj->GetSnapRect());
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
long nOldWidth = aOld.GetWidth();
long nOldHeight = aOld.GetHeight();
if (pObj->IsPolyObj() && nOldWidth && nOldHeight)
@@ -1048,7 +1047,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegati
if ( pObj->GetRelativePos() != aPos )
{
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
pObj->SetRelativePos( aPos );
}
}
@@ -1398,7 +1397,7 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
if (bRecording)
for (size_t i=1; i<=nDelCount; ++i)
- AddCalcUndo( o3tl::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
+ AddCalcUndo( std::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
for (size_t i=1; i<=nDelCount; ++i)
pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
@@ -1461,7 +1460,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
if (bRecording)
for (size_t i=1; i<=nDelCount; ++i)
- AddCalcUndo( o3tl::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
+ AddCalcUndo( std::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
for (size_t i=1; i<=nDelCount; ++i)
pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
@@ -1705,7 +1704,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
pDestPage->InsertObject( pNewObject );
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pNewObject ) );
+ AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pNewObject ) );
//#i110034# handle chart data references (after InsertObject)
@@ -1801,7 +1800,7 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
Point aRef1( 0, 0 );
Point aRef2( 0, 1 );
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *pObj ) );
+ AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *pObj ) );
pObj->Mirror( aRef1, aRef2 );
}
else
@@ -1812,7 +1811,7 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
tools::Rectangle aObjRect = pObj->GetLogicRect();
Size aMoveSize( -(aObjRect.Left() + aObjRect.Right()), 0 );
if (bRecording)
- AddCalcUndo( o3tl::make_unique<SdrUndoMoveObj>( *pObj, aMoveSize ) );
+ AddCalcUndo( std::make_unique<SdrUndoMoveObj>( *pObj, aMoveSize ) );
pObj->Move( aMoveSize );
}
}
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 4dd4cf713746..34a6950cbf76 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -41,7 +41,6 @@
#include <vector>
#include <memory>
-#include <o3tl/make_unique.hxx>
// Similar as in output.cxx
@@ -662,7 +661,7 @@ void ScDocument::FillInfo(
{
if ( ScStyleSheet* pPreviewStyle = GetPreviewCellStyle( nCol, pRowInfo[nArrRow].nRowNo, nTab ) )
{
- aAltPatterns.push_back( o3tl::make_unique<ScPatternAttr>( *pInfo->pPatternAttr ) );
+ aAltPatterns.push_back( std::make_unique<ScPatternAttr>( *pInfo->pPatternAttr ) );
pModifiedPatt = aAltPatterns.back().get();
pModifiedPatt->SetStyleSheet( pPreviewStyle );
}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 3137cfd53a42..eac866003765 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -54,7 +54,6 @@
#include <tools/cpuid.hxx>
#include <formula/errorcodes.hxx>
#include <svl/intitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <formulagroup.hxx>
#include <listenercontext.hxx>
#include <types.hxx>
@@ -575,7 +574,7 @@ sc::FormulaGroupAreaListener* ScFormulaCellGroup::getAreaListener(
{
// Insert a new one.
it = mpImpl->m_AreaListeners.insert(
- it, std::make_pair(aKey, o3tl::make_unique<sc::FormulaGroupAreaListener>(
+ it, std::make_pair(aKey, std::make_unique<sc::FormulaGroupAreaListener>(
rRange, *(*ppTopCell)->GetDocument(), (*ppTopCell)->aPos, mnLength, bStartFixed, bEndFixed)));
}
@@ -4712,7 +4711,7 @@ bool ScFormulaCell::InterpretFormulaGroupThreading(sc::FormulaLogger::GroupScope
{
context = aContextGetterGuard.GetInterpreterContextForThreadIdx(i);
ScDocument::SetupFromNonThreadedContext(*context, i);
- rThreadPool.pushTask(o3tl::make_unique<Executor>(aTag, i, nThreadCount, pDocument, context, mxGroup->mpTopCell->aPos, mxGroup->mnLength));
+ rThreadPool.pushTask(std::make_unique<Executor>(aTag, i, nThreadCount, pDocument, context, mxGroup->mpTopCell->aPos, mxGroup->mnLength));
}
SAL_INFO("sc.threaded", "Joining threads");
diff --git a/sc/source/core/data/mtvelements.cxx b/sc/source/core/data/mtvelements.cxx
index a7c92fbb61d2..e15416fb7d99 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -13,8 +13,6 @@
#include <column.hxx>
#include <table.hxx>
-#include <o3tl/make_unique.hxx>
-
#include <sstream>
namespace sc {
@@ -110,7 +108,7 @@ struct TableColumnBlockPositionSet::Impl
};
TableColumnBlockPositionSet::TableColumnBlockPositionSet( ScDocument& rDoc, SCTAB nTab ) :
- mpImpl(o3tl::make_unique<Impl>())
+ mpImpl(std::make_unique<Impl>())
{
mpImpl->mpTab = rDoc.FetchTable(nTab);
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index d9850d7b9ed9..f219f7542694 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -21,7 +21,6 @@
#include <utility>
#include <scitems.hxx>
#include <editeng/adjustitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lineitem.hxx>
#include <editeng/brushitem.hxx>
@@ -81,7 +80,7 @@ ScPatternAttr::ScPatternAttr( std::unique_ptr<SfxItemSet>&& pItemSet )
}
ScPatternAttr::ScPatternAttr( SfxItemPool* pItemPool )
- : SfxSetItem ( ATTR_PATTERN, o3tl::make_unique<SfxItemSet>( *pItemPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ) ),
+ : SfxSetItem ( ATTR_PATTERN, std::make_unique<SfxItemSet>( *pItemPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ) ),
pStyle ( nullptr ),
mnKey(0)
{
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 8c9ba9a2388a..7fca2b376c05 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -18,7 +18,6 @@
*/
#include <pivot.hxx>
-#include <o3tl/make_unique.hxx>
#if DEBUG_PIVOT_TABLE
using std::cout;
@@ -126,7 +125,7 @@ void ScPivotParam::SetLabelData(const ScDPLabelDataVector& rVector)
ScDPLabelDataVector::const_iterator it;
for (it = rVector.begin(); it != rVector.end(); ++it)
{
- aNewArray.push_back(o3tl::make_unique<ScDPLabelData>(**it));
+ aNewArray.push_back(std::make_unique<ScDPLabelData>(**it));
}
maLabelArray.swap(aNewArray);
}
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 5a97f266a82e..43436c42dee5 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -47,7 +47,6 @@
#include <userdat.hxx>
#include <detfunc.hxx>
#include <editutil.hxx>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -332,7 +331,7 @@ void ScCaptionCreator::UpdateCaptionPos()
{
// create drawing undo action
if( pDrawLayer && pDrawLayer->IsRecording() )
- pDrawLayer->AddCalcUndo( o3tl::make_unique<SdrUndoGeoObj>( *m_pCaption ) );
+ pDrawLayer->AddCalcUndo( std::make_unique<SdrUndoGeoObj>( *m_pCaption ) );
// calculate new caption rectangle (#i98141# handle LTR<->RTL switch correctly)
tools::Rectangle aCaptRect = m_pCaption->GetLogicRect();
long nDiffX = (rOldTailPos.X() >= 0) ? (aCaptRect.Left() - rOldTailPos.X()) : (rOldTailPos.X() - aCaptRect.Right());
@@ -352,7 +351,7 @@ void ScCaptionCreator::UpdateCaptionPos()
{
// create drawing undo action
if( pDrawLayer && pDrawLayer->IsRecording() )
- pDrawLayer->AddCalcUndo( o3tl::make_unique<ScUndoObjData>( m_pCaption.get(), pCaptData->maStart, pCaptData->maEnd, maPos, pCaptData->maEnd ) );
+ pDrawLayer->AddCalcUndo( std::make_unique<ScUndoObjData>( m_pCaption.get(), pCaptData->maStart, pCaptData->maEnd, maPos, pCaptData->maEnd ) );
// set new position
pCaptData->maStart = maPos;
}
@@ -466,7 +465,7 @@ void removeFromDrawPageAndFree( const std::shared_ptr< SdrCaptionObj >& pCaption
// create drawing undo action (before removing the object to have valid draw page in undo action)
bool bRecording = (pDrawLayer && pDrawLayer->IsRecording());
if (bRecording)
- pDrawLayer->AddCalcUndo( o3tl::make_unique<ScUndoDelSdrCaptionObj>( pCaption ));
+ pDrawLayer->AddCalcUndo( std::make_unique<ScUndoDelSdrCaptionObj>( pCaption ));
// remove the object from the drawing page, delete if undo is disabled
pDrawPage->RemoveObject( pCaption->GetOrdNum() );
}
@@ -765,7 +764,7 @@ void ScPostIt::CreateCaption( const ScAddress& rPos, const std::shared_ptr< SdrC
{
// copy edit text object (object must be inserted into page already)
if( OutlinerParaObject* pOPO = pCaption->GetOutlinerParaObject() )
- maNoteData.m_pCaption->SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>( *pOPO ) );
+ maNoteData.m_pCaption->SetOutlinerParaObject( std::make_unique<OutlinerParaObject>( *pOPO ) );
// copy formatting items (after text has been copied to apply font formatting)
maNoteData.m_pCaption->SetMergedItemSetAndBroadcast( pCaption->GetMergedItemSet() );
// move textbox position relative to new cell, copy textbox size
@@ -785,7 +784,7 @@ void ScPostIt::CreateCaption( const ScAddress& rPos, const std::shared_ptr< SdrC
// create undo action
if( ScDrawLayer* pDrawLayer = mrDoc.GetDrawLayer() )
if( pDrawLayer->IsRecording() )
- pDrawLayer->AddCalcUndo( o3tl::make_unique<ScUndoNewSdrCaptionObj>( maNoteData.m_pCaption ) );
+ pDrawLayer->AddCalcUndo( std::make_unique<ScUndoNewSdrCaptionObj>( maNoteData.m_pCaption ) );
}
}
@@ -843,7 +842,7 @@ std::shared_ptr< SdrCaptionObj > ScNoteUtil::CreateTempCaption(
if( pNoteCaption && rUserText.isEmpty() )
{
if( OutlinerParaObject* pOPO = pNoteCaption->GetOutlinerParaObject() )
- pCaption->SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>( *pOPO ) );
+ pCaption->SetOutlinerParaObject( std::make_unique<OutlinerParaObject>( *pOPO ) );
// set formatting (must be done after setting text) and resize the box to fit the text
pCaption->SetMergedItemSetAndBroadcast( pNoteCaption->GetMergedItemSet() );
tools::Rectangle aCaptRect( pCaption->GetLogicRect().TopLeft(), pNoteCaption->GetLogicRect().GetSize() );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 3e0e2eb085a5..0b5e07497a27 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -73,7 +73,6 @@
#include <unordered_set>
#include <vector>
#include <mdds/flat_segment_tree.hpp>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -687,7 +686,7 @@ void fillSortedColumnArray(
// In the sorted column container, element positions and row
// positions must match, else formula cells may mis-behave during
// grouping.
- aSortedCols.push_back(o3tl::make_unique<SortedColumn>(nRow1));
+ aSortedCols.push_back(std::make_unique<SortedColumn>(nRow1));
}
for (size_t i = 0; i < pRows->size(); ++i)
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 3e4f6c33920a..049cc8ad3630 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -35,7 +35,6 @@
#include <unotools/collatorwrapper.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <tools/tenccvt.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
#include <globstr.hrc>
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 9455bb778383..98aa31fe804d 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -24,7 +24,6 @@
#include <osl/module.hxx>
#include <osl/file.hxx>
#include <unotools/transliterationwrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <memory>
#include <callform.hxx>
@@ -379,7 +378,7 @@ LegacyFuncCollection::LegacyFuncCollection(const LegacyFuncCollection& r)
{
for (auto const& it : r.m_Data)
{
- m_Data.insert(std::make_pair(it.first, o3tl::make_unique<LegacyFuncData>(*it.second)));
+ m_Data.insert(std::make_pair(it.first, std::make_unique<LegacyFuncData>(*it.second)));
}
}
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 76fcc2645839..bdd30ad3dfe2 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -31,7 +31,6 @@
#include <formulacell.hxx>
#include <docoptio.hxx>
-#include <o3tl/make_unique.hxx>
#include <formula/errorcodes.hxx>
#include <memory>
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index d92a891481b3..1abd84b3b192 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -21,7 +21,6 @@
#include <document.hxx>
#include <rechead.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <memory>
@@ -377,7 +376,7 @@ void ScChartPositioner::CreatePositionMap()
{
if ( pCol->find( nInsRow ) == pCol->end() )
{
- pCol->emplace( nInsRow, o3tl::make_unique<ScAddress>( nCol, nRow, nTab ) );
+ pCol->emplace( nInsRow, std::make_unique<ScAddress>( nCol, nRow, nTab ) );
}
}
}
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index d2795282d910..7b9649125e8d 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -38,7 +38,6 @@
#include <brdcst.hxx>
#include <comphelper/stl_types.hxx>
-#include <o3tl/make_unique.hxx>
#include <memory>
#include <utility>
@@ -1283,7 +1282,7 @@ ScDBCollection::AnonDBs::AnonDBs(AnonDBs const& r)
m_DBs.reserve(r.m_DBs.size());
for (auto const& it : r.m_DBs)
{
- m_DBs.push_back(o3tl::make_unique<ScDBData>(*it));
+ m_DBs.push_back(std::make_unique<ScDBData>(*it));
}
}
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 146dac680dd8..a370aa473236 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -48,7 +48,6 @@
#include <svx/sxcecitm.hxx>
#include <svl/whiter.hxx>
#include <editeng/writingmodeitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -462,7 +461,7 @@ void ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
pBox->SetLayer( SC_LAYER_INTERN );
pPage->InsertObject( pBox );
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pBox ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pBox ) );
ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, true );
pData->maStart.Set( nRefStartCol, nRefStartRow, nTab);
@@ -506,7 +505,7 @@ void ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
pArrow->SetLayer( SC_LAYER_INTERN );
pPage->InsertObject( pArrow );
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pArrow ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pArrow ) );
ScDrawObjData* pData = ScDrawLayer::GetObjData(pArrow, true);
if (bFromOtherTab)
@@ -539,7 +538,7 @@ void ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
pBox->SetLayer( SC_LAYER_INTERN );
pPage->InsertObject( pBox );
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pBox ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pBox ) );
ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, true );
pData->maStart.Set( nStartCol, nStartRow, nTab);
@@ -576,7 +575,7 @@ void ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
pArrow->SetLayer( SC_LAYER_INTERN );
pPage->InsertObject( pArrow );
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pArrow ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pArrow ) );
ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, true );
pData->maStart.Set( nStartCol, nStartRow, nTab);
@@ -646,7 +645,7 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData
pCircle->SetLayer( SC_LAYER_INTERN );
pPage->InsertObject( pCircle );
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoInsertObj>( *pCircle ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoInsertObj>( *pCircle ) );
ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, true );
pData->maStart.Set( nCol, nRow, nTab);
@@ -691,7 +690,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt )
if (bRecording)
{
for (size_t i=1; i<=nDelCount; ++i)
- pModel->AddCalcUndo(o3tl::make_unique<SdrUndoDelObj>(*ppObj[nDelCount-i]));
+ pModel->AddCalcUndo(std::make_unique<SdrUndoDelObj>(*ppObj[nDelCount-i]));
}
for (size_t i=1; i<=nDelCount; ++i)
@@ -762,7 +761,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
}
for (size_t i=1; i<=nDelCount; ++i)
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
for (size_t i=1; i<=nDelCount; ++i)
pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
@@ -1274,7 +1273,7 @@ bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
}
for (size_t i=1; i<=nDelCount; ++i)
- pModel->AddCalcUndo( o3tl::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
+ pModel->AddCalcUndo( std::make_unique<SdrUndoRemoveObj>( *ppObj[nDelCount-i] ) );
for (size_t i=1; i<=nDelCount; ++i)
pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index eef51c328496..79d1cf12844d 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -27,7 +27,6 @@
#if HAVE_FEATURE_OPENCL
#include <opencl/platforminfo.hxx>
#endif
-#include <o3tl/make_unique.hxx>
#include <rtl/bootstrap.hxx>
#include <sal/log.hxx>
@@ -118,7 +117,7 @@ void FormulaGroupContext::ensureStrArray( ColArray& rColArray, size_t nArrayLen
return;
m_StrArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::StrArrayType>(nArrayLen, nullptr));
+ std::make_unique<sc::FormulaGroupContext::StrArrayType>(nArrayLen, nullptr));
rColArray.mpStrArray = m_StrArrays.back().get();
}
@@ -131,7 +130,7 @@ void FormulaGroupContext::ensureNumArray( ColArray& rColArray, size_t nArrayLen
rtl::math::setNan(&fNan);
m_NumArrays.push_back(
- o3tl::make_unique<sc::FormulaGroupContext::NumArrayType>(nArrayLen, fNan));
+ std::make_unique<sc::FormulaGroupContext::NumArrayType>(nArrayLen, fNan));
rColArray.mpNumArray = m_NumArrays.back().get();
}
diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx
index 0f2c82041d7b..d877c1e63c5f 100644
--- a/sc/source/core/tool/formulalogger.cxx
+++ b/sc/source/core/tool/formulalogger.cxx
@@ -14,7 +14,6 @@
#include <interpre.hxx>
#include <osl/file.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <tools/urlobj.hxx>
@@ -39,7 +38,7 @@ std::unique_ptr<osl::File> initFile()
aURL.SetSmartURL(aPath);
aPath = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
- return o3tl::make_unique<osl::File>(aPath);
+ return std::make_unique<osl::File>(aPath);
}
ScRefFlags getRefFlags( const ScAddress& rCellPos, const ScAddress& rRefPos )
@@ -125,7 +124,7 @@ struct FormulaLogger::GroupScope::Impl
FormulaLogger::GroupScope::GroupScope(
FormulaLogger& rLogger, const OUString& rPrefix, const ScDocument& rDoc,
const ScFormulaCell& rCell, bool bOutputEnabled ) :
- mpImpl(o3tl::make_unique<Impl>(rLogger, rPrefix, rDoc, rCell, bOutputEnabled)) {}
+ mpImpl(std::make_unique<Impl>(rLogger, rPrefix, rDoc, rCell, bOutputEnabled)) {}
FormulaLogger::GroupScope::GroupScope( GroupScope&& r ) : mpImpl(std::move(r.mpImpl)) {}
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 3beff5d31e76..fab8e1317082 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -24,7 +24,6 @@
#include <svl/sharedstringpool.hxx>
#include <svl/zforlist.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
#include <algorithm>
@@ -74,7 +73,7 @@ ScQueryParamBase::ScQueryParamBase() :
mbRangeLookup(false)
{
for (size_t i = 0; i < MAXQUERY; ++i)
- m_Entries.push_back(o3tl::make_unique<ScQueryEntry>());
+ m_Entries.push_back(std::make_unique<ScQueryEntry>());
}
ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase& r) :
@@ -83,7 +82,7 @@ ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase& r) :
{
for (auto const& it : r.m_Entries)
{
- m_Entries.push_back(o3tl::make_unique<ScQueryEntry>(*it));
+ m_Entries.push_back(std::make_unique<ScQueryEntry>(*it));
}
}
@@ -102,7 +101,7 @@ ScQueryParamBase& ScQueryParamBase::operator=(const ScQueryParamBase& r)
m_Entries.clear();
for (auto const& it : r.m_Entries)
{
- m_Entries.push_back(o3tl::make_unique<ScQueryEntry>(*it));
+ m_Entries.push_back(std::make_unique<ScQueryEntry>(*it));
}
}
return *this;
@@ -143,7 +142,7 @@ ScQueryEntry& ScQueryParamBase::AppendEntry()
return **itr;
// Add a new entry to the end.
- m_Entries.push_back(o3tl::make_unique<ScQueryEntry>());
+ m_Entries.push_back(std::make_unique<ScQueryEntry>());
return *m_Entries.back();
}
@@ -194,7 +193,7 @@ bool ScQueryParamBase::RemoveEntryByField(SCCOLROW nField)
if (m_Entries.size() < MAXQUERY)
// Make sure that we have at least MAXQUERY number of entries at
// all times.
- m_Entries.push_back(o3tl::make_unique<ScQueryEntry>());
+ m_Entries.push_back(std::make_unique<ScQueryEntry>());
bRet = true;
}
@@ -221,7 +220,7 @@ void ScQueryParamBase::Resize(size_t nNew)
{
size_t n = nNew - m_Entries.size();
for (size_t i = 0; i < n; ++i)
- m_Entries.push_back(o3tl::make_unique<ScQueryEntry>());
+ m_Entries.push_back(std::make_unique<ScQueryEntry>());
}
}
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 83196eb736d9..419e8b331b6f 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -24,7 +24,6 @@
#include <unotools/charclass.hxx>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <token.hxx>
#include <tokenarray.hxx>
@@ -657,7 +656,7 @@ ScRangeName::ScRangeName(const ScRangeName& r)
{
for (auto const& it : r.m_Data)
{
- m_Data.insert(std::make_pair(it.first, o3tl::make_unique<ScRangeData>(*it.second)));
+ m_Data.insert(std::make_pair(it.first, std::make_unique<ScRangeData>(*it.second)));
}
// std::map was cloned, so each collection needs its own index to data.
maIndexToData.resize( r.maIndexToData.size(), nullptr);
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index b984ed0f8f1e..30ac7cc4b71f 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -25,7 +25,6 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx>
#include <unotools/transliterationwrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <algorithm>
@@ -237,9 +236,9 @@ ScUserList::ScUserList()
OUString aDayLong = aDayLongBuf.makeStringAndClear();
if ( !HasEntry( aDayShort ) )
- maData.push_back( o3tl::make_unique<ScUserListData>( aDayShort ));
+ maData.push_back( std::make_unique<ScUserListData>( aDayShort ));
if ( !HasEntry( aDayLong ) )
- maData.push_back( o3tl::make_unique<ScUserListData>( aDayLong ));
+ maData.push_back( std::make_unique<ScUserListData>( aDayLong ));
}
xCal = xCalendars[j].Months;
@@ -262,9 +261,9 @@ ScUserList::ScUserList()
OUString aMonthLong = aMonthLongBuf.makeStringAndClear();
if ( !HasEntry( aMonthShort ) )
- maData.push_back( o3tl::make_unique<ScUserListData>( aMonthShort ));
+ maData.push_back( std::make_unique<ScUserListData>( aMonthShort ));
if ( !HasEntry( aMonthLong ) )
- maData.push_back( o3tl::make_unique<ScUserListData>( aMonthLong ));
+ maData.push_back( std::make_unique<ScUserListData>( aMonthLong ));
}
}
}
@@ -272,7 +271,7 @@ ScUserList::ScUserList()
ScUserList::ScUserList(const ScUserList& rOther)
{
for (const std::unique_ptr<ScUserListData>& rData : rOther.maData)
- maData.push_back(o3tl::make_unique<ScUserListData>(*rData));
+ maData.push_back(std::make_unique<ScUserListData>(*rData));
}
const ScUserListData* ScUserList::GetData(const OUString& rSubStr) const
@@ -310,7 +309,7 @@ ScUserList& ScUserList::operator=( const ScUserList& rOther )
{
maData.clear();
for (const std::unique_ptr<ScUserListData>& rData : rOther.maData)
- maData.push_back(o3tl::make_unique<ScUserListData>(*rData));
+ maData.push_back(std::make_unique<ScUserListData>(*rData));
return *this;
}
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 015a06a1eb39..e4d86de828e7 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -58,7 +58,6 @@
#include "xltoolbar.hxx"
#include <oox/ole/vbaproject.hxx>
#include <oox/ole/olestorage.hxx>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
using namespace ::comphelper;
@@ -226,7 +225,7 @@ void ImportExcel8::Scenman()
void ImportExcel8::Scenario()
{
- maScenList.aEntries.push_back( o3tl::make_unique<ExcScenario>( aIn, *pExcRoot ) );
+ maScenList.aEntries.push_back( std::make_unique<ExcScenario>( aIn, *pExcRoot ) );
}
void ImportExcel8::Labelsst()
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 05acfdcfdad0..bb25f6409b43 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -24,7 +24,6 @@
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <svl/itemset.hxx>
#include <global.hxx>
@@ -85,7 +84,7 @@ void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeig
{
OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array too small!" );
if( nIndex < nSize )
- pData[ nIndex ].Height( o3tl::make_unique<SvxFontHeightItem>( static_cast<sal_uLong>(nHeight) * 20, 100, ATTR_FONT_HEIGHT ) );
+ pData[ nIndex ].Height( std::make_unique<SvxFontHeightItem>( static_cast<sal_uLong>(nHeight) * 20, 100, ATTR_FONT_HEIGHT ) );
}
void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType )
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index 465025a349cd..9fbd5489487f 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -19,7 +19,6 @@
#include <formel.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
ScRangeListTabs::ScRangeListTabs()
@@ -56,7 +55,7 @@ void ScRangeListTabs::Append( const ScAddress& aSRD, SCTAB nTab )
{
// No entry for this table yet. Insert a new one.
std::pair<TabRangeType::iterator, bool> r =
- m_TabRanges.insert(std::make_pair(nTab, o3tl::make_unique<RangeListType>()));
+ m_TabRanges.insert(std::make_pair(nTab, std::make_unique<RangeListType>()));
if (!r.second)
// Insertion failed.
@@ -114,7 +113,7 @@ void ScRangeListTabs::Append( const ScRange& aCRD, SCTAB nTab )
{
// No entry for this table yet. Insert a new one.
std::pair<TabRangeType::iterator, bool> r =
- m_TabRanges.insert(std::make_pair(nTab, o3tl::make_unique<RangeListType>()));
+ m_TabRanges.insert(std::make_pair(nTab, std::make_unique<RangeListType>()));
if (!r.second)
// Insertion failed.
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 98d600eacc71..4ebb82486889 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -62,7 +62,6 @@
#include <excform.hxx>
#include <documentimport.hxx>
-#include <o3tl/make_unique.hxx>
#if defined(_WIN32)
#include <math.h>
@@ -1293,7 +1292,7 @@ void ImportExcel::PostDocLoad()
GetExtDocOptions().SetChanged( true );
// root data owns the extended document options -> create a new object
- GetDoc().SetExtDocOptions( o3tl::make_unique<ScExtDocOptions>( GetExtDocOptions() ) );
+ GetDoc().SetExtDocOptions( std::make_unique<ScExtDocOptions>( GetExtDocOptions() ) );
const SCTAB nLast = pD->GetTableCount();
const ScRange* p;
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 83e5279e7a80..83c1d2ef2244 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -53,8 +53,6 @@
#include <com/sun/star/chart2/StackingDirection.hpp>
#include <com/sun/star/chart2/TickmarkStyle.hpp>
-#include <o3tl/make_unique.hxx>
-
#include <tools/gen.hxx>
#include <vcl/outdev.hxx>
#include <filter/msfilter/escherex.hxx>
@@ -2465,7 +2463,7 @@ void XclExpChTypeGroup::ConvertSeries(
if (bConnectBars && (maTypeInfo.meTypeCateg == EXC_CHTYPECATEG_BAR))
{
sal_uInt16 nKey = EXC_CHCHARTLINE_CONNECT;
- m_ChartLines.insert(std::make_pair(nKey, o3tl::make_unique<XclExpChLineFormat>(GetChRoot())));
+ m_ChartLines.insert(std::make_pair(nKey, std::make_unique<XclExpChLineFormat>(GetChRoot())));
}
}
else
@@ -2560,7 +2558,7 @@ void XclExpChTypeGroup::CreateAllStockSeries(
XclExpChLineFormatRef xLineFmt( new XclExpChLineFormat( GetChRoot() ) );
xLineFmt->Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
sal_uInt16 nKey = EXC_CHCHARTLINE_HILO;
- m_ChartLines.insert(std::make_pair(nKey, o3tl::make_unique<XclExpChLineFormat>(GetChRoot())));
+ m_ChartLines.insert(std::make_pair(nKey, std::make_unique<XclExpChLineFormat>(GetChRoot())));
}
// dropbars
if( bHasOpen && bHasClose )
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 22bb03c83c0b..01dcdbbfd347 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -35,7 +35,6 @@
#include <svx/svdoole2.hxx>
#include <svx/svdocapt.hxx>
#include <editeng/outlobj.hxx>
-#include <o3tl/make_unique.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <svtools/embedhlp.hxx>
@@ -1190,7 +1189,7 @@ XclExpNote::XclExpNote(const XclExpRoot& rRoot, const ScAddress& rScPos,
{
lcl_GetFromTo( rRoot, pCaption->GetLogicRect(), maScPos.Tab(), maCommentFrom, maCommentTo );
if( const OutlinerParaObject* pOPO = pCaption->GetOutlinerParaObject() )
- mnObjId = rRoot.GetObjectManager().AddObj( o3tl::make_unique<XclObjComment>( rRoot.GetObjectManager(), pCaption->GetLogicRect(), pOPO->GetTextObject(), pCaption, mbVisible, maScPos, maCommentFrom, maCommentTo ) );
+ mnObjId = rRoot.GetObjectManager().AddObj( std::make_unique<XclObjComment>( rRoot.GetObjectManager(), pCaption->GetLogicRect(), pOPO->GetTextObject(), pCaption, mbVisible, maScPos, maCommentFrom, maCommentTo ) );
SfxItemSet aItemSet = pCaption->GetMergedItemSet();
meTVA = pCaption->GetTextVerticalAdjust();
diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx
index b15e71c36f77..bd8a081a82ae 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -26,8 +26,6 @@
#include <com/sun/star/sheet/DataPilotFieldLayoutMode.hpp>
#include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
-#include <o3tl/make_unique.hxx>
-
#include <vector>
using namespace oox;
@@ -477,7 +475,7 @@ void XclExpXmlPivotTableManager::Initialize()
{
// Insert a new instance for this sheet index.
std::pair<TablesType::iterator, bool> r =
- m_Tables.insert(std::make_pair(nTab, o3tl::make_unique<XclExpXmlPivotTables>(GetRoot(), maCaches)));
+ m_Tables.insert(std::make_pair(nTab, std::make_unique<XclExpXmlPivotTables>(GetRoot(), maCaches)));
it = r.first;
}
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 68a26c5dca4a..805e5392ea05 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -50,7 +50,6 @@
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/relationship.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
using namespace oox;
@@ -3066,7 +3065,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
pNumFormat.reset(new XclExpNumFmt( nScNumFmt, nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, xFormatter.get(), mpKeywordTable.get() )));
}
- maDxf.push_back(o3tl::make_unique<XclExpDxf>( rRoot, std::move(pAlign), std::move(pBorder),
+ maDxf.push_back(std::make_unique<XclExpDxf>( rRoot, std::move(pAlign), std::move(pBorder),
std::move(pFont), std::move(pNumFormat), std::move(pCellProt), std::move(pColor) ));
++nIndex;
}
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 513e78064a18..1c5334f04da1 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -76,7 +76,6 @@
#include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
#include <comphelper/processfactory.hxx>
#include <o3tl/numeric.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/objsh.hxx>
#include <svx/svdpage.hxx>
#include <svx/unoapi.hxx>
@@ -1889,7 +1888,7 @@ void XclImpChSeries::AddChildSeries( const XclImpChSeries& rSeries )
maTrendLines.insert( maTrendLines.end(), rSeries.maTrendLines.begin(), rSeries.maTrendLines.end() );
for (auto const& it : rSeries.m_ErrorBars)
{
- m_ErrorBars.insert(std::make_pair(it.first, o3tl::make_unique<XclImpChSerErrorBar>(*it.second)));
+ m_ErrorBars.insert(std::make_pair(it.first, std::make_unique<XclImpChSerErrorBar>(*it.second)));
}
}
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index f5d4780ef3ac..54150dc9a7bc 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -57,7 +57,6 @@
#include <memory>
#include <utility>
-#include <o3tl/make_unique.hxx>
#include <oox/helper/helper.hxx>
#include <sal/log.hxx>
@@ -897,7 +896,7 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
XclTokenArrayHelper::ConvertStringToList(*xTokArr1, rDoc.GetSharedStringPool(), '\n');
maDVItems.push_back(
- o3tl::make_unique<DVItem>(aScRanges, ScValidationData(eValMode, eCondMode, xTokArr1.get(), xTokArr2.get(), &rDoc, rScRange.aStart)));
+ std::make_unique<DVItem>(aScRanges, ScValidationData(eValMode, eCondMode, xTokArr1.get(), xTokArr2.get(), &rDoc, rScRange.aStart)));
DVItem& rItem = *maDVItems.back().get();
rItem.maValidData.SetIgnoreBlank( ::get_flag( nFlags, EXC_DV_IGNOREBLANK ) );
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 45894e26a7f4..694b1c2b3120 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -36,7 +36,6 @@
#include <excform.hxx>
#include <scmatrix.hxx>
#include <documentimport.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
// Excel->Calc cell address/range conversion ==================================
@@ -846,7 +845,7 @@ XclImpCachedMatrix::XclImpCachedMatrix( XclImpStream& rStrm ) :
for( SCSIZE nScRow = 0; nScRow < mnScRows; ++nScRow )
for( SCSIZE nScCol = 0; nScCol < mnScCols; ++nScCol )
- maValueList.push_back( o3tl::make_unique<XclImpCachedValue>( rStrm ) );
+ maValueList.push_back( std::make_unique<XclImpCachedValue>( rStrm ) );
}
XclImpCachedMatrix::~XclImpCachedMatrix()
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index d1b353f39795..5c2337310ab5 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -29,7 +29,6 @@
#include <externalrefmgr.hxx>
#include <scmatrix.hxx>
#include <svl/sharedstringpool.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <vector>
@@ -638,7 +637,7 @@ XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) :
if( maXclUrl.equalsIgnoreAsciiCase( "\010EUROTOOL.XLA" ) )
{
meType = XclSupbookType::Eurotool;
- maSupbTabList.push_back( o3tl::make_unique<XclImpSupbookTab>( maXclUrl ) );
+ maSupbTabList.push_back( std::make_unique<XclImpSupbookTab>( maXclUrl ) );
}
else if( nSBTabCnt )
{
@@ -657,14 +656,14 @@ XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) :
for( sal_uInt16 nSBTab = 0; nSBTab < nSBTabCnt; ++nSBTab )
{
OUString aTabName( rStrm.ReadUniString() );
- maSupbTabList.push_back( o3tl::make_unique<XclImpSupbookTab>( aTabName ) );
+ maSupbTabList.push_back( std::make_unique<XclImpSupbookTab>( aTabName ) );
}
}
else
{
meType = XclSupbookType::Special;
// create dummy list entry
- maSupbTabList.push_back( o3tl::make_unique<XclImpSupbookTab>( maXclUrl ) );
+ maSupbTabList.push_back( std::make_unique<XclImpSupbookTab>( maXclUrl ) );
}
}
@@ -691,7 +690,7 @@ void XclImpSupbook::ReadCrn( XclImpStream& rStrm )
void XclImpSupbook::ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv )
{
- maExtNameList.push_back( o3tl::make_unique<XclImpExtName>( *this, rStrm, meType, pFormulaConv ) );
+ maExtNameList.push_back( std::make_unique<XclImpExtName>( *this, rStrm, meType, pFormulaConv ) );
}
const XclImpExtName* XclImpSupbook::GetExternName( sal_uInt16 nXclIndex ) const
@@ -782,7 +781,7 @@ void XclImpLinkManagerImpl::ReadExternsheet( XclImpStream& rStrm )
void XclImpLinkManagerImpl::ReadSupbook( XclImpStream& rStrm )
{
- maSupbookList.push_back( o3tl::make_unique<XclImpSupbook>( rStrm ) );
+ maSupbookList.push_back( std::make_unique<XclImpSupbook>( rStrm ) );
}
void XclImpLinkManagerImpl::ReadXct( XclImpStream& rStrm )
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 0e53b619df91..6e20ab6dc425 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -25,7 +25,6 @@
#include <excimp8.hxx>
#include <scextopt.hxx>
#include <document.hxx>
-#include <o3tl/make_unique.hxx>
// *** Implementation ***
@@ -285,7 +284,7 @@ void XclImpNameManager::ReadName( XclImpStream& rStrm )
{
sal_uLong nCount = maNameList.size();
if( nCount < 0xFFFF )
- maNameList.push_back( o3tl::make_unique<XclImpName>( rStrm, static_cast< sal_uInt16 >( nCount + 1 ) ) );
+ maNameList.push_back( std::make_unique<XclImpName>( rStrm, static_cast< sal_uInt16 >( nCount + 1 ) ) );
}
const XclImpName* XclImpNameManager::FindName( const OUString& rXclName, SCTAB nScTab ) const
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index eec13096fe51..40eea2516b45 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -65,7 +65,6 @@
#include <root.hxx>
#include <colrowst.hxx>
-#include <o3tl/make_unique.hxx>
#include <vector>
@@ -1717,7 +1716,7 @@ void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex )
OSL_ENSURE( maIndexList.empty(), "XclImpXFRangeColumn::SetDefaultXF - Setting Default Column XF is not empty" );
// insert a complete row range with one insert.
- maIndexList.push_back( o3tl::make_unique<XclImpXFRange>( 0, MAXROW, rXFIndex ) );
+ maIndexList.push_back( std::make_unique<XclImpXFRange>( 0, MAXROW, rXFIndex ) );
}
void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex )
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 3c9f7219f8c7..1b9919d7f097 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -22,7 +22,6 @@
#include <scresid.hxx>
#include <progress.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <tools/stream.hxx>
#include <climits>
@@ -144,7 +143,7 @@ sal_Int32 ScfProgressBar::AddSegment( std::size_t nSize )
if( nSize == 0 )
return SCF_INV_SEGMENT;
- maSegments.push_back( o3tl::make_unique<ScfProgressSegment>( nSize ) );
+ maSegments.push_back( std::make_unique<ScfProgressSegment>( nSize ) );
mnTotalSize += nSize;
return static_cast< sal_Int32 >( maSegments.size() - 1 );
}
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 99ec1308bf04..00412301018e 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -26,7 +26,6 @@
#include <editeng/sizeitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/boxitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/svapp.hxx>
#include <htmlimp.hxx>
@@ -57,7 +56,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUStrin
std::unique_ptr<ScEEAbsImport> ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange )
{
- return o3tl::make_unique<ScHTMLImport>( pDocP, rBaseURL, rRange, true/*bCalcWidthHeight*/ );
+ return std::make_unique<ScHTMLImport>( pDocP, rBaseURL, rRange, true/*bCalcWidthHeight*/ );
}
ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) :
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 5749949006d4..bd8f9bfb4888 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -54,7 +54,6 @@
#include <document.hxx>
#include <rangelst.hxx>
-#include <o3tl/make_unique.hxx>
#include <orcus/css_parser.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
@@ -81,7 +80,7 @@ void ScHTMLStyles::add(const char* pElemName, size_t nElemName, const char* pCla
{
// new element
std::pair<ElemsType::iterator, bool> r =
- m_ElemProps.insert(std::make_pair(aElem, o3tl::make_unique<NamePropsType>()));
+ m_ElemProps.insert(std::make_pair(aElem, std::make_unique<NamePropsType>()));
if (!r.second)
// insertion failed.
return;
@@ -165,7 +164,7 @@ void ScHTMLStyles::insertProp(
{
// new element
std::pair<NamePropsType::iterator, bool> r =
- rStore.insert(std::make_pair(aName, o3tl::make_unique<PropsType>()));
+ rStore.insert(std::make_pair(aName, std::make_unique<PropsType>()));
if (!r.second)
// insertion failed.
return;
@@ -1019,7 +1018,7 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
{ // Table in Table
sal_uInt16 nTmpColOffset = nColOffset; // Will be changed in Colonize()
Colonize(mxActEntry.get());
- aTableStack.push( o3tl::make_unique<ScHTMLTableStackEntry>(
+ aTableStack.push( std::make_unique<ScHTMLTableStackEntry>(
mxActEntry, xLockedList, pLocalColOffset, nFirstTableCell,
nRowCnt, nColCntStart, nMaxCol, nTable,
nTableWidth, nColOffset, nColOffsetStart,
@@ -1075,7 +1074,7 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
CloseEntry( pInfo );
NextRow( pInfo );
}
- aTableStack.push( o3tl::make_unique<ScHTMLTableStackEntry>(
+ aTableStack.push( std::make_unique<ScHTMLTableStackEntry>(
mxActEntry, xLockedList, pLocalColOffset, nFirstTableCell,
nRowCnt, nColCntStart, nMaxCol, nTable,
nTableWidth, nColOffset, nColOffsetStart,
@@ -1270,7 +1269,7 @@ void ScHTMLLayoutParser::TableOff( const HtmlImportInfo* pInfo )
void ScHTMLLayoutParser::Image( HtmlImportInfo* pInfo )
{
- mxActEntry->maImageList.push_back(o3tl::make_unique<ScHTMLImage>());
+ mxActEntry->maImageList.push_back(std::make_unique<ScHTMLImage>());
ScHTMLImage* pImage = mxActEntry->maImageList.back().get();
const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions();
for (const auto & rOption : rOptions)
@@ -2277,7 +2276,7 @@ bool ScHTMLTable::IsSpaceCharInfo( const HtmlImportInfo& rInfo )
ScHTMLTable::ScHTMLEntryPtr ScHTMLTable::CreateEntry() const
{
- return o3tl::make_unique<ScHTMLEntry>( GetCurrItemSet() );
+ return std::make_unique<ScHTMLEntry>( GetCurrItemSet() );
}
void ScHTMLTable::CreateNewEntry( const HtmlImportInfo& rInfo )
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index a4c779087c75..d0840dddf6a4 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -22,7 +22,6 @@
#include <workbookfragment.hxx>
#include <rangeutl.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
using ::oox::core::ContextHandlerRef;
@@ -117,7 +116,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl
{
ScDocument* pDoc = &getScDocument();
mpCurrentRule.reset(new IconSetRule(*this));
- maEntries.push_back(o3tl::make_unique<ScIconSetFormat>(pDoc));
+ maEntries.push_back(std::make_unique<ScIconSetFormat>(pDoc));
return new IconSetContext(*this, mpCurrentRule.get());
}
else
@@ -169,7 +168,7 @@ void ExtConditionalFormattingContext::onEndElement()
}
std::vector< std::unique_ptr<ExtCfCondFormat> >& rExtFormats = getCondFormats().importExtCondFormat();
- rExtFormats.push_back(o3tl::make_unique<ExtCfCondFormat>(aRange, maEntries));
+ rExtFormats.push_back(std::make_unique<ExtCfCondFormat>(aRange, maEntries));
}
break;
default:
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index ab7aaecc87bd..b7c537b21f0b 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -21,7 +21,6 @@
#include <oox/token/tokens.hxx>
#include <oox/helper/progressbar.hxx>
#include <svl/sharedstringpool.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star::uno;
@@ -80,7 +79,7 @@ public:
{
// Create an entry for this column.
std::pair<ColCacheType::iterator,bool> r =
- maCache.emplace(rPos.Col(), o3tl::make_unique<Item>());
+ maCache.emplace(rPos.Col(), std::make_unique<Item>());
if (!r.second)
// Insertion failed.
return;
@@ -355,7 +354,7 @@ void FormulaBuffer::finalizeImport()
ISegmentProgressBarRef xFormulaBar = getProgressBar().createSegment( getProgressBar().getFreeLength() );
ScDocumentImport& rDoc = getDocImport();
- rDoc.getDoc().SetAutoNameCache(o3tl::make_unique<ScAutoNameCache>(&rDoc.getDoc()));
+ rDoc.getDoc().SetAutoNameCache(std::make_unique<ScAutoNameCache>(&rDoc.getDoc()));
ScExternalRefManager::ApiGuard aExtRefGuard(&rDoc.getDoc());
SCTAB nTabCount = rDoc.getDoc().GetTableCount();
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 7ef19f7aef47..59cfa61bbd07 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -63,7 +63,6 @@
#include <oox/core/fastparser.hxx>
#include <comphelper/threadpool.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <memory>
@@ -322,7 +321,7 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVect
pProgress->setCustomRowProgress(
aProgressUpdater.wrapProgress(
pProgress->getRowProgress() ) );
- rSharedPool.pushTask( o3tl::make_unique<WorkerThread>( pTag, rWorkbookHandler, rxFragment,
+ rSharedPool.pushTask( std::make_unique<WorkerThread>( pTag, rWorkbookHandler, rxFragment,
/* ref */ nSheetsLeft ) );
nSheetsLeft++;
}
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 58208643b2f8..833fb278e397 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -38,7 +38,6 @@
#include <editeng/justifyitem.hxx>
#include <svl/sharedstringpool.hxx>
-#include <o3tl/make_unique.hxx>
#include <svl/zforlist.hxx>
#include <svl/intitem.hxx>
#include <com/sun/star/task/XStatusIndicator.hpp>
@@ -288,7 +287,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
// The calc document initializes with one sheet already present.
assert(maDoc.getSheetCount() == 1);
maDoc.setSheetName(0, aTabName);
- maSheets.push_back(o3tl::make_unique<ScOrcusSheet>(maDoc, 0, *this));
+ maSheets.push_back(std::make_unique<ScOrcusSheet>(maDoc, 0, *this));
return maSheets.back().get();
}
@@ -296,7 +295,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
return nullptr;
SCTAB nTab = maDoc.getSheetCount() - 1;
- maSheets.push_back(o3tl::make_unique<ScOrcusSheet>(maDoc, nTab, *this));
+ maSheets.push_back(std::make_unique<ScOrcusSheet>(maDoc, nTab, *this));
return maSheets.back().get();
}
@@ -328,7 +327,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char* s
return it->get();
// Create a new orcus sheet instance for this.
- maSheets.push_back(o3tl::make_unique<ScOrcusSheet>(maDoc, nTab, *this));
+ maSheets.push_back(std::make_unique<ScOrcusSheet>(maDoc, nTab, *this));
return maSheets.back().get();
}
@@ -344,7 +343,7 @@ orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(orcus::spread
return it->get();
// Create a new orcus sheet instance for this.
- maSheets.push_back(o3tl::make_unique<ScOrcusSheet>(maDoc, nTab, *this));
+ maSheets.push_back(std::make_unique<ScOrcusSheet>(maDoc, nTab, *this));
return maSheets.back().get();
}
@@ -378,7 +377,7 @@ void ScOrcusFactory::finalize()
if (!pArray)
return std::unique_ptr<ScFormulaCell>();
- return o3tl::make_unique<ScFormulaCell>(&maDoc.getDoc(), rToken.maPos, *pArray);
+ return std::make_unique<ScFormulaCell>(&maDoc.getDoc(), rToken.maPos, *pArray);
};
int nCellCount = 0;
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index 4cdd3ce48412..636e66271a7d 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -16,7 +16,6 @@
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentry.hxx>
#include <ucbhelper/content.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <orcus/xml_structure_tree.hpp>
@@ -42,7 +41,7 @@ namespace {
ScOrcusXMLTreeParam::EntryData& setUserDataToEntry(
SvTreeListEntry& rEntry, ScOrcusXMLTreeParam::UserDataStoreType& rStore, ScOrcusXMLTreeParam::EntryType eType)
{
- rStore.push_back(o3tl::make_unique<ScOrcusXMLTreeParam::EntryData>(eType));
+ rStore.push_back(std::make_unique<ScOrcusXMLTreeParam::EntryData>(eType));
rEntry.SetUserData(rStore.back().get());
return *rStore.back();
}
diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx
index e48c87da020f..fe3856dfaace 100644
--- a/sc/source/filter/rtf/rtfimp.cxx
+++ b/sc/source/filter/rtf/rtfimp.cxx
@@ -22,7 +22,6 @@
#include <rtfimp.hxx>
#include <rtfparse.hxx>
#include <ftools.hxx>
-#include <o3tl/make_unique.hxx>
ErrCode ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange )
{
@@ -36,7 +35,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString
std::unique_ptr<ScEEAbsImport> ScFormatFilterPluginImpl::CreateRTFImport( ScDocument* pDoc, const ScRange& rRange )
{
- return o3tl::make_unique<ScRTFImport>( pDoc, rRange );
+ return std::make_unique<ScRTFImport>( pDoc, rRange );
}
ScRTFImport::ScRTFImport( ScDocument* pDocP, const ScRange& rRange ) :
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 9844e7bc72d6..f987d336e1b4 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <svx/svdpage.hxx>
-#include <o3tl/make_unique.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdoole2.hxx>
@@ -216,7 +215,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
SvGlobalName aObjClsId( xObj->getClassID() );
if ( SotExchange::IsChart( aObjClsId ) )
{ // yes, it's a chart diagram
- mrObjMgr.AddObj( o3tl::make_unique<XclExpChartObj>( mrObjMgr, rxShape, pChildAnchor ) );
+ mrObjMgr.AddObj( std::make_unique<XclExpChartObj>( mrObjMgr, rxShape, pChildAnchor ) );
pCurrXclObj = nullptr; // no metafile or whatsoever
}
else // metafile and OLE object
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index c371fd3129a4..18ce8946e53c 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -24,7 +24,6 @@
#include <tools/datetime.hxx>
#include <osl/diagnose.h>
#include <svl/zforlist.hxx>
-#include <o3tl/make_unique.hxx>
#include <sax/tools/converter.hxx>
#define SC_CHANGE_ID_PREFIX "ct"
@@ -163,29 +162,29 @@ void ScXMLChangeTrackingImportHelper::StartChangeAction(const ScChangeActionType
case SC_CAT_INSERT_ROWS:
case SC_CAT_INSERT_TABS:
{
- pCurrentAction = o3tl::make_unique<ScMyInsAction>(nActionType);
+ pCurrentAction = std::make_unique<ScMyInsAction>(nActionType);
}
break;
case SC_CAT_DELETE_COLS:
case SC_CAT_DELETE_ROWS:
case SC_CAT_DELETE_TABS:
{
- pCurrentAction = o3tl::make_unique<ScMyDelAction>(nActionType);
+ pCurrentAction = std::make_unique<ScMyDelAction>(nActionType);
}
break;
case SC_CAT_MOVE:
{
- pCurrentAction = o3tl::make_unique<ScMyMoveAction>();
+ pCurrentAction = std::make_unique<ScMyMoveAction>();
}
break;
case SC_CAT_CONTENT:
{
- pCurrentAction = o3tl::make_unique<ScMyContentAction>();
+ pCurrentAction = std::make_unique<ScMyContentAction>();
}
break;
case SC_CAT_REJECT:
{
- pCurrentAction = o3tl::make_unique<ScMyRejAction>();
+ pCurrentAction = std::make_unique<ScMyRejAction>();
}
break;
default:
@@ -415,7 +414,7 @@ std::unique_ptr<ScChangeAction> ScXMLChangeTrackingImportHelper::CreateInsertAct
OUString sComment (pAction->aInfo.sComment);
- return o3tl::make_unique<ScChangeActionIns>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
+ return std::make_unique<ScChangeActionIns>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment, pAction->nActionType);
}
@@ -427,7 +426,7 @@ std::unique_ptr<ScChangeAction> ScXMLChangeTrackingImportHelper::CreateDeleteAct
OUString sComment (pAction->aInfo.sComment);
- return o3tl::make_unique<ScChangeActionDel>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
+ return std::make_unique<ScChangeActionDel>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment, pAction->nActionType, pAction->nD, pTrack);
}
@@ -442,7 +441,7 @@ std::unique_ptr<ScChangeAction> ScXMLChangeTrackingImportHelper::CreateMoveActio
OUString sComment (pAction->aInfo.sComment);
- return o3tl::make_unique<ScChangeActionMove>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
+ return std::make_unique<ScChangeActionMove>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->pMoveRanges->aTargetRange, aUser, aDateTime, sComment, pAction->pMoveRanges->aSourceRange , pTrack);
}
return nullptr;
@@ -456,7 +455,7 @@ std::unique_ptr<ScChangeAction> ScXMLChangeTrackingImportHelper::CreateRejection
OUString sComment (pAction->aInfo.sComment);
- return o3tl::make_unique<ScChangeActionReject>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
+ return std::make_unique<ScChangeActionReject>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment);
}
@@ -476,7 +475,7 @@ std::unique_ptr<ScChangeAction> ScXMLChangeTrackingImportHelper::CreateContentAc
OUString sComment (pAction->aInfo.sComment);
- return o3tl::make_unique<ScChangeActionContent>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
+ return std::make_unique<ScChangeActionContent>(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment, aCell, pDoc, sInputString);
}
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index fc351c62a302..6b2fb2e4a2a4 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -34,7 +34,6 @@
#include <comphelper/extract.hxx>
#include <comphelper/propertysequence.hxx>
#include <sfx2/app.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
using namespace com::sun::star;
@@ -1050,7 +1049,7 @@ void ScRowStyles::AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields)
if (nTable > nSize)
for (sal_Int32 i = nSize; i < nTable; ++i)
{
- aTables.push_back(o3tl::make_unique<StylesType>(0, nFields+1, -1));
+ aTables.push_back(std::make_unique<StylesType>(0, nFields+1, -1));
}
}
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 6b50715f1185..33b4a6ee22d4 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -92,7 +92,6 @@
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <i18nlangtag/lang.h>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
using namespace xmloff::token;
@@ -318,7 +317,7 @@ void ScXMLTableRowCellContext::PushParagraphSpan(const OUString& rSpan, const OU
void ScXMLTableRowCellContext::PushParagraphField(std::unique_ptr<SvxFieldData> pData, const OUString& rStyleName)
{
mbHasFormatRuns = true;
- maFields.push_back(o3tl::make_unique<Field>(std::move(pData)));
+ maFields.push_back(std::make_unique<Field>(std::move(pData)));
Field& rField = *maFields.back().get();
sal_Int32 nPos = maParagraph.getLength();
@@ -363,7 +362,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons
const ScXMLEditAttributeMap& rEditAttrMap = GetScImport().GetEditAttributeMap();
mbHasFormatRuns = true;
- maFormats.push_back(o3tl::make_unique<ParaFormat>(*mpEditEngine));
+ maFormats.push_back(std::make_unique<ParaFormat>(*mpEditEngine));
ParaFormat& rFmt = *maFormats.back().get();
rFmt.maSelection.nStartPara = rFmt.maSelection.nEndPara = mnCurParagraph;
rFmt.maSelection.nStartPos = nBegin;
@@ -572,18 +571,18 @@ OUString ScXMLTableRowCellContext::GetFirstParagraph() const
void ScXMLTableRowCellContext::PushParagraphFieldDate(const OUString& rStyleName)
{
- PushParagraphField(o3tl::make_unique<SvxDateField>(), rStyleName);
+ PushParagraphField(std::make_unique<SvxDateField>(), rStyleName);
}
void ScXMLTableRowCellContext::PushParagraphFieldSheetName(const OUString& rStyleName)
{
SCTAB nTab = GetScImport().GetTables().GetCurrentCellPos().Tab();
- PushParagraphField(o3tl::make_unique<SvxTableField>(nTab), rStyleName);
+ PushParagraphField(std::make_unique<SvxTableField>(nTab), rStyleName);
}
void ScXMLTableRowCellContext::PushParagraphFieldDocTitle(const OUString& rStyleName)
{
- PushParagraphField(o3tl::make_unique<SvxFileField>(), rStyleName);
+ PushParagraphField(std::make_unique<SvxFileField>(), rStyleName);
}
void ScXMLTableRowCellContext::PushParagraphFieldURL(
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 6faa14c6b656..deda4347c027 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -96,7 +96,7 @@
#include <memory>
#include <utility>
-#include <o3tl/make_unique.hxx>
+
#define SC_LOCALE "Locale"
#define SC_CURRENCYSYMBOL "CurrencySymbol"
#define SC_REPEAT_ROW "repeat-row"
@@ -914,7 +914,7 @@ void ScXMLImport::AddNamedExpression(SCTAB nTab, ScMyNamedExpression* pNamedExp)
{
// No chain exists for this sheet. Create one.
::std::pair<SheetNamedExpMap::iterator, bool> r =
- m_SheetNamedExpressions.insert(std::make_pair(nTab, o3tl::make_unique<ScMyNamedExpressions>()));
+ m_SheetNamedExpressions.insert(std::make_pair(nTab, std::make_unique<ScMyNamedExpressions>()));
if (!r.second)
// insertion failed.
return;
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index 161a288f6242..401bac28b866 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -22,8 +22,6 @@
#include "xmlimprt.hxx"
#include <xmloff/xmlnmspe.hxx>
-#include <o3tl/make_unique.hxx>
-
using namespace ::com::sun::star;
using namespace xmloff::token;
@@ -93,7 +91,7 @@ void SAL_CALL ScXMLLabelRangeContext::endFastElement( sal_Int32 /*nElement*/ )
// Label ranges must be stored as strings until all sheets are loaded
// (like named expressions).
- auto pLabelRange = o3tl::make_unique<ScMyLabelRange>(
+ auto pLabelRange = std::make_unique<ScMyLabelRange>(
ScMyLabelRange{sLabelRangeStr, sDataRangeStr, bColumnOrientation});
GetScImport().AddLabelRange(std::move(pLabelRange));
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 0c414eaf1beb..930ffce6c8ef 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -50,7 +50,7 @@
#include <vcl/svapp.hxx>
#include <AccessibleSpreadsheet.hxx>
-#include <o3tl/make_unique.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -382,7 +382,7 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
{
return ::std::unique_ptr< SvxEditSource >();
}
- ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(o3tl::make_unique<ScAccessibleCellTextData>(pViewShell, aCell, eSplitPos, this)));
+ ::std::unique_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(std::make_unique<ScAccessibleCellTextData>(pViewShell, aCell, eSplitPos, this)));
return pEditSource;
}
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 3d5a283b7105..8ea914616617 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -51,7 +51,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <editutil.hxx>
-#include <o3tl/make_unique.hxx>
+
using ::utl::AccessibleRelationSetHelper;
using ::utl::AccessibleStateSetHelper;
using ::accessibility::AccessibleStaticTextBase;
@@ -1542,7 +1542,7 @@ tools::Rectangle ScAccessibleCsvCell::implGetBoundingBox() const
{
ScCsvGrid& rGrid = implGetGrid();
- ::std::unique_ptr< SvxEditSource > pEditSource( new ScAccessibilityEditSource( o3tl::make_unique<ScAccessibleCsvTextData>(&rGrid, rGrid.GetEditEngine(), maCellText, implGetRealSize()) ) );
+ ::std::unique_ptr< SvxEditSource > pEditSource( new ScAccessibilityEditSource( std::make_unique<ScAccessibleCsvTextData>(&rGrid, rGrid.GetEditEngine(), maCellText, implGetRealSize()) ) );
return pEditSource;
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 4ca8f3f1836f..084cd6d83195 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -59,7 +59,7 @@
#include <vector>
#include <algorithm>
#include <memory>
-#include <o3tl/make_unique.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -141,7 +141,7 @@ ScNotesChildren::~ScNotesChildren()
::accessibility::AccessibleTextHelper* ScNotesChildren::CreateTextHelper(const OUString& rString, const tools::Rectangle& rVisRect, const ScAddress& aCellPos, bool bMarkNote, sal_Int32 nChildOffset) const
{
- ::accessibility::AccessibleTextHelper* pTextHelper = new ::accessibility::AccessibleTextHelper(o3tl::make_unique<ScAccessibilityEditSource>(o3tl::make_unique<ScAccessibleNoteTextData>(mpViewShell, rString, aCellPos, bMarkNote)));
+ ::accessibility::AccessibleTextHelper* pTextHelper = new ::accessibility::AccessibleTextHelper(std::make_unique<ScAccessibilityEditSource>(std::make_unique<ScAccessibleNoteTextData>(mpViewShell, rString, aCellPos, bMarkNote)));
pTextHelper->SetEventSource(mpAccDoc);
pTextHelper->SetStartIndex(nChildOffset);
pTextHelper->SetOffset(rVisRect.TopLeft());
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index a57fab56773a..f13bd2be706c 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <o3tl/make_unique.hxx>
+
using ::com::sun::star::lang::IndexOutOfBoundsException;
using ::com::sun::star::uno::RuntimeException;
using namespace ::com::sun::star;
@@ -349,9 +349,9 @@ void ScAccessibleEditObject::CreateTextHelper()
}
std::unique_ptr<ScAccessibilityEditSource> pEditSrc =
- o3tl::make_unique<ScAccessibilityEditSource>(std::move(pAccessibleTextData));
+ std::make_unique<ScAccessibilityEditSource>(std::move(pAccessibleTextData));
- mpTextHelper = o3tl::make_unique<::accessibility::AccessibleTextHelper>(std::move(pEditSrc));
+ mpTextHelper = std::make_unique<::accessibility::AccessibleTextHelper>(std::move(pEditSrc));
mpTextHelper->SetEventSource(this);
const ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 1e4c6af2728c..50bbdde971ea 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -39,7 +39,7 @@
#include <rtl/ustrbuf.hxx>
#include <toolkit/helper/convert.hxx>
#include <vcl/svapp.hxx>
-#include <o3tl/make_unique.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -276,8 +276,8 @@ void ScAccessiblePageHeaderArea::CreateTextHelper()
if (!mpTextHelper)
{
mpTextHelper.reset( new ::accessibility::AccessibleTextHelper(
- o3tl::make_unique<ScAccessibilityEditSource>(
- o3tl::make_unique<ScAccessibleHeaderTextData>(
+ std::make_unique<ScAccessibilityEditSource>(
+ std::make_unique<ScAccessibleHeaderTextData>(
mpViewShell, mpEditObj.get(), meAdjust))) );
mpTextHelper->SetEventSource(this);
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index b39fd0836e95..2c21faedbb49 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -36,7 +36,7 @@
#include <vcl/svapp.hxx>
#include <toolkit/helper/convert.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <o3tl/make_unique.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -270,8 +270,8 @@ void ScAccessiblePreviewCell::CreateTextHelper()
if (!mpTextHelper)
{
mpTextHelper.reset( new ::accessibility::AccessibleTextHelper(
- o3tl::make_unique<ScAccessibilityEditSource>(
- o3tl::make_unique<ScAccessiblePreviewCellTextData>(
+ std::make_unique<ScAccessibilityEditSource>(
+ std::make_unique<ScAccessiblePreviewCellTextData>(
mpViewShell, maCellAddress))) );
mpTextHelper->SetEventSource( this );
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index c0537933d497..6810cf457207 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -41,7 +41,7 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <comphelper/sequence.hxx>
#include <toolkit/helper/convert.hxx>
-#include <o3tl/make_unique.hxx>
+
#ifdef indices
#undef indices
#endif
@@ -384,8 +384,8 @@ void ScAccessiblePreviewHeaderCell::CreateTextHelper()
if (!mpTextHelper)
{
mpTextHelper = new ::accessibility::AccessibleTextHelper(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list