[Libreoffice-commits] core.git: dbaccess/source desktop/win32 drawinglayer/source editeng/inc editeng/source embedserv/source emfio/inc emfio/source extensions/source filter/source formula/source framework/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 21 06:36:29 UTC 2019
dbaccess/source/ui/control/dbtreelistbox.cxx | 4
dbaccess/source/ui/control/tabletree.cxx | 3
dbaccess/source/ui/misc/WNameMatch.cxx | 3
dbaccess/source/ui/querydesign/JoinTableView.cxx | 5 -
dbaccess/source/ui/querydesign/QueryTableView.cxx | 5 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 17 +--
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 3
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 3
dbaccess/source/ui/uno/composerdialogs.cxx | 5 -
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 3
dbaccess/source/ui/uno/unosqlmessage.cxx | 5 -
desktop/win32/source/guistdio/guistdio.inc | 7 -
drawinglayer/source/animation/animationtiming.cxx | 9 -
drawinglayer/source/processor2d/processor2dtools.cxx | 5 -
drawinglayer/source/processor2d/processorfromoutputdevice.cxx | 5 -
drawinglayer/source/tools/emfphelperdata.cxx | 23 ++--
drawinglayer/source/tools/wmfemfhelper.cxx | 49 ++++------
editeng/inc/pch/precompiled_editeng.hxx | 1
editeng/source/editeng/impedit2.cxx | 31 +++---
editeng/source/editeng/impedit3.cxx | 5 -
editeng/source/editeng/impedit5.cxx | 9 -
editeng/source/items/CustomPropertyField.cxx | 3
editeng/source/items/flditem.cxx | 31 +++---
editeng/source/items/svdfield.cxx | 3
editeng/source/items/textitem.cxx | 3
editeng/source/items/xmlcnitm.cxx | 3
editeng/source/outliner/outleeng.cxx | 3
editeng/source/outliner/outliner.cxx | 9 -
editeng/source/outliner/outlvw.cxx | 5 -
editeng/source/uno/unoedhlp.cxx | 3
embedserv/source/inprocserv/advisesink.cxx | 4
emfio/inc/mtftools.hxx | 1
emfio/source/reader/emfreader.cxx | 11 +-
emfio/source/reader/mtftools.cxx | 3
emfio/source/reader/wmfreader.cxx | 17 +--
extensions/source/bibliography/bibconfig.cxx | 3
extensions/source/bibliography/framectr.cxx | 3
extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 5 -
extensions/source/propctrlr/controlfontdialog.cxx | 3
filter/source/config/cache/filtercache.cxx | 4
filter/source/graphicfilter/icgm/bundles.hxx | 13 +-
filter/source/msfilter/escherex.cxx | 7 -
filter/source/msfilter/msdffimp.cxx | 3
filter/source/msfilter/svdfppt.cxx | 15 +--
filter/source/pdf/pdfdialog.cxx | 3
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 3
framework/source/fwe/helper/undomanagerhelper.cxx | 3
47 files changed, 159 insertions(+), 205 deletions(-)
New commits:
commit 979aed6b38f4963ea37c39de090d4487a12ba2ba
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Thu Jan 17 18:35:37 2019 +0100
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jan 21 07:36:04 2019 +0100
o3tl::make_unique -> std::make_unique in dbaccess...framework
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Iad5a422bc5a7da43d905edc91d1c46793332ec5e
Reviewed-on: https://gerrit.libreoffice.org/66545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 0f4c404c1c3b..43b6ecb1fa0e 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -43,7 +43,7 @@
#include <vcl/event.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
+
namespace dbaui
{
@@ -142,7 +142,7 @@ void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, co
{
SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind);
SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SvLBoxItemType::String));
- _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(aStr), _pEntry->GetPos(pTextItem));
+ _pEntry->ReplaceItem(std::make_unique<OBoldListboxString>(aStr), _pEntry->GetPos(pTextItem));
}
void DBTreeListBox::implStopSelectionTimer()
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index bf68b08b3c53..9e8b7de36fb5 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -43,7 +43,6 @@
#include <rtl/ustrbuf.hxx>
#include <connectivity/dbmetadata.hxx>
#include <vcl/treelistentry.hxx>
-#include <o3tl/make_unique.hxx>
#include <algorithm>
@@ -389,7 +388,7 @@ void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rSt
size_t nTextPos = _pEntry->GetPos(pTextItem);
OSL_ENSURE(SvTreeListEntry::ITEM_NOT_FOUND != nTextPos, "OTableTreeListBox::InitEntry: no text item pos!");
- _pEntry->ReplaceItem(o3tl::make_unique<OBoldListboxString>(_rString), nTextPos);
+ _pEntry->ReplaceItem(std::make_unique<OBoldListboxString>(_rString), nTextPos);
}
SvTreeListEntry* OTableTreeListBox::implAddEntry(
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 782e62d1b4e0..237ba44929d6 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -29,7 +29,6 @@
#include <vcl/builderfactory.hxx>
#include <vcl/treelistentry.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
-#include <o3tl/make_unique.hxx>
using namespace ::dbaui;
@@ -382,7 +381,7 @@ VCL_BUILDER_FACTORY(OColumnTreeBox)
void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
{
DBTreeListBox::InitEntry(pEntry, rStr, rImg1, rImg2, eButtonKind);
- pEntry->ReplaceItem(o3tl::make_unique<OColumnString>(rStr,false), pEntry->ItemCount() - 1);
+ pEntry->ReplaceItem(std::make_unique<OColumnString>(rStr,false), pEntry->ItemCount() - 1);
}
bool OColumnTreeBox::Select( SvTreeListEntry* pEntry, bool bSelect )
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 9a9320a69fad..942ddafa40bf 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -44,7 +44,6 @@
#include <UITools.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
-#include <o3tl/make_unique.hxx>
#include <algorithm>
#include <functional>
@@ -1077,7 +1076,7 @@ void OJoinTableView::TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPositi
Point ptThumbPos(GetHScrollBar().GetThumbPos(), GetVScrollBar().GetThumbPos());
ptWhich->GetData()->SetPosition(ptWhich->GetPosPixel() + ptThumbPos);
- invalidateAndModify(o3tl::make_unique<OJoinMoveTabWinUndoAct>(this, ptOldPosition, ptWhich));
+ invalidateAndModify(std::make_unique<OJoinMoveTabWinUndoAct>(this, ptOldPosition, ptWhich));
}
void OJoinTableView::TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize)
@@ -1085,7 +1084,7 @@ void OJoinTableView::TabWinSized(OTableWindow* ptWhich, const Point& ptOldPositi
ptWhich->GetData()->SetSize(ptWhich->GetSizePixel());
ptWhich->GetData()->SetPosition(ptWhich->GetPosPixel());
- invalidateAndModify(o3tl::make_unique<OJoinSizeTabWinUndoAct>(this, ptOldPosition, szOldSize, ptWhich));
+ invalidateAndModify(std::make_unique<OJoinSizeTabWinUndoAct>(this, ptOldPosition, szOldSize, ptWhich));
}
bool OJoinTableView::IsAddAllowed()
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index d5c4a63c70bf..9f5c8a1520b9 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -49,7 +49,6 @@
#include <strings.hrc>
#include <strings.hxx>
#include <vcl/treelistentry.hxx>
-#include <o3tl/make_unique.hxx>
using namespace dbaui;
using namespace ::com::sun::star::uno;
@@ -111,7 +110,7 @@ namespace
// add an undo action
if ( _bAddUndo )
addUndoAction( _pView,
- o3tl::make_unique<OQueryAddTabConnUndoAction>(_pView),
+ std::make_unique<OQueryAddTabConnUndoAction>(_pView),
static_cast< OQueryTableConnection*>(_pConnection));
// redraw
_pConnection->RecalcLines();
@@ -630,7 +629,7 @@ bool OQueryTableView::RemoveConnection(VclPtr<OTableConnection>& rConnection, bo
// add undo action
addUndoAction(this,
- o3tl::make_unique<OQueryDelTabConnUndoAction>(this),
+ std::make_unique<OQueryDelTabConnUndoAction>(this),
xConnection.get(),
true);
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 7fd6bc3341cd..be0fd79a8962 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -41,7 +41,6 @@
#include <SqlNameEdit.hxx>
#include <TableRowExchange.hxx>
#include <sot/storage.hxx>
-#include <o3tl/make_unique.hxx>
#include <UITools.hxx>
#include "TableFieldControl.hxx"
#include <dsntypes.hxx>
@@ -509,7 +508,7 @@ void OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
// If FieldDescr exists, the field is deleted and the old content restored
if (pActFieldDescr)
{
- GetUndoManager().AddUndoAction(o3tl::make_unique<OTableEditorTypeSelUndoAct>(this, nRow, FIELD_TYPE, pActFieldDescr->getTypeInfo()));
+ GetUndoManager().AddUndoAction(std::make_unique<OTableEditorTypeSelUndoAct>(this, nRow, FIELD_TYPE, pActFieldDescr->getTypeInfo()));
SwitchType(TOTypeInfoSP());
pActFieldDescr = pActRow->GetActFieldDescr();
}
@@ -660,14 +659,14 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
nInvalidateTypeEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, InvalidateFieldType), nullptr, true );
pActFieldDescr = pActRow->GetActFieldDescr();
pDescrWin->DisplayData( pActFieldDescr );
- GetUndoManager().AddUndoAction( o3tl::make_unique<OTableEditorTypeSelUndoAct>(this, nRow, nColId+1, TOTypeInfoSP()) );
+ GetUndoManager().AddUndoAction( std::make_unique<OTableEditorTypeSelUndoAct>(this, nRow, nColId+1, TOTypeInfoSP()) );
}
if( nColId != FIELD_TYPE )
- GetUndoManager().AddUndoAction( o3tl::make_unique<OTableDesignCellUndoAct>(this, nRow, nColId) );
+ GetUndoManager().AddUndoAction( std::make_unique<OTableDesignCellUndoAct>(this, nRow, nColId) );
else
{
- GetUndoManager().AddUndoAction(o3tl::make_unique<OTableEditorTypeSelUndoAct>(this, GetCurRow(), nColId, GetFieldDescr(GetCurRow())->getTypeInfo()));
+ GetUndoManager().AddUndoAction(std::make_unique<OTableEditorTypeSelUndoAct>(this, GetCurRow(), nColId, GetFieldDescr(GetCurRow())->getTypeInfo()));
resetType();
}
@@ -801,7 +800,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
RowInserted( nRow,vInsertedUndoRedoRows.size() );
// Create the Undo-Action
- GetUndoManager().AddUndoAction( o3tl::make_unique<OTableEditorInsUndoAct>(this, nRow,vInsertedUndoRedoRows) );
+ GetUndoManager().AddUndoAction( std::make_unique<OTableEditorInsUndoAct>(this, nRow,vInsertedUndoRedoRows) );
GetView()->getController().setModified( true );
InvalidateFeatures();
}
@@ -810,7 +809,7 @@ void OTableEditorCtrl::DeleteRows()
{
OSL_ENSURE(GetView()->getController().isDropAllowed(),"Call of DeleteRows not valid here. Please check isDropAllowed!");
// Create the Undo-Action
- GetUndoManager().AddUndoAction( o3tl::make_unique<OTableEditorDelUndoAct>(this) );
+ GetUndoManager().AddUndoAction( std::make_unique<OTableEditorDelUndoAct>(this) );
// Delete all marked rows
long nIndex = FirstSelectedRow();
@@ -847,7 +846,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow )
long nInsertRows = GetSelectRowCount();
if( !nInsertRows )
nInsertRows = 1;
- GetUndoManager().AddUndoAction( o3tl::make_unique<OTableEditorInsNewUndoAct>(this, nRow, nInsertRows) );
+ GetUndoManager().AddUndoAction( std::make_unique<OTableEditorInsNewUndoAct>(this, nRow, nInsertRows) );
// Insert the number of selected rows
for( long i=nRow; i<(nRow+nInsertRows); i++ )
m_pRowList->insert( m_pRowList->begin()+i ,std::make_shared<OTableRow>());
@@ -1527,7 +1526,7 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet )
}
}
- GetUndoManager().AddUndoAction( o3tl::make_unique<OPrimKeyUndoAct>(this, aDeletedPrimKeys, aInsertedPrimKeys) );
+ GetUndoManager().AddUndoAction( std::make_unique<OPrimKeyUndoAct>(this, aDeletedPrimKeys, aInsertedPrimKeys) );
// Invalidate the handle-columns
InvalidateHandleColumn();
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 3a498049c7a7..2a63428abd9c 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -26,7 +26,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/proparrhlp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <o3tl/make_unique.hxx>
namespace dbaui
{
@@ -126,7 +125,7 @@ namespace dbaui
svt::OGenericUnoDialog::Dialog OAdvancedSettingsDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent)
{
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<AdvancedSettingsDialog>(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(),
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<AdvancedSettingsDialog>(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(),
m_aContext, m_aInitialSelection));
}
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 760805897ab4..7cd0d3054699 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -23,7 +23,6 @@
#include <UserAdminDlg.hxx>
#include <comphelper/processfactory.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <o3tl/make_unique.hxx>
using namespace dbaui;
@@ -95,7 +94,7 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo()
svt::OGenericUnoDialog::Dialog OUserSettingsDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent)
{
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<OUserAdminDlg>(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(), m_aContext, m_aInitialSelection, m_xActiveConnection));
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<OUserAdminDlg>(Application::GetFrameWeld(rParent), m_pDatasourceItems.get(), m_aContext, m_aInitialSelection, m_xActiveConnection));
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 56593aefe9a6..20e7361c9125 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -31,7 +31,6 @@
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
-#include <o3tl/make_unique.hxx>
extern "C" void createRegistryInfo_ComposerDialogs()
{
@@ -146,7 +145,7 @@ namespace dbaui
std::unique_ptr<weld::GenericDialogController> RowsetFilterDialog::createComposerDialog(weld::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns )
{
- return o3tl::make_unique<DlgFilterCrit>(_pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns);
+ return std::make_unique<DlgFilterCrit>(_pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns);
}
void SAL_CALL RowsetFilterDialog::initialize( const Sequence< Any >& aArguments )
@@ -194,7 +193,7 @@ namespace dbaui
std::unique_ptr<weld::GenericDialogController> RowsetOrderDialog::createComposerDialog(weld::Window* pParent, const Reference< XConnection >& rxConnection, const Reference< XNameAccess >& rxColumns)
{
- return o3tl::make_unique<DlgOrderCrit>(pParent, rxConnection, m_xComposer, rxColumns);
+ return std::make_unique<DlgOrderCrit>(pParent, rxConnection, m_xComposer, rxColumns);
}
void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& aArguments )
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 4c7cc453cf7b..37b26c47f387 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -35,7 +35,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
-#include <o3tl/make_unique.hxx>
namespace dbaui
{
@@ -207,7 +206,7 @@ namespace dbaui
svt::OGenericUnoDialog::Dialog OTextConnectionSettingsDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent)
{
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<TextConnectionSettingsDialog>(Application::GetFrameWeld(rParent), *m_pDatasourceItems));
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<TextConnectionSettingsDialog>(Application::GetFrameWeld(rParent), *m_pDatasourceItems));
}
void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index c0ca52114eb2..fb9675385738 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -28,7 +28,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <connectivity/dbexception.hxx>
#include <vcl/svapp.hxx>
-#include <o3tl/make_unique.hxx>
using namespace dbaui;
using namespace dbtools;
@@ -149,10 +148,10 @@ svt::OGenericUnoDialog::Dialog OSQLMessageDialog::createDialog(const css::uno::R
{
weld::Window* pParent = Application::GetFrameWeld(rParent);
if ( m_aException.hasValue() )
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<OSQLMessageBox>(pParent, SQLExceptionInfo(m_aException), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, m_sHelpURL));
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<OSQLMessageBox>(pParent, SQLExceptionInfo(m_aException), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, m_sHelpURL));
OSL_FAIL("OSQLMessageDialog::createDialog : You should use the SQLException property to specify the error to display!");
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<OSQLMessageBox>(pParent, SQLException()));
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<OSQLMessageBox>(pParent, SQLException()));
}
} // namespace dbaui
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index ea466769d517..85822a817d63 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -26,7 +26,8 @@
#include <stdio.h>
#include <sal/macros.h>
-#include <o3tl/make_unique.hxx>
+
+#include <memory>
#ifdef UNOPKG
@@ -161,7 +162,7 @@ DWORD WINAPI InputThread( LPVOID pParam )
//can be used (little and big endian);
int cNewLine = WideCharToMultiByte(
GetConsoleCP(), 0, L"\r\n", 2, nullptr, 0, nullptr, nullptr);
- auto mbBuff = o3tl::make_unique<char[]>(cNewLine);
+ auto mbBuff = std::make_unique<char[]>(cNewLine);
WideCharToMultiByte(
GetConsoleCP(), 0, L"\r\n", 2, mbBuff.get(), cNewLine, nullptr, nullptr);
@@ -208,7 +209,7 @@ DWORD WINAPI InputThread( LPVOID pParam )
int sizeWBuf = MultiByteToWideChar(
GetConsoleCP(), MB_PRECOMPOSED, readBuf, readAll, nullptr, 0);
- auto wideBuf = o3tl::make_unique<wchar_t[]>(sizeWBuf);
+ auto wideBuf = std::make_unique<wchar_t[]>(sizeWBuf);
//Do the conversion.
MultiByteToWideChar(
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx
index f3ffa88b35c8..0ab3d98b1ba2 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -21,7 +21,6 @@
#include <drawinglayer/animation/animationtiming.hxx>
#include <basegfx/numeric/ftools.hxx>
-#include <o3tl/make_unique.hxx>
namespace drawinglayer
{
@@ -50,7 +49,7 @@ namespace drawinglayer
std::unique_ptr<AnimationEntry> AnimationEntryFixed::clone() const
{
- return o3tl::make_unique<AnimationEntryFixed>(mfDuration, mfState);
+ return std::make_unique<AnimationEntryFixed>(mfDuration, mfState);
}
bool AnimationEntryFixed::operator==(const AnimationEntry& rCandidate) const
@@ -99,7 +98,7 @@ namespace drawinglayer
std::unique_ptr<AnimationEntry> AnimationEntryLinear::clone() const
{
- return o3tl::make_unique<AnimationEntryLinear>(mfDuration, mfFrequency, mfStart, mfStop);
+ return std::make_unique<AnimationEntryLinear>(mfDuration, mfFrequency, mfStart, mfStop);
}
bool AnimationEntryLinear::operator==(const AnimationEntry& rCandidate) const
@@ -184,7 +183,7 @@ namespace drawinglayer
std::unique_ptr<AnimationEntry> AnimationEntryList::clone() const
{
- std::unique_ptr<AnimationEntryList> pNew(o3tl::make_unique<AnimationEntryList>());
+ std::unique_ptr<AnimationEntryList> pNew(std::make_unique<AnimationEntryList>());
for(const auto &i : maEntries)
{
@@ -277,7 +276,7 @@ namespace drawinglayer
std::unique_ptr<AnimationEntry> AnimationEntryLoop::clone() const
{
- std::unique_ptr<AnimationEntryLoop> pNew(o3tl::make_unique<AnimationEntryLoop>(mnRepeat));
+ std::unique_ptr<AnimationEntryLoop> pNew(std::make_unique<AnimationEntryLoop>(mnRepeat));
for(const auto &i : maEntries)
{
diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx
index 1149e5271b9e..aa672cde80d0 100644
--- a/drawinglayer/source/processor2d/processor2dtools.cxx
+++ b/drawinglayer/source/processor2d/processor2dtools.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <drawinglayer/processor2d/processor2dtools.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/gdimtf.hxx>
#include "vclpixelprocessor2d.hxx"
#include "vclmetafileprocessor2d.hxx"
@@ -35,7 +34,7 @@ namespace drawinglayer
const drawinglayer::geometry::ViewInformation2D& rViewInformation2D)
{
// create Pixel Vcl-Processor
- return o3tl::make_unique<VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev);
+ return std::make_unique<VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev);
}
std::unique_ptr<BaseProcessor2D> createProcessor2DFromOutputDevice(
@@ -48,7 +47,7 @@ namespace drawinglayer
if(bOutputToRecordingMetaFile)
{
// create MetaFile Vcl-Processor and process
- return o3tl::make_unique<VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev);
+ return std::make_unique<VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev);
}
else
{
diff --git a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx
index ce81ce4b8f88..2f33b1bf0dec 100644
--- a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx
+++ b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx
@@ -26,7 +26,6 @@
#include "vclmetafileprocessor2d.hxx"
#include "vclpixelprocessor2d.hxx"
#include <vcl/window.hxx>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -44,12 +43,12 @@ namespace drawinglayer
if(bOutputToRecordingMetaFile)
{
// create MetaFile Vcl-Processor and process
- return o3tl::make_unique<drawinglayer::processor2d::VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev);
+ return std::make_unique<drawinglayer::processor2d::VclMetafileProcessor2D>(rViewInformation2D, rTargetOutDev);
}
else
{
// create Pixel Vcl-Processor
- return o3tl::make_unique<drawinglayer::processor2d::VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev);
+ return std::make_unique<drawinglayer::processor2d::VclPixelProcessor2D>(rViewInformation2D, rTargetOutDev);
}
}
} // end of namespace processor2d
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index ee4ba1f6f9b9..518920afaed2 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -42,7 +42,6 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -458,7 +457,7 @@ namespace emfplushelper
if (pen->GetColor().GetTransparency() == 0)
{
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D>(
polygon,
lineAttribute,
aStrokeAttribute));
@@ -472,7 +471,7 @@ namespace emfplushelper
aStrokeAttribute));
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
drawinglayer::primitive2d::Primitive2DContainer { aPrimitive },
pen->GetColor().GetTransparency() / 255.0));
}
@@ -501,7 +500,7 @@ namespace emfplushelper
{
// not transparent
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
polygon,
color.getBColor()));
}
@@ -513,7 +512,7 @@ namespace emfplushelper
color.getBColor()));
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
drawinglayer::primitive2d::Primitive2DContainer { aPrimitive },
color.GetTransparency() / 255.0));
}
@@ -574,7 +573,7 @@ namespace emfplushelper
// temporal solution: create a solid colored polygon
// TODO create a 'real' hatching primitive
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
polygon,
fillColor.getBColor()));
}
@@ -683,7 +682,7 @@ namespace emfplushelper
// create the same one used for SVG
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::SvgLinearGradientPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::SvgLinearGradientPrimitive2D>(
aTextureTransformation,
polygon,
aVector,
@@ -699,7 +698,7 @@ namespace emfplushelper
// create the same one used for SVG
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::SvgRadialGradientPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::SvgRadialGradientPrimitive2D>(
aTextureTransformation,
polygon,
aVector,
@@ -1261,7 +1260,7 @@ namespace emfplushelper
if (aSize.Width() > 0 && aSize.Height() > 0)
{
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>(aBmp, aTransformMatrix));
+ std::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>(aBmp, aTransformMatrix));
}
else
{
@@ -1274,7 +1273,7 @@ namespace emfplushelper
GDIMetaFile aGDI(image.graphic.GetGDIMetaFile());
aGDI.Clip(aSource);
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::MetafilePrimitive2D>(aTransformMatrix, aGDI));
+ std::make_unique<drawinglayer::primitive2d::MetafilePrimitive2D>(aTransformMatrix, aGDI));
}
}
else
@@ -1409,7 +1408,7 @@ namespace emfplushelper
}
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
maMapTransform,
drawinglayer::primitive2d::Primitive2DContainer { aPrimitiveText } ));
}
@@ -1845,7 +1844,7 @@ namespace emfplushelper
color.GetTransparency() / 255.0);
}
mrTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
maMapTransform,
drawinglayer::primitive2d::Primitive2DContainer { aPrimitiveText } ));
}
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 2fd174b9d595..6cecb1bba031 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -43,7 +43,6 @@
#include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
#include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <tools/fract.hxx>
#include <tools/stream.hxx>
@@ -449,7 +448,7 @@ namespace wmfemfhelper
if(rProperties.getTransformation().isIdentity())
{
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::PointArrayPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PointArrayPrimitive2D>(
rPositions,
rBColor));
}
@@ -463,7 +462,7 @@ namespace wmfemfhelper
}
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::PointArrayPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PointArrayPrimitive2D>(
aPositions,
rBColor));
}
@@ -481,7 +480,7 @@ namespace wmfemfhelper
basegfx::B2DPolygon aLinePolygon(rLinePolygon);
aLinePolygon.transform(rProperties.getTransformation());
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::PolygonHairlinePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolygonHairlinePrimitive2D>(
aLinePolygon,
rProperties.getLineColor()));
}
@@ -498,7 +497,7 @@ namespace wmfemfhelper
basegfx::B2DPolyPolygon aFillPolyPolygon(rFillPolyPolygon);
aFillPolyPolygon.transform(rProperties.getTransformation());
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
aFillPolyPolygon,
rProperties.getFillColor()));
}
@@ -551,7 +550,7 @@ namespace wmfemfhelper
fAccumulated);
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::PolygonStrokePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolygonStrokePrimitive2D>(
aLinePolygon,
aLineAttribute,
aStrokeAttribute));
@@ -559,7 +558,7 @@ namespace wmfemfhelper
else
{
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::PolygonStrokePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolygonStrokePrimitive2D>(
aLinePolygon,
aLineAttribute));
}
@@ -626,7 +625,7 @@ namespace wmfemfhelper
aPoint = rProperties.getTransformation() * aPoint;
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::DiscreteBitmapPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::DiscreteBitmapPrimitive2D>(
rBitmapEx,
aPoint));
}
@@ -652,7 +651,7 @@ namespace wmfemfhelper
aObjectTransform = rProperties.getTransformation() * aObjectTransform;
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>(
rBitmapEx,
aObjectTransform));
}
@@ -849,7 +848,7 @@ namespace wmfemfhelper
if(!aSubContent.empty())
{
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::GroupPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::GroupPrimitive2D>(
aSubContent));
}
}
@@ -896,7 +895,7 @@ namespace wmfemfhelper
{
// force content to black
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::ModifiedColorPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::ModifiedColorPrimitive2D>(
aSubContent,
basegfx::BColorModifierSharedPtr(
new basegfx::BColorModifier_replace(
@@ -906,7 +905,7 @@ namespace wmfemfhelper
{
// invert content
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::InvertPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::InvertPrimitive2D>(
aSubContent));
}
}
@@ -934,7 +933,7 @@ namespace wmfemfhelper
basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(rRange));
aOutline.transform(rPropertyHolder.getTransformation());
- return o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
+ return std::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
basegfx::B2DPolyPolygon(aOutline),
rColor);
}
@@ -1039,7 +1038,7 @@ namespace wmfemfhelper
const drawinglayer::primitive2d::Primitive2DReference xPrim(pBitmapWallpaperFill);
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
rProperty.getTransformation(),
drawinglayer::primitive2d::Primitive2DContainer { xPrim }));
}
@@ -1295,7 +1294,7 @@ namespace wmfemfhelper
const drawinglayer::primitive2d::Primitive2DReference aReference(pResult);
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
rProperty.getTransformation(),
drawinglayer::primitive2d::Primitive2DContainer { aReference }));
}
@@ -1423,7 +1422,7 @@ namespace wmfemfhelper
}
rTarget.append(
- o3tl::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
rProperty.getTransformation(),
xTargets));
}
@@ -1976,7 +1975,7 @@ namespace wmfemfhelper
{
// add with transformation
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransformPrimitive2D>(
rPropertyHolders.Current().getTransformation(),
xSubContent));
}
@@ -2164,7 +2163,7 @@ namespace wmfemfhelper
// when a MetaGradientAction is executed
aOutline.transform(rPropertyHolders.Current().getTransformation());
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::MaskPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::MaskPrimitive2D>(
aOutline,
xGradient));
}
@@ -2194,7 +2193,7 @@ namespace wmfemfhelper
aAttribute));
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::MaskPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::MaskPrimitive2D>(
aOutline,
drawinglayer::primitive2d::Primitive2DContainer { aFillHatch }));
}
@@ -2708,7 +2707,7 @@ namespace wmfemfhelper
if(!aSubContent.empty())
{
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
aSubContent,
nTransparence * 0.01));
}
@@ -2742,7 +2741,7 @@ namespace wmfemfhelper
// embed using EpsPrimitive
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::EpsPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::EpsPrimitive2D>(
aObjectTransform,
pA->GetLink(),
pA->GetSubstitute()));
@@ -2862,7 +2861,7 @@ namespace wmfemfhelper
{
// not really a gradient; create UnifiedTransparencePrimitive2D
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::UnifiedTransparencePrimitive2D>(
xSubContent,
aAttribute.getStartColor().luminance()));
}
@@ -2880,7 +2879,7 @@ namespace wmfemfhelper
// create transparence primitive
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::TransparencePrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::TransparencePrimitive2D>(
xSubContent,
drawinglayer::primitive2d::Primitive2DContainer { xTransparence }));
}
@@ -2982,7 +2981,7 @@ namespace wmfemfhelper
{
// not really a gradient
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolyPolygonColorPrimitive2D>(
aPolyPolygon,
aAttribute.getStartColor()));
}
@@ -2990,7 +2989,7 @@ namespace wmfemfhelper
{
// really a gradient
rTargetHolders.Current().append(
- o3tl::make_unique<drawinglayer::primitive2d::PolyPolygonGradientPrimitive2D>(
+ std::make_unique<drawinglayer::primitive2d::PolyPolygonGradientPrimitive2D>(
aPolyPolygon,
aAttribute));
}
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 1b7178567675..401237679ef1 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -274,7 +274,6 @@
#include <libxml/xmlwriter.h>
#include <linguistic/lngprops.hxx>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <sax/fastattribs.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 490496e7b7c6..e4f50f410f74 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -59,7 +59,6 @@
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <svl/asiancfg.hxx>
-#include <o3tl/make_unique.hxx>
#include <comphelper/lok.hxx>
#include <unotools/configmgr.hxx>
@@ -246,7 +245,7 @@ void ImpEditEngine::InitDoc(bool bKeepParaAttribs)
GetParaPortions().Reset();
- GetParaPortions().Insert(0, o3tl::make_unique<ParaPortion>( aEditDoc[0] ));
+ GetParaPortions().Insert(0, std::make_unique<ParaPortion>( aEditDoc[0] ));
bFormatted = false;
@@ -696,7 +695,7 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet()
{
if ( !pEmptyItemSet )
{
- pEmptyItemSet = o3tl::make_unique<SfxItemSet>( aEditDoc.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} );
+ pEmptyItemSet = std::make_unique<SfxItemSet>( aEditDoc.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} );
for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++)
{
pEmptyItemSet->ClearItem( nWhich );
@@ -2085,7 +2084,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars )
break; // for
}
}
- InsertUndo(o3tl::make_unique<EditUndoRemoveChars>(pEditEngine, CreateEPaM(rPaM), aStr));
+ InsertUndo(std::make_unique<EditUndoRemoveChars>(pEditEngine, CreateEPaM(rPaM), aStr));
}
aEditDoc.RemoveChars( rPaM, nChars );
@@ -2144,7 +2143,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n
aBeginMovingParagraphsHdl.Call( aMoveParagraphsInfo );
if ( IsUndoEnabled() && !IsInUndo())
- InsertUndo(o3tl::make_unique<EditUndoMoveParagraphs>(pEditEngine, aOldPositions, nNewPos));
+ InsertUndo(std::make_unique<EditUndoMoveParagraphs>(pEditEngine, aOldPositions, nNewPos));
// do not lose sight of the Position !
ParaPortion* pDestPortion = GetParaPortions().SafeGetObject( nNewPos );
@@ -2224,13 +2223,13 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
}
sal_Int32 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
- aDeletedNodes.push_back(o3tl::make_unique<DeletedNodeInfo>( pRight, nParagraphTobeDeleted ));
+ aDeletedNodes.push_back(std::make_unique<DeletedNodeInfo>( pRight, nParagraphTobeDeleted ));
GetEditEnginePtr()->ParagraphConnected( aEditDoc.GetPos( pLeft ), aEditDoc.GetPos( pRight ) );
if ( IsUndoEnabled() && !IsInUndo() )
{
- InsertUndo( o3tl::make_unique<EditUndoConnectParas>(pEditEngine,
+ InsertUndo( std::make_unique<EditUndoConnectParas>(pEditEngine,
aEditDoc.GetPos( pLeft ), pLeft->Len(),
pLeft->GetContentAttribs().GetItems(), pRight->GetContentAttribs().GetItems(),
pLeft->GetStyleSheet(), pRight->GetStyleSheet(), bBackward ) );
@@ -2457,7 +2456,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
OSL_ENSURE( pNode, "Blind Node in ImpRemoveParagraph" );
- aDeletedNodes.push_back(o3tl::make_unique<DeletedNodeInfo>( pNode, nPara ));
+ aDeletedNodes.push_back(std::make_unique<DeletedNodeInfo>( pNode, nPara ));
// The node is managed by the undo and possibly destroyed!
aEditDoc.Release( nPara );
@@ -2475,7 +2474,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
ParaAttribsChanged( pNextNode );
if ( IsUndoEnabled() && !IsInUndo() )
- InsertUndo(o3tl::make_unique<EditUndoDelContent>(pEditEngine, pNode, nPara));
+ InsertUndo(std::make_unique<EditUndoDelContent>(pEditEngine, pNode, nPara));
else
{
aEditDoc.RemoveItemsFromPool(*pNode);
@@ -2710,7 +2709,7 @@ EditPaM ImpEditEngine::ImpInsertText(const EditSelection& aCurSel, const OUStrin
aLine = aLine.copy( 0, nMaxNewChars ); // Delete the Rest...
}
if ( IsUndoEnabled() && !IsInUndo() )
- InsertUndo(o3tl::make_unique<EditUndoInsertChars>(pEditEngine, CreateEPaM(aPaM), aLine));
+ InsertUndo(std::make_unique<EditUndoInsertChars>(pEditEngine, CreateEPaM(aPaM), aLine));
// Tabs ?
if ( aLine.indexOf( '\t' ) == -1 )
aPaM = aEditDoc.InsertText( aPaM, aLine );
@@ -2768,7 +2767,7 @@ EditPaM ImpEditEngine::ImpFastInsertText( EditPaM aPaM, const OUString& rStr )
if ( ( aPaM.GetNode()->Len() + rStr.getLength() ) < MAXCHARSINPARA )
{
if ( IsUndoEnabled() && !IsInUndo() )
- InsertUndo(o3tl::make_unique<EditUndoInsertChars>(pEditEngine, CreateEPaM(aPaM), rStr));
+ InsertUndo(std::make_unique<EditUndoInsertChars>(pEditEngine, CreateEPaM(aPaM), rStr));
aPaM = aEditDoc.InsertText( aPaM, rStr );
TextModified();
@@ -2793,7 +2792,7 @@ EditPaM ImpEditEngine::ImpInsertFeature(const EditSelection& rCurSel, const SfxP
return aPaM;
if ( IsUndoEnabled() && !IsInUndo() )
- InsertUndo(o3tl::make_unique<EditUndoInsertFeature>(pEditEngine, CreateEPaM(aPaM), rItem));
+ InsertUndo(std::make_unique<EditUndoInsertFeature>(pEditEngine, CreateEPaM(aPaM), rItem));
aPaM = aEditDoc.InsertFeature( aPaM, rItem );
UpdateFields();
@@ -2827,7 +2826,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttrib
}
if ( IsUndoEnabled() && !IsInUndo() )
- InsertUndo(o3tl::make_unique<EditUndoSplitPara>(pEditEngine, aEditDoc.GetPos(rPaM.GetNode()), rPaM.GetIndex()));
+ InsertUndo(std::make_unique<EditUndoSplitPara>(pEditEngine, aEditDoc.GetPos(rPaM.GetNode()), rPaM.GetIndex()));
EditPaM aPaM( aEditDoc.InsertParaBreak( rPaM, bKeepEndingAttribs ) );
@@ -2886,10 +2885,10 @@ EditPaM ImpEditEngine::ImpFastInsertParagraph( sal_Int32 nPara )
if ( nPara )
{
OSL_ENSURE( aEditDoc.GetObject( nPara-1 ), "FastInsertParagraph: Prev does not exist" );
- InsertUndo(o3tl::make_unique<EditUndoSplitPara>(pEditEngine, nPara-1, aEditDoc.GetObject( nPara-1 )->Len()));
+ InsertUndo(std::make_unique<EditUndoSplitPara>(pEditEngine, nPara-1, aEditDoc.GetObject( nPara-1 )->Len()));
}
else
- InsertUndo(o3tl::make_unique<EditUndoSplitPara>(pEditEngine, 0, 0));
+ InsertUndo(std::make_unique<EditUndoSplitPara>(pEditEngine, 0, 0));
}
ContentNode* pNode = new ContentNode( aEditDoc.GetItemPool() );
@@ -2901,7 +2900,7 @@ EditPaM ImpEditEngine::ImpFastInsertParagraph( sal_Int32 nPara )
aEditDoc.Insert(nPara, pNode);
- GetParaPortions().Insert(nPara, o3tl::make_unique<ParaPortion>( pNode ));
+ GetParaPortions().Insert(nPara, std::make_unique<ParaPortion>( pNode ));
if ( IsCallParaInsertedOrDeleted() )
GetEditEnginePtr()->ParagraphInserted( nPara );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 959d10618fdf..e4a37a0f696e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -68,7 +68,6 @@
#include <com/sun/star/text/CharacterCompressionType.hpp>
#include <vcl/pdfextoutdevdata.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <o3tl/make_unique.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
@@ -3889,7 +3888,7 @@ void ImpEditEngine::InsertContent( ContentNode* pNode, sal_Int32 nPos )
{
DBG_ASSERT( pNode, "NULL-Pointer in InsertContent! " );
DBG_ASSERT( IsInUndo(), "InsertContent only for Undo()!" );
- GetParaPortions().Insert(nPos, o3tl::make_unique<ParaPortion>( pNode ));
+ GetParaPortions().Insert(nPos, std::make_unique<ParaPortion>( pNode ));
aEditDoc.Insert(nPos, pNode);
if ( IsCallParaInsertedOrDeleted() )
GetEditEnginePtr()->ParagraphInserted( nPos );
@@ -3942,7 +3941,7 @@ void ImpEditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
{
// Mark as deleted, so that no selection will end or begin at
// this paragraph...
- aDeletedNodes.push_back(o3tl::make_unique<DeletedNodeInfo>( pPPortion->GetNode(), nParagraph ));
+ aDeletedNodes.push_back(std::make_unique<DeletedNodeInfo>( pPPortion->GetNode(), nParagraph ));
UpdateSelections();
// The region below will not be invalidated if UpdateMode = sal_False!
// If anyway, then save as sal_False before SetVisible !
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 5e90c85ebb38..d158d0f48a40 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -24,7 +24,6 @@
#include <svl/hint.hxx>
#include <editeng/lrspitem.hxx>
#include <sfx2/app.hxx>
-#include <o3tl/make_unique.hxx>
void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
{
@@ -80,7 +79,7 @@ void ImpEditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
aNewStyleName = pStyle->GetName();
InsertUndo(
- o3tl::make_unique<EditUndoSetStyleSheet>(pEditEngine, aEditDoc.GetPos( pNode ),
+ std::make_unique<EditUndoSetStyleSheet>(pEditEngine, aEditDoc.GetPos( pNode ),
aPrevStyleName, pCurStyle ? pCurStyle->GetFamily() : SfxStyleFamily::Para,
aNewStyleName, pStyle ? pStyle->GetFamily() : SfxStyleFamily::Para,
pNode->GetContentAttribs().GetItems() ) );
@@ -267,7 +266,7 @@ void ImpEditEngine::InsertUndo( std::unique_ptr<EditUndo> pUndo, bool bTryMerge
DBG_ASSERT( !IsInUndo(), "InsertUndo in Undo mode!" );
if ( pUndoMarkSelection )
{
- GetUndoManager().AddUndoAction( o3tl::make_unique<EditUndoMarkSelection>(pEditEngine, *pUndoMarkSelection) );
+ GetUndoManager().AddUndoAction( std::make_unique<EditUndoMarkSelection>(pEditEngine, *pUndoMarkSelection) );
pUndoMarkSelection.reset();
}
GetUndoManager().AddUndoAction( std::move(pUndo), bTryMerge );
@@ -691,11 +690,11 @@ void ImpEditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
{
SfxItemSet aTmpSet( GetEmptyItemSet() );
aTmpSet.Put( rSet );
- InsertUndo(o3tl::make_unique<EditUndoSetParaAttribs>(pEditEngine, nPara, pNode->GetContentAttribs().GetItems(), aTmpSet));
+ InsertUndo(std::make_unique<EditUndoSetParaAttribs>(pEditEngine, nPara, pNode->GetContentAttribs().GetItems(), aTmpSet));
}
else
{
- InsertUndo(o3tl::make_unique<EditUndoSetParaAttribs>(pEditEngine, nPara, pNode->GetContentAttribs().GetItems(), rSet));
+ InsertUndo(std::make_unique<EditUndoSetParaAttribs>(pEditEngine, nPara, pNode->GetContentAttribs().GetItems(), rSet));
}
}
diff --git a/editeng/source/items/CustomPropertyField.cxx b/editeng/source/items/CustomPropertyField.cxx
index d46b47af52ae..77f4aff243aa 100644
--- a/editeng/source/items/CustomPropertyField.cxx
+++ b/editeng/source/items/CustomPropertyField.cxx
@@ -9,7 +9,6 @@
*/
#include <editeng/CustomPropertyField.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/metaact.hxx>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -30,7 +29,7 @@ CustomPropertyField::~CustomPropertyField()
std::unique_ptr<SvxFieldData> CustomPropertyField::Clone() const
{
- return o3tl::make_unique<CustomPropertyField>(msName, msCurrentPresentation);
+ return std::make_unique<CustomPropertyField>(msName, msCurrentPresentation);
}
bool CustomPropertyField::operator==(const SvxFieldData& rOther) const
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 91a1b340ffb6..873e82380914 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -21,7 +21,6 @@
#include <vcl/metaact.hxx>
#include <svl/zforlist.hxx>
#include <tools/urlobj.hxx>
-#include <o3tl/make_unique.hxx>
#include <editeng/flditem.hxx>
#include <editeng/CustomPropertyField.hxx>
@@ -252,7 +251,7 @@ SvxFieldData::~SvxFieldData()
std::unique_ptr<SvxFieldData> SvxFieldData::Clone() const
{
- return o3tl::make_unique<SvxFieldData>();
+ return std::make_unique<SvxFieldData>();
}
@@ -341,7 +340,7 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF
std::unique_ptr<SvxFieldData> SvxDateField::Clone() const
{
- return o3tl::make_unique<SvxDateField>( *this );
+ return std::make_unique<SvxDateField>( *this );
}
@@ -449,7 +448,7 @@ SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLF
std::unique_ptr<SvxFieldData> SvxURLField::Clone() const
{
- return o3tl::make_unique<SvxURLField>( *this );
+ return std::make_unique<SvxURLField>( *this );
}
@@ -483,7 +482,7 @@ SvxPageTitleField::SvxPageTitleField() {}
std::unique_ptr<SvxFieldData> SvxPageTitleField::Clone() const
{
- return o3tl::make_unique<SvxPageTitleField>();
+ return std::make_unique<SvxPageTitleField>();
}
bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const
@@ -506,7 +505,7 @@ SvxPageField::SvxPageField() {}
std::unique_ptr<SvxFieldData> SvxPageField::Clone() const
{
- return o3tl::make_unique<SvxPageField>(); // empty
+ return std::make_unique<SvxPageField>(); // empty
}
bool SvxPageField::operator==( const SvxFieldData& rCmp ) const
@@ -524,7 +523,7 @@ SvxPagesField::SvxPagesField() {}
std::unique_ptr<SvxFieldData> SvxPagesField::Clone() const
{
- return o3tl::make_unique<SvxPagesField>(); // empty
+ return std::make_unique<SvxPagesField>(); // empty
}
bool SvxPagesField::operator==( const SvxFieldData& rCmp ) const
@@ -536,7 +535,7 @@ SvxTimeField::SvxTimeField() {}
std::unique_ptr<SvxFieldData> SvxTimeField::Clone() const
{
- return o3tl::make_unique<SvxTimeField>(); // empty
+ return std::make_unique<SvxTimeField>(); // empty
}
bool SvxTimeField::operator==( const SvxFieldData& rCmp ) const
@@ -553,7 +552,7 @@ SvxFileField::SvxFileField() {}
std::unique_ptr<SvxFieldData> SvxFileField::Clone() const
{
- return o3tl::make_unique<SvxFileField>(); // empty
+ return std::make_unique<SvxFileField>(); // empty
}
bool SvxFileField::operator==( const SvxFieldData& rCmp ) const
@@ -573,7 +572,7 @@ void SvxTableField::SetTab(int nTab)
std::unique_ptr<SvxFieldData> SvxTableField::Clone() const
{
- return o3tl::make_unique<SvxTableField>(mnTab);
+ return std::make_unique<SvxTableField>(mnTab);
}
bool SvxTableField::operator==( const SvxFieldData& rCmp ) const
@@ -605,7 +604,7 @@ SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxT
std::unique_ptr<SvxFieldData> SvxExtTimeField::Clone() const
{
- return o3tl::make_unique<SvxExtTimeField>( *this );
+ return std::make_unique<SvxExtTimeField>( *this );
}
@@ -718,7 +717,7 @@ SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileF
std::unique_ptr<SvxFieldData> SvxExtFileField::Clone() const
{
- return o3tl::make_unique<SvxExtFileField>( *this );
+ return std::make_unique<SvxExtFileField>( *this );
}
@@ -828,7 +827,7 @@ SvxAuthorField::SvxAuthorField( const OUString& rFirstName,
std::unique_ptr<SvxFieldData> SvxAuthorField::Clone() const
{
- return o3tl::make_unique<SvxAuthorField>( *this );
+ return std::make_unique<SvxAuthorField>( *this );
}
@@ -875,7 +874,7 @@ SvxHeaderField::SvxHeaderField() {}
std::unique_ptr<SvxFieldData> SvxHeaderField::Clone() const
{
- return o3tl::make_unique<SvxHeaderField>(); // empty
+ return std::make_unique<SvxHeaderField>(); // empty
}
bool SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
@@ -887,7 +886,7 @@ SvxFooterField::SvxFooterField() {}
std::unique_ptr<SvxFieldData> SvxFooterField::Clone() const
{
- return o3tl::make_unique<SvxFooterField>(); // empty
+ return std::make_unique<SvxFooterField>(); // empty
}
bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const
@@ -897,7 +896,7 @@ bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const
std::unique_ptr<SvxFieldData> SvxDateTimeField::Clone() const
{
- return o3tl::make_unique<SvxDateTimeField>(); // empty
+ return std::make_unique<SvxDateTimeField>(); // empty
}
bool SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 4050871d515f..288826406551 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -19,7 +19,6 @@
#include <editeng/measfld.hxx>
-#include <o3tl/make_unique.hxx>
SdrMeasureField::~SdrMeasureField()
{
@@ -27,7 +26,7 @@ SdrMeasureField::~SdrMeasureField()
std::unique_ptr<SvxFieldData> SdrMeasureField::Clone() const
{
- return o3tl::make_unique<SdrMeasureField>(*this);
+ return std::make_unique<SdrMeasureField>(*this);
}
bool SdrMeasureField::operator==(const SvxFieldData& rSrc) const
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 763d89607942..019fb06eb621 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/style/CaseMap.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/frame/status/FontHeight.hpp>
-#include <o3tl/make_unique.hxx>
#include <vcl/bitmapex.hxx>
#include <tools/stream.hxx>
#include <math.h>
@@ -2799,7 +2798,7 @@ bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal,
*************************************************************************/
SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
- : SfxSetItem( nSlotId, o3tl::make_unique<SfxItemSet>( rPool,
+ : SfxSetItem( nSlotId, std::make_unique<SfxItemSet>( rPool,
svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT>{} ))
{
sal_uInt16 nLatin, nAsian, nComplex;
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index a102db77d024..ce4de850736a 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/xml/AttributeData.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <xmloff/xmlcnimp.hxx>
#include <xmloff/unoatrcn.hxx>
#include <editeng/xmlcnitm.hxx>
@@ -78,7 +77,7 @@ sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/
bool SvXMLAttrContainerItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
Reference<XNameContainer> xContainer
- = new SvUnoAttributeContainer(o3tl::make_unique<SvXMLAttrContainerData>(*pImpl));
+ = new SvUnoAttributeContainer(std::make_unique<SvXMLAttrContainerData>(*pImpl));
rVal <<= xContainer;
return true;
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 9eb6f792340e..660a7d7d77c4 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -33,7 +33,6 @@
#include <editeng/eeitem.hxx>
#include <editeng/editstat.hxx>
#include "outlundo.hxx"
-#include <o3tl/make_unique.hxx>
OutlinerEditEng::OutlinerEditEng( Outliner* pEngOwner, SfxItemPool* pPool )
: EditEngine( pPool )
@@ -97,7 +96,7 @@ void OutlinerEditEng::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int3
Paragraph* pPara = pOwner->GetParagraph( nRightParagraph );
if( pPara && Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) )
{
- pOwner->InsertUndo( o3tl::make_unique<OutlinerUndoChangeParaFlags>( pOwner, nRightParagraph, ParaFlag::ISPAGE, ParaFlag::NONE ) );
+ pOwner->InsertUndo( std::make_unique<OutlinerUndoChangeParaFlags>( pOwner, nRightParagraph, ParaFlag::ISPAGE, ParaFlag::NONE ) );
}
}
}
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 5d448f579d69..6d597398654c 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -53,7 +53,6 @@
#include <libxml/xmlwriter.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
// calculate if it's RTL or not
#include <unicode/ubidi.h>
@@ -277,7 +276,7 @@ void Outliner::SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStar
if( pPara && pPara->GetNumberingStartValue() != nNumberingStartValue )
{
if( IsUndoEnabled() && !IsInUndo() )
- InsertUndo( o3tl::make_unique<OutlinerUndoChangeParaNumberingRestart>( this, nPara,
+ InsertUndo( std::make_unique<OutlinerUndoChangeParaNumberingRestart>( this, nPara,
pPara->GetNumberingStartValue(), nNumberingStartValue,
pPara->IsParaIsNumberingRestart(), pPara->IsParaIsNumberingRestart() ) );
@@ -301,7 +300,7 @@ void Outliner::SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumbering
if( pPara && (pPara->IsParaIsNumberingRestart() != bParaIsNumberingRestart) )
{
if( IsUndoEnabled() && !IsInUndo() )
- InsertUndo( o3tl::make_unique<OutlinerUndoChangeParaNumberingRestart>( this, nPara,
+ InsertUndo( std::make_unique<OutlinerUndoChangeParaNumberingRestart>( this, nPara,
pPara->GetNumberingStartValue(), pPara->GetNumberingStartValue(),
pPara->IsParaIsNumberingRestart(), bParaIsNumberingRestart ) );
@@ -734,7 +733,7 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd
if ( bUndo )
{
- InsertUndo( o3tl::make_unique<OutlinerUndoChangeDepth>( this, nPara, nOldDepth, nDepth ) );
+ InsertUndo( std::make_unique<OutlinerUndoChangeDepth>( this, nPara, nOldDepth, nDepth ) );
}
pEditEngine->SetUpdateMode( bUpdate );
@@ -1987,7 +1986,7 @@ void Outliner::SetParaFlag( Paragraph* pPara, ParaFlag nFlag )
if( pPara && !pPara->HasFlag( nFlag ) )
{
if( IsUndoEnabled() && !IsInUndo() )
- InsertUndo( o3tl::make_unique<OutlinerUndoChangeParaFlags>( this, GetAbsPos( pPara ), pPara->nFlags, pPara->nFlags|nFlag ) );
+ InsertUndo( std::make_unique<OutlinerUndoChangeParaFlags>( this, GetAbsPos( pPara ), pPara->nFlags, pPara->nFlags|nFlag ) );
pPara->SetFlag( nFlag );
}
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index c061a039a67a..1b7013839aeb 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -47,7 +47,6 @@
#include <editeng/editstat.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -406,7 +405,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
pOwner->ImplCalcBulletText( nPara, false, false );
if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
- pOwner->InsertUndo( o3tl::make_unique<OutlinerUndoCheckPara>( pOwner, nPara ) );
+ pOwner->InsertUndo( std::make_unique<OutlinerUndoCheckPara>( pOwner, nPara ) );
}
if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
@@ -479,7 +478,7 @@ void OutlinerView::Indent( short nDiff )
pOwner->pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) );
if( bUndo )
- pOwner->InsertUndo( o3tl::make_unique<OutlinerUndoChangeParaFlags>( pOwner, nPara, nPrevFlags, pPara->nFlags ) );
+ pOwner->InsertUndo( std::make_unique<OutlinerUndoChangeParaFlags>( pOwner, nPara, nPrevFlags, pPara->nFlags ) );
continue;
}
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 79393490cf22..efc60ef66bd6 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -21,7 +21,6 @@
#include <editeng/unoedhlp.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
-#include <o3tl/make_unique.hxx>
#include <svl/itemset.hxx>
#include <osl/diagnose.h>
@@ -80,7 +79,7 @@ std::unique_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify cons
}
}
- return o3tl::make_unique<SfxHint>( );
+ return std::make_unique<SfxHint>( );
}
void SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell )
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx
index e13ad7260d2b..dd3b38194e68 100644
--- a/embedserv/source/inprocserv/advisesink.cxx
+++ b/embedserv/source/inprocserv/advisesink.cxx
@@ -19,8 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
-
#include "advisesink.hxx"
namespace inprocserv
@@ -64,7 +62,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList
{
if ( pFormatEtc )
{
- m_pFormatEtc = o3tl::make_unique<FORMATETC>();
+ m_pFormatEtc = std::make_unique<FORMATETC>();
m_pFormatEtc->cfFormat = pFormatEtc->cfFormat;
m_pFormatEtc->ptd = nullptr;
m_pFormatEtc->dwAspect = pFormatEtc->dwAspect;
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index 8720573e05fc..fc1ec644d9dc 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -26,7 +26,6 @@
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/lineinfo.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/outdevstate.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index d2c002da0900..4ad544efcb56 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -23,7 +23,6 @@
#include <osl/diagnose.h>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <vcl/dibtools.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/safeint.hxx>
#include <tools/stream.hxx>
#include <memory>
@@ -1002,7 +1001,7 @@ namespace emfio
default :
aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE );
}
- CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
+ CreateObjectIndexed(nIndex, std::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
}
}
break;
@@ -1092,7 +1091,7 @@ namespace emfio
default :
aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE );
}
- CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfLineStyle>( aColorRef, aLineInfo, bTransparent ));
+ CreateObjectIndexed(nIndex, std::make_unique<WinMtfLineStyle>( aColorRef, aLineInfo, bTransparent ));
}
}
break;
@@ -1104,7 +1103,7 @@ namespace emfio
if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
{
mpInputStream->ReadUInt32( nStyle );
- CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
+ CreateObjectIndexed(nIndex, std::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
}
}
break;
@@ -1565,7 +1564,7 @@ namespace emfio
// aLogFont.lfHeight = aTransVec.getY();
if (mpInputStream->good() && aLogFont.lfHeight != SAL_MIN_INT32 && aLogFont.lfWidth != SAL_MIN_INT32)
{
- CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFontStyle>( aLogFont ));
+ CreateObjectIndexed(nIndex, std::make_unique<WinMtfFontStyle>( aLogFont ));
}
}
}
@@ -1759,7 +1758,7 @@ namespace emfio
}
}
- CreateObjectIndexed(nIndex, o3tl::make_unique<WinMtfFillStyle>( aBitmap ));
+ CreateObjectIndexed(nIndex, std::make_unique<WinMtfFillStyle>( aBitmap ));
}
break;
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 3c1bf8347622..7ffc9c62bafb 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -36,7 +36,6 @@
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <vcl/virdev.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/safeint.hxx>
#include <officecfg/Setup.hxx>
#include <officecfg/Office/Linguistic.hxx>
@@ -777,7 +776,7 @@ namespace emfio
void MtfTools::CreateObject()
{
- CreateObject(o3tl::make_unique<GDIObj>());
+ CreateObject(std::make_unique<GDIObj>());
}
void MtfTools::DeleteObject( sal_Int32 nIndex )
diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
index 56169f051fed..24824381516c 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -32,7 +32,6 @@
#include <vcl/outdev.hxx>
#include <vcl/wmfexternal.hxx>
#include <tools/fract.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/bitmapaccess.hxx>
#include <vcl/BitmapTools.hxx>
#include <osl/thread.h>
@@ -826,7 +825,7 @@ namespace emfio
nCount++;
}
Color aColor( static_cast<sal_uInt8>( nRed / nCount ), static_cast<sal_uInt8>( nGreen / nCount ), static_cast<sal_uInt8>( nBlue / nCount ) );
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( aColor, false ));
+ CreateObject(std::make_unique<WinMtfFillStyle>( aColor, false ));
}
break;
@@ -846,13 +845,13 @@ namespace emfio
case W_META_CREATEBRUSH:
{
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
+ CreateObject(std::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
}
break;
case W_META_CREATEPATTERNBRUSH:
{
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
+ CreateObject(std::make_unique<WinMtfFillStyle>( COL_WHITE, false ));
}
break;
@@ -929,7 +928,7 @@ namespace emfio
default :
aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE );
}
- CreateObject(o3tl::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
+ CreateObject(std::make_unique<WinMtfLineStyle>( ReadColor(), aLineInfo, bTransparent ));
}
break;
@@ -937,7 +936,7 @@ namespace emfio
{
sal_uInt16 nStyle = 0;
mpInputStream->ReadUInt16( nStyle );
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
+ CreateObject(std::make_unique<WinMtfFillStyle>( ReadColor(), ( nStyle == BS_HOLLOW ) ));
}
break;
@@ -981,7 +980,7 @@ namespace emfio
eCharSet = RTL_TEXTENCODING_MS_1252;
aLogFont.alfFaceName = OUString( lfFaceName, strlen(lfFaceName), eCharSet );
- CreateObject(o3tl::make_unique<WinMtfFontStyle>( aLogFont ));
+ CreateObject(std::make_unique<WinMtfFontStyle>( aLogFont ));
}
break;
@@ -1159,7 +1158,7 @@ namespace emfio
mpEMFStream.reset();
}
else
- mpEMFStream = o3tl::make_unique<SvMemoryStream>(mnEMFSize, 0);
+ mpEMFStream = std::make_unique<SvMemoryStream>(mnEMFSize, 0);
}
else if( (mnEMFRecCount != nComRecCount ) || (mnEMFSize != nEMFTotalSize ) ) // add additional checks here
{
@@ -1431,7 +1430,7 @@ namespace emfio
{
GDIMetaFile aMeta;
mpEMFStream->Seek( 0 );
- std::unique_ptr<EmfReader> pEMFReader(o3tl::make_unique<EmfReader>( *mpEMFStream, aMeta ));
+ std::unique_ptr<EmfReader> pEMFReader(std::make_unique<EmfReader>( *mpEMFStream, aMeta ));
bEMFAvailable = pEMFReader->ReadEnhWMF();
pEMFReader.reset(); // destroy first!!!
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 22a558ac83d8..262d0cd8c763 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <comphelper/processfactory.hxx>
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -287,7 +286,7 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp
break;
}
}
- mvMappings.push_back(o3tl::make_unique<Mapping>(*pSetMapping));
+ mvMappings.push_back(std::make_unique<Mapping>(*pSetMapping));
SetModified();
}
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 5ec9d92005b3..8ac29d500d07 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -50,7 +50,6 @@
#include <sot/formats.hxx>
#include <vcl/edit.hxx>
#include <osl/mutex.hxx>
-#include <o3tl/make_unique.hxx>
#include <unordered_map>
@@ -602,7 +601,7 @@ void BibFrameController_Impl::addStatusListener(
{
BibConfig* pConfig = BibModul::GetConfig();
// create a new Reference and insert into listener array
- aStatusListeners.push_back( o3tl::make_unique<BibStatusDispatch>( aURL, aListener ) );
+ aStatusListeners.push_back( std::make_unique<BibStatusDispatch>( aURL, aListener ) );
// send first status synchronously
FeatureStateEvent aEvent;
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index 188df1c1cce6..8fcc5dfcf5ca 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -17,7 +17,6 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <map>
-#include <o3tl/make_unique.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <sal/log.hxx>
@@ -324,7 +323,7 @@ public:
GetUserNameExW(NameDisplay, nullptr, &nSize);
if (GetLastError() != ERROR_MORE_DATA)
throw css::uno::RuntimeException();
- auto pNameBuf(o3tl::make_unique<wchar_t[]>(nSize));
+ auto pNameBuf(std::make_unique<wchar_t[]>(nSize));
if (!GetUserNameExW(NameDisplay, pNameBuf.get(), &nSize))
throw css::uno::RuntimeException();
m_sName = o3tl::toU(pNameBuf.get());
@@ -335,7 +334,7 @@ public:
// administrator account on non-DC systems), where GetUserName will
// still give a name.
DWORD nSize = UNLEN + 1;
- auto pNameBuf(o3tl::make_unique<wchar_t[]>(nSize));
+ auto pNameBuf(std::make_unique<wchar_t[]>(nSize));
if (!GetUserNameW(pNameBuf.get(), &nSize))
throw css::uno::RuntimeException();
m_sName = o3tl::toU(pNameBuf.get());
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index d170f7637c48..9d0516f37683 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -20,7 +20,6 @@
#include "controlfontdialog.hxx"
#include <cppuhelper/typeprovider.hxx>
-#include <o3tl/make_unique.hxx>
#include "fontdialog.hxx"
#include "formstrings.hxx"
#include "pcrcommon.hxx"
@@ -149,7 +148,7 @@ namespace pcr
// sets a new introspectee and re-executes us. In this case, the dialog returned here (upon the first
// execute) will be re-used upon the second execute, and thus it won't be initialized correctly.
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<ControlCharacterDialog>(Application::GetFrameWeld(rParent), *m_pFontItems));
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<ControlCharacterDialog>(Application::GetFrameWeld(rParent), *m_pFontItems));
}
void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult)
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 0e2f60dddf6b..29fb682df360 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -42,8 +42,6 @@
#include <comphelper/sequence.hxx>
#include <comphelper/processfactory.hxx>
-#include <o3tl/make_unique.hxx>
-
#include <unotools/configmgr.hxx>
#include <unotools/configpaths.hxx>
#include <rtl/ustrbuf.hxx>
@@ -125,7 +123,7 @@ std::unique_ptr<FilterCache> FilterCache::clone() const
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
- auto pClone = o3tl::make_unique<FilterCache>();
+ auto pClone = std::make_unique<FilterCache>();
// Don't copy the configuration access points here.
// They will be created on demand inside the cloned instance,
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index 36f45393ea3d..bf98963358cd 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -23,7 +23,6 @@
#include <sal/types.h>
#include "cgmtypes.hxx"
#include <vcl/salbtype.hxx>
-#include <o3tl/make_unique.hxx>
#include <vector>
#include <memory>
@@ -45,7 +44,7 @@ public:
, mnColor( 0 )
{};
- virtual std::unique_ptr<Bundle> Clone() { return o3tl::make_unique<Bundle>( *this ); };
+ virtual std::unique_ptr<Bundle> Clone() { return std::make_unique<Bundle>( *this ); };
virtual ~Bundle() {} ;
@@ -68,7 +67,7 @@ public:
, nLineWidth(0)
{}
- virtual std::unique_ptr<Bundle> Clone() override { return o3tl::make_unique<LineBundle>( *this ); }
+ virtual std::unique_ptr<Bundle> Clone() override { return std::make_unique<LineBundle>( *this ); }
};
@@ -84,7 +83,7 @@ public:
, nMarkerSize( 0.0 )
{};
- virtual std::unique_ptr<Bundle> Clone() override { return o3tl::make_unique<MarkerBundle>( *this ); } ;
+ virtual std::unique_ptr<Bundle> Clone() override { return std::make_unique<MarkerBundle>( *this ); } ;
};
@@ -99,7 +98,7 @@ public:
: eEdgeType(ET_NONE)
, nEdgeWidth(0)
{}
- virtual std::unique_ptr<Bundle> Clone() override { return o3tl::make_unique<EdgeBundle>( *this ); }
+ virtual std::unique_ptr<Bundle> Clone() override { return std::make_unique<EdgeBundle>( *this ); }
};
@@ -119,7 +118,7 @@ public:
, nCharacterSpacing( 0.0 )
{};
- virtual std::unique_ptr<Bundle> Clone() override { return o3tl::make_unique<TextBundle>( *this ); } ;
+ virtual std::unique_ptr<Bundle> Clone() override { return std::make_unique<TextBundle>( *this ); } ;
};
@@ -136,7 +135,7 @@ public:
, nFillPatternIndex(0)
, nFillHatchIndex(0)
{}
- virtual std::unique_ptr<Bundle> Clone() override { return o3tl::make_unique<FillBundle>( *this ); }
+ virtual std::unique_ptr<Bundle> Clone() override { return std::make_unique<FillBundle>( *this ); }
};
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 52f83f00f8ab..50e10a4af1fb 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -19,7 +19,6 @@
#include "eschesdo.hxx"
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <svx/svdxcgv.hxx>
#include <svx/svdomedia.hxx>
#include <svx/xflftrit.hxx>
@@ -3790,7 +3789,7 @@ bool EscherPersistTable::PtIsID( sal_uInt32 nID )
void EscherPersistTable::PtInsert( sal_uInt32 nID, sal_uInt32 nOfs )
{
- maPersistTable.push_back( o3tl::make_unique<EscherPersistEntry>( nID, nOfs ) );
+ maPersistTable.push_back( std::make_unique<EscherPersistEntry>( nID, nOfs ) );
}
void EscherPersistTable::PtDelete( sal_uInt32 nID )
@@ -4645,7 +4644,7 @@ EscherSolverContainer::~EscherSolverContainer()
void EscherSolverContainer::AddShape( const uno::Reference<drawing::XShape> & rXShape, sal_uInt32 nId )
{
- maShapeList.push_back( o3tl::make_unique<EscherShapeListEntry>( rXShape, nId ) );
+ maShapeList.push_back( std::make_unique<EscherShapeListEntry>( rXShape, nId ) );
}
void EscherSolverContainer::AddConnector(
@@ -4656,7 +4655,7 @@ void EscherSolverContainer::AddConnector(
uno::Reference<drawing::XShape> const & rConB
)
{
- maConnectorList.push_back( o3tl::make_unique<EscherConnectorListEntry>( rConnector, rPA, rConA, rPB, rConB ) );
+ maConnectorList.push_back( std::make_unique<EscherConnectorListEntry>( rConnector, rPA, rConA, rPB, rConB ) );
}
sal_uInt32 EscherSolverContainer::GetShapeId( const uno::Reference<drawing::XShape> & rXShape ) const
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index e9e6cbfe2f24..2a934272186a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -142,7 +142,6 @@
#include <rtl/ustring.hxx>
#include <svtools/embedhlp.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star ;
using namespace ::com::sun::star::drawing;
@@ -6288,7 +6287,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
}
m_xShapeInfosByTxBxComp->insert(std::make_shared<SvxMSDffShapeInfo>(
aInfo));
- m_aShapeOrders.push_back(o3tl::make_unique<SvxMSDffShapeOrder>(
+ m_aShapeOrders.push_back(std::make_unique<SvxMSDffShapeOrder>(
aInfo.nShapeId ));
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 03f9dc9d1cf7..02aa7f0a0d37 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -121,7 +121,6 @@
#include <vcl/virdev.hxx>
#include <svtools/embedhlp.hxx>
#include <o3tl/enumrange.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/safeint.hxx>
#include <boost/optional.hpp>
#include <sal/log.hxx>
@@ -4067,7 +4066,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
const PPTTextParagraphStyleAtomInterpreter& rTxPFStyle,
const PPTTextSpecInfo& rTextSpecInfo ) :
- PPTNumberFormatCreator ( o3tl::make_unique<PPTExtParaProv>( rManager, rIn, &rSlideHd ) ),
+ PPTNumberFormatCreator ( std::make_unique<PPTExtParaProv>( rManager, rIn, &rSlideHd ) ),
maTxSI ( rTextSpecInfo )
{
sal_uInt32 nOldFilePos = rIn.Tell();
@@ -5291,7 +5290,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe
bTextPropAtom, nExtParaPos, aStyleTextProp9, nExtParaFlags,
nBuBlip, nHasAnm, nAnmScheme );
- aCharPropList.push_back(o3tl::make_unique<PPTCharPropSet>(aCharPropSet, 0));
+ aCharPropList.push_back(std::make_unique<PPTCharPropSet>(aCharPropSet, 0));
}
}
@@ -5353,7 +5352,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe
aCharPropSet.maString.clear();
if ( nLen || bEmptyParaPossible )
aCharPropList.push_back(
- o3tl::make_unique<PPTCharPropSet>(aCharPropSet, nCurrentPara));
+ std::make_unique<PPTCharPropSet>(aCharPropSet, nCurrentPara));
nCurrentPara++;
nLen++;
nCharReadCnt += nLen;
@@ -5367,7 +5366,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe
nLen = ( nCurrentSpecMarker & 0xffff ) - nCharReadCnt;
aCharPropSet.maString = aString.copy(nCharReadCnt, nLen);
aCharPropList.push_back(
- o3tl::make_unique<PPTCharPropSet>(aCharPropSet, nCurrentPara));
+ std::make_unique<PPTCharPropSet>(aCharPropSet, nCurrentPara));
nCharCount -= nLen;
nCharReadCnt += nLen;
}
@@ -5395,7 +5394,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe
aCharPropSet.maString = aString.copy(nCharReadCnt, nStrLen);
}
aCharPropList.push_back(
- o3tl::make_unique<PPTCharPropSet>(aCharPropSet, nCurrentPara));
+ std::make_unique<PPTCharPropSet>(aCharPropSet, nCurrentPara));
nCharReadCnt += nCharCount;
bEmptyParaPossible = false;
break;
@@ -5870,7 +5869,7 @@ PPTParagraphObj::~PPTParagraphObj()
void PPTParagraphObj::AppendPortion( PPTPortionObj& rPPTPortion )
{
m_PortionList.push_back(
- o3tl::make_unique<PPTPortionObj>(rPPTPortion));
+ std::make_unique<PPTPortionObj>(rPPTPortion));
if ( !mbTab )
{
mbTab = m_PortionList.back()->HasTabulator();
@@ -7611,7 +7610,7 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, const sal_uInt32
{
SdrText* pSdrText = pTable->getText( nTableIndex );
if ( pSdrText )
- pSdrText->SetOutlinerParaObject(o3tl::make_unique<OutlinerParaObject>(*pParaObject) );
+ pSdrText->SetOutlinerParaObject(std::make_unique<OutlinerParaObject>(*pParaObject) );
}
}
}
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index c1f9082cfa72..f494759fb7bf 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -24,7 +24,6 @@
#include <svl/solar.hrc>
#include <com/sun/star/view/XRenderable.hpp>
#include <comphelper/processfactory.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -87,7 +86,7 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames()
svt::OGenericUnoDialog::Dialog PDFDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent)
{
if( mxSrcDoc.is() )
- return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<ImpPDFTabDialog>(Application::GetFrameWeld(rParent), maFilterData, mxSrcDoc));
+ return svt::OGenericUnoDialog::Dialog(std::make_unique<ImpPDFTabDialog>(Application::GetFrameWeld(rParent), maFilterData, mxSrcDoc));
return svt::OGenericUnoDialog::Dialog();
}
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index ddce581d9960..73f085813d22 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -26,7 +26,6 @@
#include <formula/FormulaOpCodeMapperObj.hxx>
#include <formula/opcode.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <o3tl/make_unique.hxx>
namespace formula
{
@@ -103,7 +102,7 @@ uno::Sequence< OUString > FormulaOpCodeMapperObj::getSupportedServiceNames_Stati
uno::Reference< uno::XInterface > FormulaOpCodeMapperObj::create(
uno::Reference< uno::XComponentContext > const & /*_xContext*/)
{
- return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(o3tl::make_unique<FormulaCompiler>()));
+ return static_cast<sheet::XFormulaOpCodeMapper*>(new FormulaOpCodeMapperObj(std::make_unique<FormulaCompiler>()));
}
} // formula
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 862d0a6c3a18..f4d5e8bee508 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -33,7 +33,6 @@
#include <svl/undo.hxx>
#include <tools/diagnose_ex.h>
#include <osl/conditn.hxx>
-#include <o3tl/make_unique.hxx>
#include <functional>
#include <stack>
@@ -656,7 +655,7 @@ namespace framework
const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount() > 0 );
{
::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning );
- rUndoManager.AddUndoAction( o3tl::make_unique<UndoActionWrapper>( i_action ) );
+ rUndoManager.AddUndoAction( std::make_unique<UndoActionWrapper>( i_action ) );
}
const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount() > 0 );
More information about the Libreoffice-commits
mailing list