[Libreoffice-commits] core.git: sax/source scripting/source sdext/source sd/inc sd/source sfx2/inc sfx2/source shell/source starmath/inc starmath/source svl/source svtools/inc svtools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 28 08:52:57 UTC 2019
sax/source/expatwrap/xml2utf.cxx | 5 -
sax/source/fastparser/legacyfastparser.cxx | 3 -
scripting/source/stringresource/stringresource.cxx | 5 -
sd/inc/pch/precompiled_sd.hxx | 1
sd/source/core/annotations/Annotation.cxx | 5 -
sd/source/core/drawdoc3.cxx | 19 +++----
sd/source/core/sdpage.cxx | 11 +---
sd/source/core/sdpage2.cxx | 3 -
sd/source/core/text/textapi.cxx | 5 -
sd/source/core/undo/undofactory.cxx | 13 ++---
sd/source/filter/eppt/pptx-animations.cxx | 5 -
sd/source/filter/eppt/pptx-text.cxx | 3 -
sd/source/filter/ppt/propread.cxx | 13 ++---
sd/source/ui/animations/CustomAnimationList.cxx | 9 +--
sd/source/ui/animations/CustomAnimationPane.cxx | 5 -
sd/source/ui/animations/motionpathtag.cxx | 23 ++++-----
sd/source/ui/app/sddll.cxx | 3 -
sd/source/ui/app/sdmod2.cxx | 3 -
sd/source/ui/dlg/TemplateScanner.cxx | 3 -
sd/source/ui/dlg/sddlgfact.cxx | 37 +++++++-------
sd/source/ui/dlg/sdtreelb.cxx | 3 -
sd/source/ui/dlg/unchss.cxx | 6 --
sd/source/ui/docshell/docshel4.cxx | 15 ++---
sd/source/ui/docshell/docshell.cxx | 1
sd/source/ui/func/fulinend.cxx | 3 -
sd/source/ui/func/fupage.cxx | 3 -
sd/source/ui/func/fuprobjs.cxx | 3 -
sd/source/ui/func/undoback.cxx | 8 +--
sd/source/ui/remotecontrol/BluetoothServer.cxx | 9 +--
sd/source/ui/sidebar/DocumentHelper.cxx | 5 -
sd/source/ui/sidebar/MasterPagesSelector.cxx | 3 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 5 -
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 3 -
sd/source/ui/unoidl/unopback.cxx | 5 -
sd/source/ui/view/OutlinerIterator.cxx | 5 -
sd/source/ui/view/ViewShellImplementation.cxx | 4 -
sd/source/ui/view/drawview.cxx | 9 +--
sd/source/ui/view/drviews2.cxx | 5 -
sd/source/ui/view/drviews9.cxx | 11 +---
sd/source/ui/view/drviewsb.cxx | 3 -
sd/source/ui/view/drviewse.cxx | 3 -
sd/source/ui/view/sdview3.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 5 -
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 3 -
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 13 ++---
sfx2/inc/pch/precompiled_sfx.hxx | 1
sfx2/source/appl/workwin.cxx | 4 -
sfx2/source/bastyp/fltfnc.cxx | 3 -
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/dispatch.cxx | 2
sfx2/source/control/recentdocsview.cxx | 3 -
sfx2/source/control/unoctitm.cxx | 4 -
sfx2/source/dialog/dockwin.cxx | 4 -
sfx2/source/dialog/templdlg.cxx | 7 +-
sfx2/source/doc/docfile.cxx | 3 -
sfx2/source/doc/doctempl.cxx | 7 +-
sfx2/source/sidebar/SidebarController.cxx | 3 -
sfx2/source/view/classificationhelper.cxx | 3 -
shell/source/win32/simplemail/smplmailclient.cxx | 3 -
starmath/inc/pch/precompiled_sm.hxx | 1
starmath/source/ElementsDockingWindow.cxx | 7 +-
starmath/source/accessibility.cxx | 3 -
starmath/source/caret.cxx | 4 -
starmath/source/document.cxx | 13 ++---
starmath/source/edit.cxx | 3 -
starmath/source/mathmlimport.cxx | 9 +--
starmath/source/parse.cxx | 43 ++++++++---------
starmath/source/smdll.cxx | 3 -
starmath/source/smmod.cxx | 3 -
starmath/source/unomodel.cxx | 3 -
svl/source/items/style.cxx | 5 -
svl/source/items/stylepool.cxx | 3 -
svl/source/numbers/zforlist.cxx | 5 -
svl/source/svdde/ddecli.cxx | 3 -
svtools/inc/pch/precompiled_svt.hxx | 1
svtools/source/control/toolbarmenu.cxx | 8 +--
svtools/source/uno/treecontrolpeer.cxx | 4 -
77 files changed, 202 insertions(+), 277 deletions(-)
New commits:
commit 4e8a15ca224760e8f36952528b2b47def78fd865
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Mon Jan 21 23:47:35 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jan 28 09:52:28 2019 +0100
o3tl::make_unique -> std::make_unique in sax...svtools (except sc)
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I6eea0877eaa1886b64c0cce06a43b8088cbccd8e
Reviewed-on: https://gerrit.libreoffice.org/66751
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 6b240ae8b3f0..535075e1f7e2 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -22,7 +22,6 @@
#include <sal/types.h>
-#include <o3tl/make_unique.hxx>
#include <rtl/textenc.h>
#include <rtl/tencinfo.h>
#include <com/sun/star/io/NotConnectedException.hpp>
@@ -324,8 +323,8 @@ void XMLFile2UTFConverter::initializeDecoding()
rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( m_sEncoding.getStr() );
if( encoding != RTL_TEXTENCODING_UTF8 )
{
- m_pText2Unicode = o3tl::make_unique<Text2UnicodeConverter>( m_sEncoding );
- m_pUnicode2Text = o3tl::make_unique<Unicode2TextConverter>( RTL_TEXTENCODING_UTF8 );
+ m_pText2Unicode = std::make_unique<Text2UnicodeConverter>( m_sEncoding );
+ m_pUnicode2Text = std::make_unique<Unicode2TextConverter>( RTL_TEXTENCODING_UTF8 );
}
}
}
diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx
index e5322882032f..ba047016df8d 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -30,7 +30,6 @@
#include <sax/fastparser.hxx>
#include <memory>
#include <vector>
-#include <o3tl/make_unique.hxx>
using namespace std;
using namespace ::cppu;
@@ -85,7 +84,7 @@ void NamespaceHandler::addNSDeclAttributes( rtl::Reference < comphelper::Attribu
void NamespaceHandler::registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI )
{
- m_aNamespaceDefines.push_back( o3tl::make_unique<NamespaceDefine>(
+ m_aNamespaceDefines.push_back( std::make_unique<NamespaceDefine>(
rNamespacePrefix, rNamespaceURI) );
}
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 81639ef1ea3e..1215ab8ceba3 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <rtl/tencinfo.h>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
@@ -338,7 +337,7 @@ void StringResourceImpl::setDefaultLocale( const Locale& locale )
if( m_pDefaultLocaleItem )
{
m_aChangedDefaultLocaleVector.push_back(
- o3tl::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) );
+ std::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) );
}
m_pDefaultLocaleItem = pLocaleItem;
@@ -522,7 +521,7 @@ void StringResourceImpl::removeLocale( const Locale& locale )
if( m_pDefaultLocaleItem )
{
m_aChangedDefaultLocaleVector.push_back(
- o3tl::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) );
+ std::make_unique<LocaleItem>( m_pDefaultLocaleItem->m_locale ) );
}
m_pCurrentLocaleItem = nullptr;
m_pDefaultLocaleItem = nullptr;
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 66be4b1d39dd..75ed6e957972 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -351,7 +351,6 @@
#include <imapinfo.hxx>
#include <notifydocumentevent.hxx>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <pglink.hxx>
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 89a05063458b..f5f461b4de73 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -31,7 +31,6 @@
#include <cppuhelper/basemutex.hxx>
#include <unotools/datetime.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/viewsh.hxx>
#include <svx/svdundo.hxx>
@@ -352,7 +351,7 @@ void Annotation::createChangeUndo()
{
SdrModel* pModel = GetModel(); // TTTT should use reference
if( pModel && pModel->IsUndoEnabled() )
- pModel->AddUndo( o3tl::make_unique<UndoAnnotation>( *this ) );
+ pModel->AddUndo( std::make_unique<UndoAnnotation>( *this ) );
if( pModel )
{
@@ -380,7 +379,7 @@ std::unique_ptr<SdrUndoAction> CreateUndoInsertOrRemoveAnnotation( const Referen
Annotation* pAnnotation = dynamic_cast< Annotation* >( xAnnotation.get() );
if( pAnnotation )
{
- return o3tl::make_unique< UndoInsertOrRemoveAnnotation >( *pAnnotation, bInsert );
+ return std::make_unique< UndoInsertOrRemoveAnnotation >( *pAnnotation, bInsert );
}
else
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index ae17d208721e..56cdec6f4f50 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -30,7 +30,6 @@
#include <svx/svdundo.hxx>
#include <vcl/weld.hxx>
#include <xmloff/autolayout.hxx>
-#include <o3tl/make_unique.hxx>
#include <strings.hrc>
#include <drawdoc.hxx>
@@ -497,7 +496,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
{
if( pUndoMgr )
{
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdMoveStyleSheetsUndoAction>(this, aCreatedStyles, true));
+ pUndoMgr->AddUndoAction(std::make_unique<SdMoveStyleSheetsUndoAction>(this, aCreatedStyles, true));
}
}
}
@@ -936,10 +935,10 @@ bool SdDrawDocument::InsertBookmarkAsPage(
// styles, so it cannot be used after this point
lcl_removeUnusedStyles(GetStyleSheetPool(), aNewGraphicStyles);
if (!aNewGraphicStyles.empty() && pUndoMgr)
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdMoveStyleSheetsUndoAction>(this, aNewGraphicStyles, true));
+ pUndoMgr->AddUndoAction(std::make_unique<SdMoveStyleSheetsUndoAction>(this, aNewGraphicStyles, true));
lcl_removeUnusedStyles(GetStyleSheetPool(), aNewCellStyles);
if (!aNewCellStyles.empty() && pUndoMgr)
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdMoveStyleSheetsUndoAction>(this, aNewCellStyles, true));
+ pUndoMgr->AddUndoAction(std::make_unique<SdMoveStyleSheetsUndoAction>(this, aNewCellStyles, true));
if( bUndo )
EndUndo();
@@ -1288,7 +1287,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnl
aUndoRemove.emplace_back(a.get(), true);
if (pUndoMgr)
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdMoveStyleSheetsUndoAction>(this, aUndoRemove, false));
+ pUndoMgr->AddUndoAction(std::make_unique<SdMoveStyleSheetsUndoAction>(this, aUndoRemove, false));
}
for( const auto& a : aRemove )
@@ -1542,7 +1541,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if (bUndo)
{
- pUndoMgr->AddUndoAction(o3tl::make_unique<StyleSheetUndoAction>(this,
+ pUndoMgr->AddUndoAction(std::make_unique<StyleSheetUndoAction>(this,
pMySheet, &pHisSheet->GetItemSet()));
}
pMySheet->GetItemSet().Put(pHisSheet->GetItemSet());
@@ -1613,7 +1612,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
{
// Add UndoAction for creating and inserting the stylesheets to
// the top of the UndoManager
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdMoveStyleSheetsUndoAction>( this, aCreatedStyles, true));
+ pUndoMgr->AddUndoAction(std::make_unique<SdMoveStyleSheetsUndoAction>( this, aCreatedStyles, true));
}
}
@@ -1699,7 +1698,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if( bUndo )
{
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdPresentationLayoutUndoAction>
+ pUndoMgr->AddUndoAction(std::make_unique<SdPresentationLayoutUndoAction>
(this,
pPage->IsMasterPage() ? aLayoutName : aOldLayoutName,
aLayoutName,
@@ -1765,7 +1764,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
aUndoInsert.reserve(aCreatedStyles.size());
for (const auto& a : aCreatedStyles)
aUndoInsert.emplace_back(a.get(), true);
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdMoveStyleSheetsUndoAction>(this, aUndoInsert, true));
+ pUndoMgr->AddUndoAction(std::make_unique<SdMoveStyleSheetsUndoAction>(this, aUndoInsert, true));
}
// Generate new master pages and register them with the document
@@ -1834,7 +1833,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if( bUndo )
{
- pUndoMgr->AddUndoAction(o3tl::make_unique<SdPresentationLayoutUndoAction>
+ pUndoMgr->AddUndoAction(std::make_unique<SdPresentationLayoutUndoAction>
(this, aOldLayoutName, aName,
eOldAutoLayout, eNewAutoLayout, true,
rpPage));
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bb66917562f4..1f7d1c07256f 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -55,7 +55,6 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <o3tl/enumarray.hxx>
-#include <o3tl/make_unique.hxx>
#include <xmloff/autolayout.hxx>
#include <Outliner.hxx>
@@ -569,8 +568,8 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t
if( bUndo )
{
- pUndoManager->AddUndoAction( o3tl::make_unique<UndoObjectPresentationKind>( *pSdrObj ) );
- pUndoManager->AddUndoAction( o3tl::make_unique<UndoObjectUserCall>(*pSdrObj) );
+ pUndoManager->AddUndoAction( std::make_unique<UndoObjectPresentationKind>( *pSdrObj ) );
+ pUndoManager->AddUndoAction( std::make_unique<UndoObjectUserCall>(*pSdrObj) );
}
InsertPresObj(pSdrObj, eObjKind);
@@ -733,7 +732,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const ::tools
if (bUndo)
pUndoManager->AddUndoAction(
- o3tl::make_unique<UndoObjectUserCall>(_rObj));
+ std::make_unique<UndoObjectUserCall>(_rObj));
// Object was resized by user and does not listen to its slide anymore
_rObj.SetUserCall(nullptr);
@@ -2217,7 +2216,7 @@ SdrObject* SdPage::InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind,
{
pUndoManager->AddUndoAction( getSdrModelFromSdrPage().GetSdrUndoFactory().CreateUndoGeoObject( *pObj ) );
pUndoManager->AddUndoAction( getSdrModelFromSdrPage().GetSdrUndoFactory().CreateUndoAttrObject( *pObj, true, true ) );
- pUndoManager->AddUndoAction( o3tl::make_unique<UndoObjectUserCall>( *pObj ) );
+ pUndoManager->AddUndoAction( std::make_unique<UndoObjectUserCall>( *pObj ) );
}
pObj->AdjustToMaxRect(rRect);
@@ -2280,7 +2279,7 @@ SdrObject* SdPage::InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind,
if( !IsPresObj( pObj ) )
{
if( bUndo )
- pUndoManager->AddUndoAction( o3tl::make_unique<UndoObjectPresentationKind>( *pObj ) );
+ pUndoManager->AddUndoAction( std::make_unique<UndoObjectPresentationKind>( *pObj ) );
InsertPresObj( pObj, eObjKind );
}
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 21c71757e8a3..417fdf27146a 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -19,7 +19,6 @@
#include <vector>
#include <libxml/xmlwriter.h>
-#include <o3tl/make_unique.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/linkmgr.hxx>
#include <svx/svdundo.hxx>
@@ -448,7 +447,7 @@ SfxStyleSheet* SdPage::GetTextStyleSheetForObject( SdrObject* pObj ) const
SfxItemSet* SdPage::getOrCreateItems()
{
if( mpItems == nullptr )
- mpItems = o3tl::make_unique<SfxItemSet>( getSdrModelFromSdrPage().GetItemPool(), svl::Items<SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES>{} );
+ mpItems = std::make_unique<SfxItemSet>( getSdrModelFromSdrPage().GetItemPool(), svl::Items<SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES>{} );
return mpItems.get();
}
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 87e46245b2fd..205a2b225e4e 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -30,7 +30,6 @@
#include <Outliner.hxx>
#include <svx/svdpool.hxx>
#include <svx/svdundo.hxx>
-#include <o3tl/make_unique.hxx>
namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } }
@@ -138,7 +137,7 @@ TextApiObject::~TextApiObject() throw()
rtl::Reference< TextApiObject > TextApiObject::create( SdDrawDocument* pDoc )
{
- rtl::Reference< TextApiObject > xRet( new TextApiObject( o3tl::make_unique<TextAPIEditSource>( pDoc ) ) );
+ rtl::Reference< TextApiObject > xRet( new TextApiObject( std::make_unique<TextAPIEditSource>( pDoc ) ) );
return xRet;
}
@@ -161,7 +160,7 @@ void TextApiObject::SetText( OutlinerParaObject const & rText )
{
SdrModel* pModel = mpSource->GetDoc();
if( pModel && pModel->IsUndoEnabled() )
- pModel->AddUndo( o3tl::make_unique<UndoTextAPIChanged>( *pModel, this ) );
+ pModel->AddUndo( std::make_unique<UndoTextAPIChanged>( *pModel, this ) );
mpSource->SetText( rText );
maSelection.nStartPara = EE_PARA_MAX_COUNT;
diff --git a/sd/source/core/undo/undofactory.cxx b/sd/source/core/undo/undofactory.cxx
index ecad2629fe64..e00f2f2f94e0 100644
--- a/sd/source/core/undo/undofactory.cxx
+++ b/sd/source/core/undo/undofactory.cxx
@@ -19,38 +19,37 @@
#include <undo/undofactory.hxx>
#include <undo/undoobjects.hxx>
-#include <o3tl/make_unique.hxx>
using namespace sd;
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return o3tl::make_unique<UndoRemoveObject>( rObject, bOrdNumDirect );
+ return std::make_unique<UndoRemoveObject>( rObject, bOrdNumDirect );
}
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return o3tl::make_unique<UndoDeleteObject>( rObject, bOrdNumDirect );
+ return std::make_unique<UndoDeleteObject>( rObject, bOrdNumDirect );
}
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText )
{
- return o3tl::make_unique<UndoObjectSetText>( rNewObj, nText );
+ return std::make_unique<UndoObjectSetText>( rNewObj, nText );
}
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect )
{
- return o3tl::make_unique<UndoReplaceObject>( rOldObject, rNewObject, bOrdNumDirect );
+ return std::make_unique<UndoReplaceObject>( rOldObject, rNewObject, bOrdNumDirect );
}
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoGeoObject( SdrObject& rObject )
{
- return o3tl::make_unique<UndoGeoObject>( rObject );
+ return std::make_unique<UndoGeoObject>( rObject );
}
std::unique_ptr<SdrUndoAction> UndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText )
{
- return o3tl::make_unique<UndoAttrObject>( rObject, bStyleSheet1, bSaveText );
+ return std::make_unique<UndoAttrObject>( rObject, bStyleSheet1, bSaveText );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx
index 34e2aef03122..4c0463697d08 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -18,7 +18,6 @@
*/
#include <o3tl/any.hxx>
-#include <o3tl/make_unique.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include "epptooxml.hxx"
@@ -1191,7 +1190,7 @@ void PPTXAnimationExport::WriteAnimations(const Reference<XDrawPage>& rXDrawPage
UNO_QUERY);
if (xEnumeration.is() && xEnumeration->hasMoreElements())
{
- auto pNodeContext = o3tl::make_unique<NodeContext>(xNode, false, false);
+ auto pNodeContext = std::make_unique<NodeContext>(xNode, false, false);
if (pNodeContext->isValid())
{
mpFS->startElementNS(XML_p, XML_timing, FSEND);
@@ -1296,7 +1295,7 @@ bool NodeContext::initChildNodes()
if (xChildNode.is())
{
auto pChildContext
- = o3tl::make_unique<NodeContext>(xChildNode, bIsMainSeq, bIsIterateChild);
+ = std::make_unique<NodeContext>(xChildNode, bIsMainSeq, bIsIterateChild);
if (pChildContext->isValid())
bValid = true;
maChildNodes.push_back(std::move(pChildContext));
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 8d2f6c24c04d..d6e8494a1fd9 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -56,7 +56,6 @@
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
-#include <o3tl/make_unique.hxx>
using namespace css;
@@ -1212,7 +1211,7 @@ void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj )
mnBiDi = rParagraphObj.mnBiDi;
for ( std::vector<std::unique_ptr<PortionObj> >::const_iterator it = rParagraphObj.begin(); it != rParagraphObj.end(); ++it )
- mvPortions.push_back( o3tl::make_unique<PortionObj>( **it ) );
+ mvPortions.push_back( std::make_unique<PortionObj>( **it ) );
maTabStop = rParagraphObj.maTabStop;
bExtendedParameters = rParagraphObj.bExtendedParameters;
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index a70995286764..ce78d2932c7a 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -23,7 +23,6 @@
#include <rtl/textenc.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ) :
mnId ( nId ),
@@ -206,7 +205,7 @@ Section::Section( const Section& rSection )
for ( int i = 0; i < 16; i++ )
aFMTID[ i ] = rSection.aFMTID[ i ];
for(const std::unique_ptr<PropEntry>& rEntry : rSection.maEntries)
- maEntries.push_back(o3tl::make_unique<PropEntry>(*rEntry));
+ maEntries.push_back(std::make_unique<PropEntry>(*rEntry));
}
Section::Section( const sal_uInt8* pFMTID )
@@ -252,11 +251,11 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu
if ( (*iter)->mnId == nId )
(*iter).reset(new PropEntry( nId, pBuf, nBufSize ));
else
- maEntries.insert( iter, o3tl::make_unique<PropEntry>( nId, pBuf, nBufSize ));
+ maEntries.insert( iter, std::make_unique<PropEntry>( nId, pBuf, nBufSize ));
}
else
{
- maEntries.push_back( o3tl::make_unique<PropEntry>( nId, pBuf, nBufSize ) );
+ maEntries.push_back( std::make_unique<PropEntry>( nId, pBuf, nBufSize ) );
}
}
@@ -520,7 +519,7 @@ Section& Section::operator=( const Section& rSection )
memcpy( static_cast<void*>(aFMTID), static_cast<void const *>(rSection.aFMTID), 16 );
for(const std::unique_ptr<PropEntry>& rEntry : rSection.maEntries)
- maEntries.push_back(o3tl::make_unique<PropEntry>(*rEntry));
+ maEntries.push_back(std::make_unique<PropEntry>(*rEntry));
}
return *this;
}
@@ -580,7 +579,7 @@ void PropRead::Read()
{
Section aSection(aSectCLSID.data());
aSection.Read(mpSvStream.get());
- maSections.push_back(o3tl::make_unique<Section>(aSection));
+ maSections.push_back(std::make_unique<Section>(aSection));
}
mpSvStream->Seek( nCurrent );
}
@@ -599,7 +598,7 @@ PropRead& PropRead::operator=( const PropRead& rPropRead )
memcpy( mApplicationCLSID, rPropRead.mApplicationCLSID, 16 );
for(const std::unique_ptr<Section>& rSection : rPropRead.maSections)
- maSections.push_back(o3tl::make_unique<Section>(*rSection));
+ maSections.push_back(std::make_unique<Section>(*rSection));
}
return *this;
}
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index ec42796541f6..306aaecfd15b 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -35,7 +35,6 @@
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
#include <tools/debug.hxx>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
#include <sdresid.hxx>
@@ -903,11 +902,11 @@ void CustomAnimationList::update()
if( xShape.is() )
{
SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry;
- pLBoxEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
+ pLBoxEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER);
aDescription += ": ";
aDescription += getShapeDescription( xShape, false );
- pLBoxEntry->AddItem(o3tl::make_unique<CustomAnimationTriggerEntryItem>(aDescription));
+ pLBoxEntry->AddItem(std::make_unique<CustomAnimationTriggerEntryItem>(aDescription));
Insert( pLBoxEntry );
SvViewDataEntry* pViewData = GetViewData( pLBoxEntry );
if( pViewData )
@@ -1020,8 +1019,8 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
// create an entry for the effect
SvTreeListEntry* pEntry = new CustomAnimationListEntry( pEffect );
- pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
- pEntry->AddItem(o3tl::make_unique<CustomAnimationListEntryItem>(aDescription, pEffect, this));
+ pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
+ pEntry->AddItem(std::make_unique<CustomAnimationListEntryItem>(aDescription, pEffect, this));
if( pParentEntry )
{
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 384ea90559e2..0c365ee9afc1 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -47,7 +47,6 @@
#include <createcustomanimationpanel.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/button.hxx>
#include <vcl/scrbar.hxx>
@@ -296,7 +295,7 @@ void CustomAnimationPane::addUndo()
{
SdPage* pPage = SdPage::getImplementation( mxCurrentPage );
if( pPage )
- pManager->AddUndoAction( o3tl::make_unique<UndoAnimation>( mrBase.GetDocShell()->GetDoc(), pPage ) );
+ pManager->AddUndoAction( std::make_unique<UndoAnimation>( mrBase.GetDocShell()->GetDoc(), pPage ) );
}
}
@@ -2490,7 +2489,7 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot
{
SdPage* pPage = SdPage::getImplementation( mxCurrentPage );
if( pPage )
- pManager->AddUndoAction( o3tl::make_unique<UndoAnimationPath>( mrBase.GetDocShell()->GetDoc(), pPage, pEffect->getNode() ) );
+ pManager->AddUndoAction( std::make_unique<UndoAnimationPath>( mrBase.GetDocShell()->GetDoc(), pPage, pEffect->getNode() ) );
}
pEffect->updatePathFromSdrPathObj( *pPathObj );
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 6049a27f3c40..e08f3f4cb328 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -44,7 +44,6 @@
#include <svx/svxids.hrc>
#include <svx/polypolygoneditor.hxx>
#include <svx/svddrgmt.hxx>
-#include <o3tl/make_unique.hxx>
#include "CustomAnimationPane.hxx"
#include <View.hxx>
@@ -941,23 +940,23 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
bool bHgt0=aRect.Top()==aRect.Bottom();
if (bWdt0 && bHgt0)
{
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopLeft(),SdrHdlKind::UpperLeft));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopLeft(),SdrHdlKind::UpperLeft));
}
else if (bWdt0 || bHgt0)
{
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopLeft() ,SdrHdlKind::UpperLeft));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomRight(),SdrHdlKind::LowerRight));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopLeft() ,SdrHdlKind::UpperLeft));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomRight(),SdrHdlKind::LowerRight));
}
else // !bWdt0 && !bHgt0
{
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopLeft() ,SdrHdlKind::UpperLeft));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopCenter() ,SdrHdlKind::Upper));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopRight() ,SdrHdlKind::UpperRight));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.LeftCenter() ,SdrHdlKind::Left ));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.RightCenter() ,SdrHdlKind::Right));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomLeft() ,SdrHdlKind::LowerLeft));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomCenter(),SdrHdlKind::Lower));
- rHandlerList.AddHdl(o3tl::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomRight() ,SdrHdlKind::LowerRight));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopLeft() ,SdrHdlKind::UpperLeft));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopCenter() ,SdrHdlKind::Upper));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.TopRight() ,SdrHdlKind::UpperRight));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.LeftCenter() ,SdrHdlKind::Left ));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.RightCenter() ,SdrHdlKind::Right));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomLeft() ,SdrHdlKind::LowerLeft));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomCenter(),SdrHdlKind::Lower));
+ rHandlerList.AddHdl(std::make_unique<SmartHdl>( xThis, mpPathObj, aRect.BottomRight() ,SdrHdlKind::LowerRight));
}
while( nCount < rHandlerList.GetHdlCount() )
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 35b7ca6f5113..e165ae9ae1a9 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -93,7 +93,6 @@
#include <sfx2/charmappopup.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <vcl/FilterConfigItem.hxx>
-#include <o3tl/make_unique.hxx>
#include <sdabstdlg.hxx>
#include <sdfilter.hxx>
#include <sdmod.hxx>
@@ -252,7 +251,7 @@ void SdDLL::Init()
if (!utl::ConfigManager::IsFuzzing() && SvtModuleOptions().IsDraw())
pDrawFact = &::sd::GraphicDocShell::Factory();
- auto pUniqueModule = o3tl::make_unique<SdModule>(pImpressFact, pDrawFact);
+ auto pUniqueModule = std::make_unique<SdModule>(pImpressFact, pDrawFact);
SdModule* pModule = pUniqueModule.get();
SfxApplication::SetModule(SfxToolsModule::Draw, std::move(pUniqueModule));
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 2730b1e7adc9..34584c4cd3e3 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -20,7 +20,6 @@
#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
#include <editeng/CustomPropertyField.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/styfitem.hxx>
#include <svl/inethist.hxx>
@@ -460,7 +459,7 @@ std::unique_ptr<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot )
SfxItemPool& rPool = GetPool();
rPool.SetDefaultMetric( MapUnit::Map100thMM );
- auto pRet = o3tl::make_unique<SfxItemSet>(
+ auto pRet = std::make_unique<SfxItemSet>(
rPool,
svl::Items<
SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS,
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index fae2557fd889..1d9acfbd5b19 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -22,7 +22,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/documentconstants.hxx>
-#include <o3tl/make_unique.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <sfx2/doctempl.hxx>
@@ -194,7 +193,7 @@ TemplateScanner::State TemplateScanner::ScanEntry()
|| (sContentType == "Impress 2.0"))
{
OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(sTitle);
- mpTemplateEntries.push_back(o3tl::make_unique<TemplateEntry>(sLocalisedTitle, sTargetURL));
+ mpTemplateEntries.push_back(std::make_unique<TemplateEntry>(sLocalisedTitle, sTargetURL));
}
}
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 625bce33b733..cf1ff8e9bab8 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/objsh.hxx>
-#include <o3tl/make_unique.hxx>
#include "sddlgfact.hxx"
#include <BreakDlg.hxx>
#include <copydlg.hxx>
@@ -367,44 +366,44 @@ VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateBreakDlg(
sal_uLong nSumActionCount,
sal_uLong nObjCount )
{
- return VclPtr<AbstractBreakDlg_Impl>::Create(o3tl::make_unique<::sd::BreakDlg>(pParent, pDrView, pShell, nSumActionCount, nObjCount));
+ return VclPtr<AbstractBreakDlg_Impl>::Create(std::make_unique<::sd::BreakDlg>(pParent, pDrView, pShell, nSumActionCount, nObjCount));
}
VclPtr<AbstractCopyDlg> SdAbstractDialogFactory_Impl::CreateCopyDlg(weld::Window* pParent,
const SfxItemSet& rInAttrs,
::sd::View* pView )
{
- return VclPtr<AbstractCopyDlg_Impl>::Create(o3tl::make_unique<::sd::CopyDlg>(pParent, rInAttrs, pView));
+ return VclPtr<AbstractCopyDlg_Impl>::Create(std::make_unique<::sd::CopyDlg>(pParent, rInAttrs, pView));
}
VclPtr<AbstractSdCustomShowDlg> SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg(weld::Window* pParent, SdDrawDocument& rDrawDoc )
{
- return VclPtr<AbstractSdCustomShowDlg_Impl>::Create(o3tl::make_unique<SdCustomShowDlg>(pParent, rDrawDoc));
+ return VclPtr<AbstractSdCustomShowDlg_Impl>::Create(std::make_unique<SdCustomShowDlg>(pParent, rDrawDoc));
}
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdTabCharDialog(weld::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell)
{
- return VclPtr<SdAbstractTabController_Impl>::Create(o3tl::make_unique<SdCharDlg>(pParent, pAttr, pDocShell));
+ return VclPtr<SdAbstractTabController_Impl>::Create(std::make_unique<SdCharDlg>(pParent, pAttr, pDocShell));
}
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdTabPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage )
{
- return VclPtr<SdAbstractTabController_Impl>::Create(o3tl::make_unique<SdPageDlg>(pDocShell, pParent, pAttr, bAreaPage));
+ return VclPtr<SdAbstractTabController_Impl>::Create(std::make_unique<SdPageDlg>(pDocShell, pParent, pAttr, bAreaPage));
}
VclPtr<AbstractSdModifyFieldDlg> SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg(weld::Window* pParent, const SvxFieldData* pInField, const SfxItemSet& rSet)
{
- return VclPtr<AbstractSdModifyFieldDlg_Impl>::Create(o3tl::make_unique<SdModifyFieldDlg>(pParent, pInField, rSet));
+ return VclPtr<AbstractSdModifyFieldDlg_Impl>::Create(std::make_unique<SdModifyFieldDlg>(pParent, pInField, rSet));
}
VclPtr<AbstractSdSnapLineDlg> SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg(weld::Window* pParent, const SfxItemSet& rInAttrs, ::sd::View* pView)
{
- return VclPtr<AbstractSdSnapLineDlg_Impl>::Create(o3tl::make_unique<SdSnapLineDlg>(pParent, rInAttrs, pView));
+ return VclPtr<AbstractSdSnapLineDlg_Impl>::Create(std::make_unique<SdSnapLineDlg>(pParent, rInAttrs, pView));
}
VclPtr<AbstractSdInsertLayerDlg> SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg(weld::Window* pParent, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr)
{
- return VclPtr<AbstractSdInsertLayerDlg_Impl>::Create(o3tl::make_unique<SdInsertLayerDlg>(pParent, rInAttrs, bDeletable, aStr));
+ return VclPtr<AbstractSdInsertLayerDlg_Impl>::Create(std::make_unique<SdInsertLayerDlg>(pParent, rInAttrs, bDeletable, aStr));
}
VclPtr<AbstractSdInsertPagesObjsDlg> SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName )
@@ -414,23 +413,23 @@ VclPtr<AbstractSdInsertPagesObjsDlg> SdAbstractDialogFactory_Impl::CreateSdInser
VclPtr<AbstractMorphDlg> SdAbstractDialogFactory_Impl::CreateMorphDlg(weld::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2)
{
- return VclPtr<AbstractMorphDlg_Impl>::Create(o3tl::make_unique<::sd::MorphDlg>(pParent, pObj1, pObj2));
+ return VclPtr<AbstractMorphDlg_Impl>::Create(std::make_unique<::sd::MorphDlg>(pParent, pObj1, pObj2));
}
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView)
{
- return VclPtr<AbstractBulletDialog_Impl>::Create(o3tl::make_unique<::sd::OutlineBulletDlg>(pParent, pAttr, pView));
+ return VclPtr<AbstractBulletDialog_Impl>::Create(std::make_unique<::sd::OutlineBulletDlg>(pParent, pAttr, pView));
}
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg(weld::Window* pParent, const SfxItemSet* pAttr )
{
- return VclPtr<SdAbstractTabController_Impl>::Create(o3tl::make_unique<SdParagraphDlg>(pParent, pAttr));
+ return VclPtr<SdAbstractTabController_Impl>::Create(std::make_unique<SdParagraphDlg>(pParent, pAttr));
}
VclPtr<AbstractSdStartPresDlg> SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg(weld::Window* pParent,
const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList)
{
- return VclPtr<AbstractSdStartPresDlg_Impl>::Create(o3tl::make_unique<SdStartPresentationDlg>(pParent, rInAttrs, rPageNames, pCSList));
+ return VclPtr<AbstractSdStartPresDlg_Impl>::Create(std::make_unique<SdStartPresentationDlg>(pParent, rInAttrs, rPageNames, pCSList));
}
VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateRemoteDialog( vcl::Window* pParent )
@@ -440,17 +439,17 @@ VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateRemoteDialog( vcl:
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg(SfxObjectShell* pDocSh, weld::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool)
{
- return VclPtr<SdPresLayoutTemplateDlg_Impl>::Create(o3tl::make_unique<SdPresLayoutTemplateDlg>(pDocSh, pParent, bBackgroundDlg, rStyleBase, ePO, pSSPool));
+ return VclPtr<SdPresLayoutTemplateDlg_Impl>::Create(std::make_unique<SdPresLayoutTemplateDlg>(pDocSh, pParent, bBackgroundDlg, rStyleBase, ePO, pSSPool));
}
VclPtr<AbstractSdPresLayoutDlg> SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg(weld::Window* pParent, ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs)
{
- return VclPtr<AbstractSdPresLayoutDlg_Impl>::Create(o3tl::make_unique<SdPresLayoutDlg>(pDocShell, pParent, rInAttrs));
+ return VclPtr<AbstractSdPresLayoutDlg_Impl>::Create(std::make_unique<SdPresLayoutDlg>(pDocShell, pParent, rInAttrs));
}
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg(weld::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView)
{
- return VclPtr<SdAbstractTabController_Impl>::Create(o3tl::make_unique<SdTabTemplateDlg>(pParent, pDocShell, rStyleBase, pModel, pView));
+ return VclPtr<SdAbstractTabController_Impl>::Create(std::make_unique<SdTabTemplateDlg>(pParent, pDocShell, rStyleBase, pModel, pView));
}
VclPtr<SfxAbstractDialog> SdAbstractDialogFactory_Impl::CreatSdActionDialog(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
@@ -460,7 +459,7 @@ VclPtr<SfxAbstractDialog> SdAbstractDialogFactory_Impl::CreatSdActionDialog(vcl:
VclPtr<AbstractSdVectorizeDlg> SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell)
{
- return VclPtr<AbstractSdVectorizeDlg_Impl>::Create(o3tl::make_unique<SdVectorizeDlg>(pParent, rBmp, pDocShell));
+ return VclPtr<AbstractSdVectorizeDlg_Impl>::Create(std::make_unique<SdVectorizeDlg>(pParent, rBmp, pDocShell));
}
VclPtr<AbstractSdPublishingDlg> SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( vcl::Window* pParent, DocumentType eDocType)
@@ -491,7 +490,7 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc()
VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage)
{
- return VclPtr<AbstractMasterLayoutDialog_Impl>::Create(o3tl::make_unique<::sd::MasterLayoutDialog>(pParent, pDoc, pCurrentPage));
+ return VclPtr<AbstractMasterLayoutDialog_Impl>::Create(std::make_unique<::sd::MasterLayoutDialog>(pParent, pDoc, pCurrentPage));
}
VclPtr<AbstractHeaderFooterDialog> SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( sd::ViewShell* pViewShell,
@@ -502,7 +501,7 @@ VclPtr<AbstractHeaderFooterDialog> SdAbstractDialogFactory_Impl::CreateHeaderFoo
VclPtr<VclAbstractDialog> SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog(weld::Window* pParent, SdDrawDocument* pDoc)
{
- return VclPtr<SdAbstractGenericDialog_Impl>::Create(o3tl::make_unique<sd::SdPhotoAlbumDialog>(pParent, pDoc));
+ return VclPtr<SdAbstractGenericDialog_Impl>::Create(std::make_unique<sd::SdPhotoAlbumDialog>(pParent, pDoc));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index c88a401af4ed..045d3b2614e7 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -59,7 +59,6 @@
#include <comphelper/servicehelper.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/diagnose_ex.h>
-#include <o3tl/make_unique.hxx>
#include <comphelper/scopeguard.hxx>
@@ -299,7 +298,7 @@ void SdPageObjsTLB::InitEntry(SvTreeListEntry* pEntry,
sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2"
SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nColToHilite ));
- pEntry->ReplaceItem(o3tl::make_unique<SvLBoxString>(rCol.GetText()), nColToHilite );
+ pEntry->ReplaceItem(std::make_unique<SvLBoxString>(rCol.GetText()), nColToHilite );
}
void SdPageObjsTLB::SaveExpandedTreeItemState(SvTreeListEntry* pEntry, std::vector<OUString>& vectTreeItem)
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 5e870bab9896..0d4fc949b4e7 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <o3tl/make_unique.hxx>
-
#include <svl/itemset.hxx>
#include <svl/style.hxx>
#include <svl/hint.hxx>
@@ -45,10 +43,10 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
// Create ItemSets; Attention, it is possible that the new one is from a,
// different pool. Therefore we clone it with its items.
- mpNewSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), pTheNewItemSet->GetRanges());
+ mpNewSet = std::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), pTheNewItemSet->GetRanges());
SdrModel::MigrateItemSet( pTheNewItemSet, mpNewSet.get(), pTheDoc );
- mpOldSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges());
+ mpOldSet = std::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges());
SdrModel::MigrateItemSet( &mpStyleSheet->GetItemSet(), mpOldSet.get(), pTheDoc );
OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 15c76777a9b6..6f1df30e7a67 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -26,7 +26,6 @@
#include <DrawDocShell.hxx>
#include <com/sun/star/document/PrinterIndependentLayout.hpp>
#include <editeng/outlobj.hxx>
-#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/progress.hxx>
#include <vcl/waitobj.hxx>
@@ -103,7 +102,7 @@ SfxPrinter* DrawDocShell::GetPrinter(bool bCreate)
if (bCreate && !mpPrinter)
{
// create ItemSet with special pool area
- auto pSet = o3tl::make_unique<SfxItemSet>( GetPool(),
+ auto pSet = std::make_unique<SfxItemSet>( GetPool(),
svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>{} );
@@ -607,30 +606,30 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
{
- xFilter = o3tl::make_unique<SdHTMLFilter>(rMedium, *this);
+ xFilter = std::make_unique<SdHTMLFilter>(rMedium, *this);
}
else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
{
- xFilter = o3tl::make_unique<SdPPTFilter>(rMedium, *this);
+ xFilter = std::make_unique<SdPPTFilter>(rMedium, *this);
static_cast<SdPPTFilter*>(xFilter.get())->PreSaveBasic();
}
else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 )
{
- xFilter = o3tl::make_unique<SdCGMFilter>(rMedium, *this);
+ xFilter = std::make_unique<SdCGMFilter>(rMedium, *this);
}
else if( aTypeName.indexOf( "draw8" ) >= 0 ||
aTypeName.indexOf( "impress8" ) >= 0 )
{
- xFilter = o3tl::make_unique<SdXMLFilter>(rMedium, *this);
+ xFilter = std::make_unique<SdXMLFilter>(rMedium, *this);
}
else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 ||
aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 )
{
- xFilter = o3tl::make_unique<SdXMLFilter>(rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60);
+ xFilter = std::make_unique<SdXMLFilter>(rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60);
}
else
{
- xFilter = o3tl::make_unique<SdGRFFilter>(rMedium, *this);
+ xFilter = std::make_unique<SdGRFFilter>(rMedium, *this);
}
if (xFilter)
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 4675aeb151a6..98bbda78ffaa 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -49,7 +49,6 @@
#include <comphelper/classids.hxx>
#include <svl/cjkoptions.hxx>
#include <svl/visitem.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/fcontnr.hxx>
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 64a7c78b3bbc..963cb05be7c7 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -34,7 +34,6 @@
#include <View.hxx>
#include <Window.hxx>
#include <memory>
-#include <o3tl/make_unique.hxx>
namespace sd {
@@ -130,7 +129,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
if( bDifferent )
{
- pLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aPolyPolygon, aName));
+ pLineEndList->Insert(std::make_unique<XLineEndEntry>(aPolyPolygon, aName));
}
else
{
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index ac82d7e13332..cdd1db4b770a 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -51,7 +51,6 @@
#include <sfx2/app.hxx>
#include <sfx2/opengrf.hxx>
#include <rtl/ustring.hxx>
-#include <o3tl/make_unique.hxx>
#include <strings.hrc>
#include <sdpage.hxx>
@@ -388,7 +387,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent)
if( mbMasterPage )
{
- mpDocSh->GetUndoManager()->AddUndoAction(o3tl::make_unique<StyleSheetUndoAction>(
+ mpDocSh->GetUndoManager()->AddUndoAction(std::make_unique<StyleSheetUndoAction>(
mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), &(*pTempSet)));
pStyleSheet->GetItemSet().Put( *pTempSet );
sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() );
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index e99f4d57e9c0..b46ebd9d0cc4 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -22,7 +22,6 @@
#include <svl/style.hxx>
#include <editeng/outliner.hxx>
#include <svl/hint.hxx>
-#include <o3tl/make_unique.hxx>
#include <app.hrc>
@@ -140,7 +139,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
// Undo-Action
mpDocSh->GetUndoManager()->AddUndoAction(
- o3tl::make_unique<StyleSheetUndoAction>(mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), pOutSet));
+ std::make_unique<StyleSheetUndoAction>(mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), pOutSet));
pStyleSheet->GetItemSet().Put( *pOutSet );
static_cast<SfxStyleSheet*>( pStyleSheet )->Broadcast( SfxHint( SfxHintId::DataChanged ) );
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index db4e8ccb4a9a..f380a4fe49f8 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -26,8 +26,6 @@
#include <com/sun/star/drawing/FillStyle.hpp>
-#include <o3tl/make_unique.hxx>
-
#include <svl/itemset.hxx>
#include <svx/xfillit0.hxx>
@@ -38,7 +36,7 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
const SfxItemSet& rItemSet)
: SdUndoAction(&rDoc),
mrPage(rPage),
- mpItemSet(o3tl::make_unique<SfxItemSet>(rItemSet)),
+ mpItemSet(std::make_unique<SfxItemSet>(rItemSet)),
mbHasFillBitmap(false)
{
OUString aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
@@ -48,7 +46,7 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj()
{
- std::unique_ptr<SfxItemSet> pNew = o3tl::make_unique<SfxItemSet>(mrPage.getSdrPageProperties().GetItemSet());
+ std::unique_ptr<SfxItemSet> pNew = std::make_unique<SfxItemSet>(mrPage.getSdrPageProperties().GetItemSet());
mrPage.getSdrPageProperties().ClearItem();
if (bool(mpFillBitmapItem))
restoreFillBitmap(*mpItemSet);
@@ -74,7 +72,7 @@ void SdBackgroundObjUndoAction::Redo()
SdUndoAction* SdBackgroundObjUndoAction::Clone() const
{
- std::unique_ptr<SdBackgroundObjUndoAction> pCopy = o3tl::make_unique<SdBackgroundObjUndoAction>(*mpDoc, mrPage, *mpItemSet);
+ std::unique_ptr<SdBackgroundObjUndoAction> pCopy = std::make_unique<SdBackgroundObjUndoAction>(*mpDoc, mrPage, *mpItemSet);
if (mpFillBitmapItem)
pCopy->mpFillBitmapItem.reset(mpFillBitmapItem->Clone());
pCopy->mbHasFillBitmap = mbHasFillBitmap;
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 170a2f08396d..31e5a55b5daa 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -52,7 +52,6 @@
#endif
#include "Communicator.hxx"
-#include <o3tl/make_unique.hxx>
using namespace sd;
@@ -256,7 +255,7 @@ getBluez5Adapter(DBusConnection *pConnection)
dbus_message_unref(pMsg);
if (pPath)
{
- return o3tl::make_unique<DBusObject>( "org.bluez", pPath, pInterfaceType );
+ return std::make_unique<DBusObject>( "org.bluez", pPath, pInterfaceType );
}
assert(false); // We should already have pPath provided for us.
}
@@ -918,7 +917,7 @@ static DBusHandlerResult ProfileMessageFunction
(void)fcntl(nDescriptor, F_SETFL, fcntl(nDescriptor, F_GETFL) & ~O_NONBLOCK);
SAL_INFO( "sdremote.bluetooth", "connection accepted " << nDescriptor);
- Communicator* pCommunicator = new Communicator( o3tl::make_unique<BufferedStreamSocket>( nDescriptor ) );
+ Communicator* pCommunicator = new Communicator( std::make_unique<BufferedStreamSocket>( nDescriptor ) );
pCommunicators->push_back( pCommunicator );
pCommunicator->launch();
}
@@ -1283,7 +1282,7 @@ void SAL_CALL BluetoothServer::run()
SAL_WARN( "sdremote.bluetooth", "accept failed with errno " << errno );
} else {
SAL_INFO( "sdremote.bluetooth", "connection accepted " << nClient );
- Communicator* pCommunicator = new Communicator( o3tl::make_unique<BufferedStreamSocket>( nClient ) );
+ Communicator* pCommunicator = new Communicator( std::make_unique<BufferedStreamSocket>( nClient ) );
mpCommunicators->push_back( pCommunicator );
pCommunicator->launch();
}
@@ -1382,7 +1381,7 @@ void SAL_CALL BluetoothServer::run()
WSACleanup();
return;
} else {
- Communicator* pCommunicator = new Communicator( o3tl::make_unique<BufferedStreamSocket>( socket) );
+ Communicator* pCommunicator = new Communicator( std::make_unique<BufferedStreamSocket>( socket) );
mpCommunicators->push_back( pCommunicator );
pCommunicator->launch();
}
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 4148657b1e59..c4eed2a1ee42 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -38,7 +38,6 @@
#include <tools/diagnose_ex.h>
#include <xmloff/autolayout.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
@@ -273,7 +272,7 @@ void DocumentHelper::ProvideStyles (
if (pUndoManager != nullptr)
{
pUndoManager->AddUndoAction (
- o3tl::make_unique<SdMoveStyleSheetsUndoAction>(
+ std::make_unique<SdMoveStyleSheetsUndoAction>(
&rTargetDocument,
aCreatedStyles,
true));
@@ -404,7 +403,7 @@ void DocumentHelper::AssignMasterPageToPage (
// not override the new master page) and assign the master page to
// the regular slide.
rDocument.GetDocSh()->GetUndoManager()->AddUndoAction(
- o3tl::make_unique<SdBackgroundObjUndoAction>(
+ std::make_unique<SdBackgroundObjUndoAction>(
rDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()),
true);
pPage->getSdrPageProperties().PutItem(XFillStyleItem(drawing::FillStyle_NONE));
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 82eee8854c25..9e3eb76c7fc5 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -38,7 +38,6 @@
#include "PreviewValueSet.hxx"
#include <ViewShellBase.hxx>
#include <sfx2/objface.hxx>
-#include <o3tl/make_unique.hxx>
#include <drawview.hxx>
#include <vcl/image.hxx>
#include <vcl/floatwin.hxx>
@@ -489,7 +488,7 @@ void MasterPagesSelector::SetItem (
mpContainer->GetPageNameForToken(aToken),
nIndex);
}
- SetUserData(nIndex, o3tl::make_unique<UserData>(nIndex,aToken));
+ SetUserData(nIndex, std::make_unique<UserData>(nIndex,aToken));
AddTokenToIndexEntry(nIndex,aToken);
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 338f0cd6d481..e9bb8eb97b32 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -83,7 +83,6 @@
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
#include <vcl/svapp.hxx>
-#include <o3tl/make_unique.hxx>
#include <memory>
@@ -959,7 +958,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
// (#67720#)
pManager->AddUndoAction(
- o3tl::make_unique<ModifyPageUndoAction>(
+ std::make_unique<ModifyPageUndoAction>(
pDocument, pUndoPage, rName, pUndoPage->GetAutoLayout(),
aVisibleLayers.IsSet( nBackground ),
aVisibleLayers.IsSet( nBgObj )));
@@ -980,7 +979,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
if (pPageToRename != nullptr)
{
const OUString aOldLayoutName( pPageToRename->GetLayoutName() );
- pManager->AddUndoAction( o3tl::make_unique<RenameLayoutTemplateUndoAction>( pDocument, aOldLayoutName, rName ) );
+ pManager->AddUndoAction( std::make_unique<RenameLayoutTemplateUndoAction>( pDocument, aOldLayoutName, rName ) );
pDocument->RenameLayoutTemplate( aOldLayoutName, rName );
}
}
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index b41ecc598890..54b4b47ceb5f 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -33,7 +33,6 @@
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/propertysethelper.hxx>
#include <comphelper/propertysetinfo.hxx>
-#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
#include <svx/xtable.hxx>
#include <vcl/svapp.hxx>
@@ -774,7 +773,7 @@ DocumentSettings::_setPropertyValues(const PropertyMapEntry** ppEntries,
}
else
{
- pItemSet = o3tl::make_unique<SfxItemSet>(pDoc->GetPool(),
+ pItemSet = std::make_unique<SfxItemSet>(pDoc->GetPool(),
svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>{} );
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index ff026e93e2eb..375000182ba3 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/drawing/BitmapMode.hpp>
-#include <o3tl/make_unique.hxx>
#include <vcl/svapp.hxx>
#include <svl/itemset.hxx>
#include <svx/svdpool.hxx>
@@ -59,7 +58,7 @@ SdUnoPageBackground::SdUnoPageBackground(
if( pDoc )
{
StartListening( *pDoc );
- mpSet = o3tl::make_unique<SfxItemSet>( pDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} );
+ mpSet = std::make_unique<SfxItemSet>( pDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} );
if( pSet )
mpSet->Put(*pSet);
@@ -100,7 +99,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
StartListening( *pDoc );
mpDoc = pDoc;
- mpSet = o3tl::make_unique<SfxItemSet>( *rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} );
+ mpSet = std::make_unique<SfxItemSet>( *rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} );
if( mpPropSet->AreThereOwnUsrAnys() )
{
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 1829da7ca1ec..ba4d5cf8940c 100644
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -22,7 +22,6 @@
#include <svx/svditer.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-#include <o3tl/make_unique.hxx>
#include <Outliner.hxx>
#include <drawdoc.hxx>
@@ -208,7 +207,7 @@ Iterator OutlinerContainer::CreateSelectionIterator (
break;
}
- return Iterator (o3tl::make_unique<SelectionIteratorImpl> (
+ return Iterator (std::make_unique<SelectionIteratorImpl> (
rObjectList, nObjectIndex, pDocument, rpViewShell, bDirectionIsForward));
}
@@ -272,7 +271,7 @@ Iterator OutlinerContainer::CreateDocumentIterator (
ePageKind, eEditMode, bDirectionIsForward, aLocation);
return Iterator (
- o3tl::make_unique<DocumentIteratorImpl> (nPageIndex, ePageKind, eEditMode,
+ std::make_unique<DocumentIteratorImpl> (nPageIndex, ePageKind, eEditMode,
pDocument, rpViewShell, bDirectionIsForward));
}
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index a0957f886984..3f76080e9293 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -171,7 +171,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
OUString aComment( SdResId(STR_UNDO_MODIFY_PAGE) );
pUndoManager->EnterListAction(aComment, aComment, 0, mrViewShell.GetViewShellBase().GetViewShellId());
pUndoManager->AddUndoAction(
- o3tl::make_unique<ModifyPageUndoAction>(
+ std::make_unique<ModifyPageUndoAction>(
pDocument, pUndoPage, aNewName, aNewAutoLayout, bBVisible, bBObjsVisible));
// Clear the selection because the selected object may be removed as
@@ -216,7 +216,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
bSetModified = static_cast<const SfxBoolItem&>(pArgs->Get(SID_MODIFYPAGE)).GetValue();
}
- pUndoManager->AddUndoAction( o3tl::make_unique<UndoAutoLayoutPosAndSize>( *pUndoPage ) );
+ pUndoManager->AddUndoAction( std::make_unique<UndoAutoLayoutPosAndSize>( *pUndoPage ) );
pUndoManager->LeaveListAction();
pDocument->SetChanged(bSetModified);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 07f521fe6ead..91839c6a69c8 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -36,7 +36,6 @@
#include <editeng/numitem.hxx>
#include <svl/whiter.hxx>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
@@ -167,7 +166,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
// Undo-Action
mpDocSh->GetUndoManager()->AddUndoAction(
- o3tl::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
+ std::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
pSheet->GetItemSet().Put(aTempSet);
pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
@@ -218,7 +217,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
// Undo-Action
mpDocSh->GetUndoManager()->AddUndoAction(
- o3tl::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
+ std::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
pSheet->GetItemSet().Put(aTempSet);
pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
@@ -294,7 +293,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
// Undo-Action
mpDocSh->GetUndoManager()->AddUndoAction(
- o3tl::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
+ std::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
pSheet->GetItemSet().Put(aTempSet,false);
pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
@@ -337,7 +336,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
// Undo-Action
mpDocSh->GetUndoManager()->AddUndoAction(
- o3tl::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
+ std::make_unique<StyleSheetUndoAction>(&mrDoc, pSheet, &aTempSet));
pSheet->GetItemSet().Set(aTempSet,false);
pSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 1a5d520cd9b1..691c1a7eb787 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -45,7 +45,6 @@
#include <editeng/editobj.hxx>
#include <editeng/CustomPropertyField.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <sfx2/bindings.hxx>
@@ -1175,7 +1174,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if( pPresPage->IsPresObj( pObj ) )
{
- auto pNewSet = o3tl::make_unique<SfxItemSet>( GetDoc()->GetPool(), svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT>{} );
+ auto pNewSet = std::make_unique<SfxItemSet>( GetDoc()->GetPool(), svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT>{} );
pNewSet->Put(pObj->GetMergedItemSet());
aAttrList.emplace_back(std::move(pNewSet), pObj->GetUserCall());
}
@@ -1339,7 +1338,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
GraphicObject aGraphicObject( static_cast<SdrGrafObj*>(pObj)->GetGraphicObject() );
m_ExternalEdits.push_back(
- o3tl::make_unique<SdrExternalToolEdit>(
+ std::make_unique<SdrExternalToolEdit>(
mpDrawView.get(), pObj));
m_ExternalEdits.back()->Edit( &aGraphicObject );
}
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 809bfdebc041..2fbdaf83c0c7 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -62,7 +62,6 @@
#include <com/sun/star/gallery/GalleryItemType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <memory>
-#include <o3tl/make_unique.hxx>
using namespace com::sun::star;
@@ -375,7 +374,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
? aColor
: aBlack);
- GetDoc()->GetGradientList()->Insert(o3tl::make_unique<XGradientEntry>(aGradient, pName->GetValue()));
+ GetDoc()->GetGradientList()->Insert(std::make_unique<XGradientEntry>(aGradient, pName->GetValue()));
XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT);
aStyleItem.SetWhich(XATTR_FILLSTYLE);
@@ -438,7 +437,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
{
XHatch aHatch (aColor);
- GetDoc()->GetHatchList()->Insert(o3tl::make_unique<XHatchEntry>(aHatch, pName->GetValue()));
+ GetDoc()->GetHatchList()->Insert(std::make_unique<XHatchEntry>(aHatch, pName->GetValue()));
XFillStyleItem aStyleItem(drawing::FillStyle_HATCH);
aStyleItem.SetWhich(XATTR_FILLSTYLE);
@@ -481,7 +480,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
XDashListRef pDashList = GetDoc()->GetDashList();
long nCounts = pDashList->Count ();
- std::unique_ptr<XDashEntry> pEntry = o3tl::make_unique<XDashEntry>(aNewDash, pName->GetValue());
+ std::unique_ptr<XDashEntry> pEntry = std::make_unique<XDashEntry>(aNewDash, pName->GetValue());
long i;
for ( i = 0; i < nCounts; i++ )
@@ -574,7 +573,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
static_cast<short>(pCenterY->GetValue ()), static_cast<short>(pBorder->GetValue ()),
static_cast<short>(pStart->GetValue ()), static_cast<short>(pEnd->GetValue ()));
- pGradientList->Insert(o3tl::make_unique<XGradientEntry>(aGradient, pName->GetValue()));
+ pGradientList->Insert(std::make_unique<XGradientEntry>(aGradient, pName->GetValue()));
XFillStyleItem aStyleItem(drawing::FillStyle_GRADIENT);
aStyleItem.SetWhich(XATTR_FILLSTYLE);
pAttr->Put(aStyleItem);
@@ -644,7 +643,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
XHatch aHatch (Color(0), static_cast<css::drawing::HatchStyle>(pStyle->GetValue ()), pDistance->GetValue (),
pAngle->GetValue () * 10);
- pHatchList->Insert(o3tl::make_unique<XHatchEntry>(aHatch, pName->GetValue()));
+ pHatchList->Insert(std::make_unique<XHatchEntry>(aHatch, pName->GetValue()));
XFillStyleItem aStyleItem(drawing::FillStyle_HATCH);
aStyleItem.SetWhich(XATTR_FILLSTYLE);
pAttr->Put(aStyleItem);
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index f3fd2da7349d..b8fa08362400 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -36,7 +36,6 @@
#include <svx/dialogs.hrc>
#include <unotools/useroptions.hxx>
#include <tools/diagnose_ex.h>
-#include <o3tl/make_unique.hxx>
#include <app.hrc>
#include <strings.hrc>
@@ -85,7 +84,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName )
SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager();
pManager->AddUndoAction(
- o3tl::make_unique<ModifyPageUndoAction>(
+ std::make_unique<ModifyPageUndoAction>(
GetDoc(), pUndoPage, rName, pUndoPage->GetAutoLayout(),
aVisibleLayers.IsSet( nBackground ),
aVisibleLayers.IsSet( nBgObj )));
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 50bd4d28e4f7..bd405c766229 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -61,7 +61,6 @@
#include <svl/urihelper.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
-#include <o3tl/make_unique.hxx>
#include <DrawViewShell.hxx>
#include <slideshow.hxx>
@@ -797,7 +796,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
mpDrawView->UnmarkAllPoints();
if( bUndo )
- mpDrawView->AddUndo(o3tl::make_unique<SdrUndoGeoObj>(*pPathObj));
+ mpDrawView->AddUndo(std::make_unique<SdrUndoGeoObj>(*pPathObj));
pPathObj->ToggleClosed();
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 0b25afd4771d..0db3d07f7dd6 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -795,7 +795,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( bUndo )
AddUndo(
- o3tl::make_unique<E3dAttributesUndoAction>(
+ std::make_unique<E3dAttributesUndoAction>(
*static_cast< E3dObject* >(pPickObj),
aNewSet,
aOldSet));
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 1fa0b235ae07..e4c450a10f29 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -19,7 +19,6 @@
#include <sddll.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/app.hxx>
@@ -97,8 +96,8 @@ static BitmapEx* getButtonImage( int index, bool large )
{
for (size_t i = 0; i < SAL_N_ELEMENTS(aSmallPlaceHolders); i++ )
{
- gSmallButtonImages[i].set(o3tl::make_unique<BitmapEx>(aSmallPlaceHolders[i]));
- gLargeButtonImages[i].set(o3tl::make_unique<BitmapEx>(aBigPlaceHolders[i]));
+ gSmallButtonImages[i].set(std::make_unique<BitmapEx>(aSmallPlaceHolders[i]));
+ gLargeButtonImages[i].set(std::make_unique<BitmapEx>(aBigPlaceHolders[i]));
}
}
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 97ef24917cb4..87b88b8ff71d 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -21,7 +21,6 @@
#include <pdfparse.hxx>
#include <comphelper/hash.hxx>
-#include <o3tl/make_unique.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
@@ -533,7 +532,7 @@ void PDFDict::insertValue( const OString& rName, std::unique_ptr<PDFEntry> pValu
if( it == m_aMap.end() )
{
// new name/value, pair, append it
- m_aSubElements.emplace_back(o3tl::make_unique<PDFName>(rName));
+ m_aSubElements.emplace_back(std::make_unique<PDFName>(rName));
m_aSubElements.emplace_back( std::move(pValue) );
}
else
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 5e08c1e5ad5d..42d4c231a336 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -40,7 +40,6 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/alloc.h>
#include <sal/log.hxx>
-#include <o3tl/make_unique.hxx>
// disable warnings again because someone along the line has enabled them
// (we have included boost headers, what did you expect?)
@@ -378,27 +377,27 @@ public:
void pushName( iteratorT first, iteratorT last )
{
- insertNewValue( o3tl::make_unique<PDFName>(iteratorToString(first,last)), first );
+ insertNewValue( std::make_unique<PDFName>(iteratorToString(first,last)), first );
}
void pushDouble( iteratorT first, SAL_UNUSED_PARAMETER iteratorT /*last*/ )
{
- insertNewValue( o3tl::make_unique<PDFNumber>(m_fDouble), first );
+ insertNewValue( std::make_unique<PDFNumber>(m_fDouble), first );
}
void pushString( iteratorT first, iteratorT last )
{
- insertNewValue( o3tl::make_unique<PDFString>(iteratorToString(first,last)), first );
+ insertNewValue( std::make_unique<PDFString>(iteratorToString(first,last)), first );
}
void pushBool( iteratorT first, iteratorT last )
{
- insertNewValue( o3tl::make_unique<PDFBool>( last-first == 4 ), first );
+ insertNewValue( std::make_unique<PDFBool>( last-first == 4 ), first );
}
void pushNull( iteratorT first, SAL_UNUSED_PARAMETER iteratorT )
{
- insertNewValue( o3tl::make_unique<PDFNull>(), first );
+ insertNewValue( std::make_unique<PDFNull>(), first );
}
@@ -443,7 +442,7 @@ public:
m_aUIntStack.pop_back();
unsigned int nObject = m_aUIntStack.back();
m_aUIntStack.pop_back();
- insertNewValue( o3tl::make_unique<PDFObjectRef>(nObject,nGeneration), first );
+ insertNewValue( std::make_unique<PDFObjectRef>(nObject,nGeneration), first );
}
void beginDict( iteratorT first, SAL_UNUSED_PARAMETER iteratorT )
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 654a08c76255..dd4f40f6583f 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -351,7 +351,6 @@
#include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <officecfg/Office/Common.hxx>
#include <sax/tools/converter.hxx>
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index bde14fdef12c..20aa4cfab3a9 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -874,7 +874,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow,
if ( rWindow.GetParent() != pWorkWin )
rWindow.SetParent( pWorkWin );
- auto pChild = o3tl::make_unique<SfxChild_Impl>(rWindow, rWindow.GetSizePixel(),
+ auto pChild = std::make_unique<SfxChild_Impl>(rWindow, rWindow.GetSizePixel(),
eAlign, rWindow.IsVisible());
aChildren.push_back(std::move(pChild));
@@ -889,7 +889,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl(std::shared_ptr<SfxModelessDial
DBG_ASSERT( aChildren.size() < 255, "too many children" );
DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
- auto pChild = o3tl::make_unique<SfxChild_Impl>(rController, eAlign);
+ auto pChild = std::make_unique<SfxChild_Impl>(rController, eAlign);
aChildren.push_back(std::move(pChild));
bSorted = false;
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 4fc4a651d73b..062c969f0bc9 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -83,7 +83,6 @@
#include "fltlst.hxx"
#include <sfx2/request.hxx>
#include <arrdecl.hxx>
-#include <o3tl/make_unique.hxx>
#include <vector>
#include <memory>
@@ -273,7 +272,7 @@ namespace
return *aImpl;
// first Matcher created for this factory
- aImplArr.push_back(o3tl::make_unique<SfxFilterMatcher_Impl>(aName));
+ aImplArr.push_back(std::make_unique<SfxFilterMatcher_Impl>(aName));
return *aImplArr.back().get();
}
}
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index e1803db01f56..0a4e1fcc7169 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -795,7 +795,7 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, bool bInternal )
if ( nPos >= pImpl->pCaches.size() ||
pImpl->pCaches[nPos]->GetId() != nId )
{
- pImpl->pCaches.insert( pImpl->pCaches.begin() + nPos, o3tl::make_unique<SfxStateCache>(nId) );
+ pImpl->pCaches.insert( pImpl->pCaches.begin() + nPos, std::make_unique<SfxStateCache>(nId) );
DBG_ASSERT( nPos == 0 ||
pImpl->pCaches[nPos]->GetId() >
pImpl->pCaches[nPos-1]->GetId(), "" );
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 40c7652c1f42..b505412d3b4f 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -847,7 +847,7 @@ void SfxDispatcher::Execute_(SfxShell& rShell, const SfxSlot& rSlot,
{
if ( bool(eCallMode & SfxCallMode::RECORD) )
rReq.AllowRecording( true );
- xImp->xPoster->Post(o3tl::make_unique<SfxRequest>(rReq));
+ xImp->xPoster->Post(std::make_unique<SfxRequest>(rReq));
return;
}
}
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 8117185768df..4c38ae64ec5a 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -39,7 +39,6 @@
#include <bitmaps.hlst>
#include <officecfg/Office/Common.hxx>
-#include <o3tl/make_unique.hxx>
using namespace ::com::sun::star;
using namespace com::sun::star::uno;
@@ -219,7 +218,7 @@ BitmapEx RecentDocsView::getDefaultThumbnail(const OUString &rURL)
void RecentDocsView::insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId)
{
- AppendItem( o3tl::make_unique<RecentDocsViewItem>(*this, rURL, rTitle, rThumbnail, nId, mnItemMaxSize) );
+ AppendItem( std::make_unique<RecentDocsViewItem>(*this, rURL, rTitle, rThumbnail, nId, mnItemMaxSize) );
}
void RecentDocsView::Reload()
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 94e4b16cc764..bba646d4ff53 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -71,8 +71,6 @@
#include <map>
#include <memory>
-#include <o3tl/make_unique.hxx>
-
#include <sal/log.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
@@ -209,7 +207,7 @@ std::unique_ptr< css::uno::ContextLayer > EnsureJavaContext()
if (xHandler.is())
return nullptr; // No need to add new layer: JavaContext already present
}
- return o3tl::make_unique< css::uno::ContextLayer >(new svt::JavaContext(xContext));
+ return std::make_unique< css::uno::ContextLayer >(new svt::JavaContext(xContext));
}
}
#endif
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 1297ff1358e2..8bc31fc87e0e 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -206,7 +206,7 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd ,
std::unique_ptr<SfxChildWindow> SfxDockingWrapper::CreateImpl(vcl::Window *pParent, sal_uInt16 nId,
SfxBindings *pBindings, SfxChildWinInfo* pInfo)
{
- return o3tl::make_unique<SfxDockingWrapper>(pParent, nId, pBindings, pInfo);
+ return std::make_unique<SfxDockingWrapper>(pParent, nId, pBindings, pInfo);
}
void SfxDockingWrapper::RegisterChildWindow (bool bVis, SfxModule *pMod, SfxChildWindowFlags nFlags)
@@ -215,7 +215,7 @@ void SfxDockingWrapper::RegisterChildWindow (bool bVis, SfxModule *pMod, SfxChil
for (int i=0; i < NUM_OF_DOCKINGWINDOWS; i++ )
{
sal_uInt16 nID = sal_uInt16(SID_DOCKWIN_START+i);
- auto pFact = o3tl::make_unique<SfxChildWinFactory>( SfxDockingWrapper::CreateImpl, nID, 0xffff );
+ auto pFact = std::make_unique<SfxChildWinFactory>( SfxDockingWrapper::CreateImpl, nID, 0xffff );
pFact->aInfo.nFlags |= nFlags;
pFact->aInfo.bVisible = bVis;
SfxChildWindow::RegisterChildWindow(pMod, std::move(pFact));
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b82638a82770..8131c34a9df8 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -70,7 +70,6 @@
#include <sfx2/StyleManager.hxx>
#include <sfx2/StylePreviewRenderer.hxx>
-#include <o3tl/make_unique.hxx>
#define STD_ENTRY_HEIGHT 17
@@ -587,7 +586,7 @@ static SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox,
if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
{
- pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(pEntry->getName(), eStyleFamily), 1);
+ pTreeListEntry->ReplaceItem(std::make_unique<StyleLBoxString>(pEntry->getName(), eStyleFamily), 1);
}
pBox->GetModel()->InvalidateEntry(pTreeListEntry);
@@ -1206,7 +1205,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
SvTreeListEntry* pTreeListEntry = aFmtLb->InsertEntry(aStrings[nPos], nullptr, false, nPos);
if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
{
- pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(aStrings[nPos], eFam), 1);
+ pTreeListEntry->ReplaceItem(std::make_unique<StyleLBoxString>(aStrings[nPos], eFam), 1);
}
aFmtLb->GetModel()->InvalidateEntry(pTreeListEntry);
}
@@ -2010,7 +2009,7 @@ IMPL_LINK_NOARG( SfxCommonTemplateDialog_Impl, PreviewHdl, Button*, void)
SvTreeListEntry* pTreeListEntry = aFmtLb->GetEntry(nPos);
OUString aEntryStr = aFmtLb->GetEntryText(pTreeListEntry);
const SfxStyleFamily eFam = aPreviewCheckbox->IsChecked() ? GetFamilyItem_Impl()->GetFamily(): SfxStyleFamily::None;
- pTreeListEntry->ReplaceItem(o3tl::make_unique<StyleLBoxString>(aEntryStr, eFam), 1);
+ pTreeListEntry->ReplaceItem(std::make_unique<StyleLBoxString>(aEntryStr, eFam), 1);
aFmtLb->GetModel()->InvalidateEntry(pTreeListEntry);
aFmtLb->Recalc();
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index d12448d7f252..3cc4fc64664a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -73,7 +73,6 @@
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <com/sun/star/security/XCertificate.hpp>
-#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
#include <tools/fileutil.hxx>
#include <unotools/configmgr.hxx>
@@ -1400,7 +1399,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
if (comphelper::isFileUrl(aDestURL) || !aDest.removeSegment())
{
- pFileLock = o3tl::make_unique<osl::File>(aDestURL);
+ pFileLock = std::make_unique<osl::File>(aDestURL);
auto rc = pFileLock->open(osl_File_OpenFlag_Write);
if (rc == osl::FileBase::E_ACCES)
bHandleSysLocked = true;
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index ead24be42953..d92c89644526 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -94,7 +94,6 @@ using namespace ::ucbhelper;
#include <svtools/templatefoldercache.hxx>
#include <unotools/ucbhelper.hxx>
-#include <o3tl/make_unique.hxx>
#include <memory>
#include <vector>
@@ -1022,7 +1021,7 @@ bool SfxDocumentTemplates::InsertDir
if ( xTemplates->addGroup( rText ) )
{
- return pImp->InsertRegion( o3tl::make_unique<RegionData_Impl>( pImp.get(), rText ), nRegion );
+ return pImp->InsertRegion( std::make_unique<RegionData_Impl>( pImp.get(), rText ), nRegion );
}
return false;
@@ -1353,7 +1352,7 @@ void RegionData_Impl::AddEntry( const OUString& rTitle,
if ( pPos )
nPos = *pPos;
- auto pEntry = o3tl::make_unique<DocTempl_EntryData_Impl>(
+ auto pEntry = std::make_unique<DocTempl_EntryData_Impl>(
this, rTitle );
pEntry->SetTargetURL( rTargetURL );
pEntry->SetHierarchyURL( aLinkURL );
@@ -1492,7 +1491,7 @@ void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex )
void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle,
Content& rContent )
{
- auto pRegion = o3tl::make_unique<RegionData_Impl>( this, rTitle );
+ auto pRegion = std::make_unique<RegionData_Impl>( this, rTitle );
auto pRegionTmp = pRegion.get();
if ( ! InsertRegion( std::move(pRegion), size_t(-1) ) )
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index a314e538763a..2e818c133c4e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -44,7 +44,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/namedvaluecollection.hxx>
-#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -118,7 +117,7 @@ SidebarController::SidebarController (
mpResourceManager()
{
// Decks and panel collections for this sidebar
- mpResourceManager = o3tl::make_unique<ResourceManager>();
+ mpResourceManager = std::make_unique<ResourceManager>();
}
rtl::Reference<SidebarController> SidebarController::create(
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 3b6fd0612b47..c3d2f96c2f6f 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -24,7 +24,6 @@
#include <i18nlangtag/languagetag.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/objsh.hxx>
-#include <o3tl/make_unique.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -555,7 +554,7 @@ bool SfxClassificationHelper::ShowPasteInfo(SfxClassificationCheckPasteResult eR
}
SfxClassificationHelper::SfxClassificationHelper(const uno::Reference<document::XDocumentProperties>& xDocumentProperties, bool bUseLocalizedPolicy)
- : m_pImpl(o3tl::make_unique<Impl>(xDocumentProperties, bUseLocalizedPolicy))
+ : m_pImpl(std::make_unique<Impl>(xDocumentProperties, bUseLocalizedPolicy))
{
if (!xDocumentProperties.is())
return;
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index db138566f90c..1466d3f86228 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/system/XSimpleMailMessage2.hpp>
#include <osl/file.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
-#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/syslocale.hxx>
@@ -204,7 +203,7 @@ OUString CSmplMailClient::CopyAttachment(const OUString& sOrigAttachURL, OUStrin
// removed in Desktop::RemoveTemporaryDirectory() if soffice process gets closed before the
// mailer finishes using them.
- maAttachmentFiles.emplace_back(o3tl::make_unique<utl::TempFile>(&GetBaseTempDirURL()));
+ maAttachmentFiles.emplace_back(std::make_unique<utl::TempFile>(&GetBaseTempDirURL()));
maAttachmentFiles.back()->EnableKillingFile();
INetURLObject aFilePathObj(maAttachmentFiles.back()->GetURL());
OUString sNewAttachmentURL = aFilePathObj.GetMainURL(INetURLObject::DecodeMechanism::NONE);
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 2ce98e092949..f6cf14732000 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -102,7 +102,6 @@
#include <format.hxx>
#include <i18nlangtag/lang.h>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <rect.hxx>
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index e973fb438175..93735cff80e9 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -30,7 +30,6 @@
#include "uiobject.hxx"
#include <strings.hxx>
-#include <o3tl/make_unique.hxx>
#include <svl/stritem.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/sfxmodelfactory.hxx>
@@ -558,7 +557,7 @@ void SmElementsControl::addElement(const OUString& aElementVisual, const OUStrin
maMaxElementDimensions.setHeight( aSizePixel.Height() );
}
- maElementList.push_back(o3tl::make_unique<SmElement>(std::move(pNode), aElementSource, aHelpText));
+ maElementList.push_back(std::make_unique<SmElement>(std::move(pNode), aElementSource, aHelpText));
}
void SmElementsControl::setElementSetId(const char* pSetId)
@@ -575,7 +574,7 @@ void SmElementsControl::addElements(const std::pair<const char*, const char*> aE
const char* pElement = aElementsArray[i].first;
const char* pElementHelp = aElementsArray[i].second;
if (!pElement) {
- maElementList.push_back(o3tl::make_unique<SmElementSeparator>());
+ maElementList.push_back(std::make_unique<SmElementSeparator>());
} else {
OUString aElement(OUString::createFromAscii(pElement));
if (aElement == RID_NEWLINE)
@@ -788,7 +787,7 @@ IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, voi
if (pViewSh)
{
- std::unique_ptr<SfxStringItem> pInsertCommand = o3tl::make_unique<SfxStringItem>(SID_INSERTCOMMANDTEXT, rElement.getText());
+ std::unique_ptr<SfxStringItem> pInsertCommand = std::make_unique<SfxStringItem>(SID_INSERTCOMMANDTEXT, rElement.getText());
pViewSh->GetViewFrame()->GetDispatcher()->ExecuteList(
SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD,
{ pInsertCommand.get() });
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 5c3a1a15314e..0440bd216f19 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -57,7 +57,6 @@
#include "accessibility.hxx"
#include <document.hxx>
#include <view.hxx>
-#include <o3tl/make_unique.hxx>
#include <strings.hrc>
#include <smmod.hxx>
@@ -1511,7 +1510,7 @@ void SmEditAccessible::Init()
if (pEditEngine && pEditView)
{
assert(!pTextHelper);
- pTextHelper.reset(new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SmEditSource>( *this ) ));
+ pTextHelper.reset(new ::accessibility::AccessibleTextHelper( std::make_unique<SmEditSource>( *this ) ));
pTextHelper->SetEventSource( this );
}
}
diff --git a/starmath/source/caret.cxx b/starmath/source/caret.cxx
index 87cb1153cdd4..4e2effaa2379 100644
--- a/starmath/source/caret.cxx
+++ b/starmath/source/caret.cxx
@@ -8,8 +8,6 @@
*/
#include <caret.hxx>
-#include <o3tl/make_unique.hxx>
-
SmCaretPosGraph::SmCaretPosGraph() = default;
SmCaretPosGraph::~SmCaretPosGraph() = default;
@@ -18,7 +16,7 @@ SmCaretPosGraphEntry* SmCaretPosGraph::Add(SmCaretPos pos,
SmCaretPosGraphEntry* left)
{
assert(pos.nIndex >= 0);
- auto entry = o3tl::make_unique<SmCaretPosGraphEntry>(pos, left, nullptr);
+ auto entry = std::make_unique<SmCaretPosGraphEntry>(pos, left, nullptr);
SmCaretPosGraphEntry* e = entry.get();
//Set Left and Right to point to the entry itself if they are NULL
entry->Left = entry->Left ? entry->Left : e;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 9f4bfecd4d5c..1d2f41210154 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -22,7 +22,6 @@
#include <comphelper/fileformat.h>
#include <comphelper/accessibletexthelper.hxx>
-#include <o3tl/make_unique.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
@@ -545,7 +544,7 @@ Printer* SmDocShell::GetPrt()
}
else if (!mpPrinter)
{
- auto pOptions = o3tl::make_unique<SfxItemSet>(
+ auto pOptions = std::make_unique<SfxItemSet>(
GetPool(),
svl::Items<
SID_PRINTTITLE, SID_PRINTZOOM,
@@ -900,7 +899,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SfxUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
- o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+ std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
SetFormat( aNewFormat );
Repaint();
@@ -943,7 +942,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SfxUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
- o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+ std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
SetFormat( aNewFormat );
Repaint();
@@ -966,7 +965,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SfxUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
- o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+ std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
SetFormat( aNewFormat );
Repaint();
@@ -989,7 +988,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SfxUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
- o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+ std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
SetFormat( aNewFormat );
Repaint();
@@ -1017,7 +1016,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SfxUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
- o3tl::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
+ std::make_unique<SmFormatAction>(this, aOldFormat, aNewFormat));
SetFormat( aNewFormat );
Repaint();
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 3cb28407d0da..7e0d5c8b88a5 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -28,7 +28,6 @@
#include <editeng/editview.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editstat.hxx>
-#include <o3tl/make_unique.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/stritem.hxx>
#include <sfx2/viewfrm.hxx>
@@ -963,7 +962,7 @@ void SmEditWindow::Flush()
SmViewShell *pViewSh = rCmdBox.GetView();
if (pViewSh)
{
- std::unique_ptr<SfxStringItem> pTextToFlush = o3tl::make_unique<SfxStringItem>(SID_TEXT, GetText());
+ std::unique_ptr<SfxStringItem> pTextToFlush = std::make_unique<SfxStringItem>(SID_TEXT, GetText());
pViewSh->GetViewFrame()->GetDispatcher()->ExecuteList(
SID_TEXT, SfxCallMode::RECORD,
{ pTextToFlush.get() });
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index a48c2617217e..674a3116c8d3 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -41,7 +41,6 @@ one go*/
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/propertysetinfo.hxx>
-#include <o3tl/make_unique.hxx>
#include <rtl/character.hxx>
#include <sal/log.hxx>
#include <sfx2/frame.hxx>
@@ -1213,7 +1212,7 @@ void SmXMLNumberContext_Impl::TCharacters(const OUString &rChars)
void SmXMLNumberContext_Impl::EndElement()
{
- GetSmImport().GetNodeStack().push_front(o3tl::make_unique<SmTextNode>(aToken,FNT_NUMBER));
+ GetSmImport().GetNodeStack().push_front(std::make_unique<SmTextNode>(aToken,FNT_NUMBER));
}
@@ -1290,7 +1289,7 @@ void SmXMLTextContext_Impl::TCharacters(const OUString &rChars)
void SmXMLTextContext_Impl::EndElement()
{
- GetSmImport().GetNodeStack().push_front(o3tl::make_unique<SmTextNode>(aToken,FNT_TEXT));
+ GetSmImport().GetNodeStack().push_front(std::make_unique<SmTextNode>(aToken,FNT_TEXT));
}
@@ -1331,7 +1330,7 @@ void SmXMLStringContext_Impl::TCharacters(const OUString &rChars)
void SmXMLStringContext_Impl::EndElement()
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list