diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 19:43:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-12 14:59:17 +0100 |
| commit | a2bd7470368b2a44edf25680bd250c4d2b7428cb (patch) | |
| tree | 0907596b7ff56a2a892fe2c12bcbc89f8aea1995 /svx | |
| parent | db346dde6179e7414289681d91b153a6ed259d05 (diff) | |
o3tl::make_unique -> std::make_unique in svx/
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ic91b7170b10299001167e78ade1d24c16ce9319e
Reviewed-on: https://gerrit.libreoffice.org/67475
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx')
82 files changed, 252 insertions, 332 deletions
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 824e1d800d25..1915ff143fd7 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -338,7 +338,6 @@ #include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/make_unique.hxx> #include <o3tl/safeint.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 486695b20009..2532dc732f66 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -391,7 +391,6 @@ #include <i18nlangtag/languagetag.hxx> #include <libxml/xmlwriter.h> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/make_unique.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 7ddb45878aaa..a2aba0e4a7c4 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -60,7 +60,7 @@ #include <algorithm> #include <memory> #include <utility> -#include <o3tl/make_unique.hxx> + using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using ::com::sun::star::uno::Reference; @@ -171,12 +171,12 @@ void AccessibleShape::Init() if( !pOutlinerParaObject ) { // empty text -> use proxy edit source to delay creation of EditEngine - mpText.reset( new AccessibleTextHelper( o3tl::make_unique<AccessibleEmptyEditSource >(*pSdrObject, *pView, *pWindow) ) ); + mpText.reset( new AccessibleTextHelper( std::make_unique<AccessibleEmptyEditSource >(*pSdrObject, *pView, *pWindow) ) ); } else { // non-empty text -> use full-fledged edit source right away - mpText.reset( new AccessibleTextHelper( o3tl::make_unique<SvxTextEditSource >(*pSdrObject, nullptr, *pView, *pWindow) ) ); + mpText.reset( new AccessibleTextHelper( std::make_unique<SvxTextEditSource >(*pSdrObject, nullptr, *pView, *pWindow) ) ); } if( pWindow->HasFocus() ) mpText->SetFocus(); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 55b1f7f2fa27..20fc3065f3c2 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -52,7 +52,6 @@ #include <com/sun/star/document/XActionLockable.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <o3tl/make_unique.hxx> using namespace css; using namespace css::uno; @@ -194,7 +193,7 @@ std::unique_ptr<SdrObject, SdrObjectFreeOp> EnhancedCustomShapeEngine::ImplForce OutlinerParaObject* pParaObj(rSdrObjCustomShape.GetOutlinerParaObject()); if( pParaObj ) - pTextObj->NbcSetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>(*pParaObj) ); + pTextObj->NbcSetOutlinerParaObject( std::make_unique<OutlinerParaObject>(*pParaObj) ); // copy all attributes SfxItemSet aTargetItemSet(rSdrObjCustomShape.GetMergedItemSet()); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 5e1aefc7f7c2..4abffd971c7e 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <o3tl/make_unique.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> @@ -331,21 +330,21 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, { if (nTreeFlags & SvTreeFlags::CHKBTN) { - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>( + pEntry->AddItem(std::make_unique<SvLBoxButton>( eButtonKind, pCheckButtonData)); } - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>( rColl, rExp, true)); // the type of the change assert((rStr.isEmpty() && !!maEntryImage) || (!rStr.isEmpty() && !maEntryImage)); if (rStr.isEmpty()) - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>( maEntryImage, maEntryImage, true)); else - pEntry->AddItem(o3tl::make_unique<SvLBoxColorString>( + pEntry->AddItem(std::make_unique<SvLBoxColorString>( rStr, maEntryColor)); // the change tracking entries @@ -354,7 +353,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, for (sal_uInt16 nToken = 0; nToken < nCount; nToken++) { const OUString aToken = GetToken(maEntryString, nIndex); - pEntry->AddItem(o3tl::make_unique<SvLBoxColorString>( + pEntry->AddItem(std::make_unique<SvLBoxColorString>( aToken, maEntryColor)); } } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 0770d0be6361..c2f0690d6b94 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -56,7 +56,7 @@ #include <unotools/pathoptions.hxx> #include <vcl/treelistentry.hxx> #include <officecfg/Office/Recovery.hxx> -#include <o3tl/make_unique.hxx> + namespace svx{ namespace DocRecovery{ @@ -797,7 +797,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, DBG_ASSERT( TabCount() == 2, "*RecovDocList::InitEntry(): structure mismatch" ); SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem(2)); - pEntry->ReplaceItem(o3tl::make_unique<RecovDocListEntry>(rCol.GetText()), 2); + pEntry->ReplaceItem(std::make_unique<RecovDocListEntry>(rCol.GetText()), 2); } diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index dd81735ef070..2e2b6bde357d 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -18,7 +18,6 @@ */ #include <svx/fontlb.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index ecc3dc74abc8..048170d44413 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -25,14 +25,13 @@ #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <sdr/contact/viewcontactofe3dcube.hxx> -#include <o3tl/make_unique.hxx> // DrawContact section std::unique_ptr<sdr::contact::ViewContact> E3dCubeObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfE3dCube>(*this); + return std::make_unique<sdr::contact::ViewContactOfE3dCube>(*this); } diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 36971d34bf6d..533fec2227bd 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -33,7 +33,6 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <svx/e3dsceneupdater.hxx> -#include <o3tl/make_unique.hxx> E3dDragMethod::E3dDragMethod ( @@ -162,7 +161,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) if( bUndo ) { getSdrDragView().AddUndo( - o3tl::make_unique<E3dRotateUndoAction>( + std::make_unique<E3dRotateUndoAction>( rCandidate.mr3DObj, rCandidate.maInitTransform, rCandidate.maTransform)); diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index fc20fc9fa342..05089abf073b 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -36,18 +36,17 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b3dpolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> -#include <o3tl/make_unique.hxx> // DrawContact section std::unique_ptr<sdr::contact::ViewContact> E3dExtrudeObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfE3dExtrude>(*this); + return std::make_unique<sdr::contact::ViewContactOfE3dExtrude>(*this); } std::unique_ptr<sdr::properties::BaseProperties> E3dExtrudeObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::E3dExtrudeProperties>(*this); + return std::make_unique<sdr::properties::E3dExtrudeProperties>(*this); } // Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 6451b1778893..816ac2919375 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> @@ -458,7 +457,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs ) if(mpRemember2DAttributes) mpRemember2DAttributes->ClearItem(); else - mpRemember2DAttributes = o3tl::make_unique<SfxItemSet>(*rAttrs.GetPool(), + mpRemember2DAttributes = std::make_unique<SfxItemSet>(*rAttrs.GetPool(), svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{}); diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index e7ad61fb32a6..99d4eddeae15 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -34,18 +34,17 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <o3tl/make_unique.hxx> // DrawContact section std::unique_ptr<sdr::contact::ViewContact> E3dLatheObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfE3dLathe>(*this); + return std::make_unique<sdr::contact::ViewContactOfE3dLathe>(*this); } std::unique_ptr<sdr::properties::BaseProperties> E3dLatheObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::E3dLatheProperties>(*this); + return std::make_unique<sdr::properties::E3dLatheProperties>(*this); } // Constructor from 3D polygon, scale is the conversion factor for the coordinates diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index a7d6c5d05e59..297719c09435 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -75,13 +75,12 @@ #include <com/sun/star/uno/Sequence.h> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/e3dsceneupdater.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; std::unique_ptr<sdr::properties::BaseProperties> E3dObject::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::E3dProperties>(*this); + return std::make_unique<sdr::properties::E3dProperties>(*this); } E3dObject::E3dObject(SdrModel& rSdrModel) @@ -489,7 +488,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nAngle, double sn, double cs) std::unique_ptr<sdr::properties::BaseProperties> E3dCompoundObject::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::E3dCompoundProperties>(*this); + return std::make_unique<sdr::properties::E3dCompoundProperties>(*this); } E3dCompoundObject::E3dCompoundObject(SdrModel& rSdrModel) @@ -574,7 +573,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const // to 2d world coor aPos2D *= rVCScene.getObjectTransformation(); - rHdlList.AddHdl(o3tl::make_unique<SdrHdl>(Point(basegfx::fround(aPos2D.getX()), basegfx::fround(aPos2D.getY())), SdrHdlKind::BezierWeight)); + rHdlList.AddHdl(std::make_unique<SdrHdl>(Point(basegfx::fround(aPos2D.getX()), basegfx::fround(aPos2D.getY())), SdrHdlKind::BezierWeight)); } } } @@ -583,7 +582,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const if(aPolyPolygon.count()) { - rHdlList.AddHdl(o3tl::make_unique<E3dVolumeMarker>(aPolyPolygon)); + rHdlList.AddHdl(std::make_unique<E3dVolumeMarker>(aPolyPolygon)); } } diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index a94c316fe4bf..d5136106ab99 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -24,12 +24,11 @@ #include <sdr/contact/viewcontactofe3dpolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b3dpolygontools.hxx> -#include <o3tl/make_unique.hxx> // DrawContact section std::unique_ptr<sdr::contact::ViewContact> E3dPolygonObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfE3dPolygon>(*this); + return std::make_unique<sdr::contact::ViewContactOfE3dPolygon>(*this); } E3dPolygonObj::E3dPolygonObj( diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 45c9fbc8a5a1..db818000f152 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -46,7 +46,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/e3dsceneupdater.hxx> #include <svx/svdmodel.hxx> -#include <o3tl/make_unique.hxx> class ImpRemap3DDepth @@ -159,7 +158,7 @@ sal_uInt32 Imp3DDepthRemapper::RemapOrdNum(sal_uInt32 nOrdNum) const std::unique_ptr<sdr::properties::BaseProperties> E3dScene::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::E3dSceneProperties>(*this); + return std::make_unique<sdr::properties::E3dSceneProperties>(*this); } @@ -167,7 +166,7 @@ std::unique_ptr<sdr::properties::BaseProperties> E3dScene::CreateObjectSpecificP std::unique_ptr<sdr::contact::ViewContact> E3dScene::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfE3dScene>(*this); + return std::make_unique<sdr::contact::ViewContactOfE3dScene>(*this); } diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 4b2ee554aa10..ecd6b370c4d4 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -32,17 +32,16 @@ #include <basegfx/point/b3dpoint.hxx> #include <sdr/contact/viewcontactofe3dsphere.hxx> #include <basegfx/polygon/b3dpolygon.hxx> -#include <o3tl/make_unique.hxx> // DrawContact section std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfE3dSphere>(*this); + return std::make_unique<sdr::contact::ViewContactOfE3dSphere>(*this); } std::unique_ptr<sdr::properties::BaseProperties> E3dSphereObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::E3dSphereProperties>(*this); + return std::make_unique<sdr::properties::E3dSphereProperties>(*this); } // Build Sphere from polygon facets in latitude and longitude diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index cc25632a956b..e9bbaed89a6e 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -55,7 +55,6 @@ #include <connectivity/formattedcolumnvalue.hxx> #include <cppuhelper/typeprovider.hxx> #include <i18nlangtag/lang.h> -#include <o3tl/make_unique.hxx> #include <rtl/math.hxx> #include <svtools/calendar.hxx> @@ -1789,7 +1788,7 @@ OUString DbPatternField::GetFormatText(const Reference< css::sdb::XColumn >& _rx if (!rpFormatter) { - rpFormatter = o3tl::make_unique< FormattedColumnValue> ( + rpFormatter = std::make_unique< FormattedColumnValue> ( m_xContext, getCursor(), Reference< XPropertySet >( _rxField, UNO_QUERY ) ); OSL_ENSURE(rpFormatter, "DbPatternField::Init: no value formatter!"); } diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 3b03050ddb52..c49e81b8973f 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -47,7 +47,6 @@ #include <comphelper/types.hxx> #include <unotools/streamwrap.hxx> #include <connectivity/dbtools.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -420,7 +419,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() if( rModel.IsUndoEnabled() ) { rModel.AddUndo( - o3tl::make_unique<FmUndoContainerAction>( + std::make_unique<FmUndoContainerAction>( static_cast< FmFormModel& >(rModel), FmUndoContainerAction::Inserted, xForms, @@ -517,7 +516,7 @@ Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy { Reference< css::container::XIndexContainer > xContainer( getForms(), UNO_QUERY ); rModel.AddUndo( - o3tl::make_unique<FmUndoContainerAction>( + std::make_unique<FmUndoContainerAction>( static_cast< FmFormModel& >(rModel), FmUndoContainerAction::Inserted, xContainer, diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 6447cf0590f1..11250b4b7827 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -96,7 +96,6 @@ #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> -#include <o3tl/make_unique.hxx> #include <algorithm> #include <functional> @@ -1266,7 +1265,7 @@ bool FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormCompon DBG_ASSERT(pModel != nullptr, "FmXFormShell::executeControlConversionSlot: my shell has no model !"); if (pModel && pModel->IsUndoEnabled() ) { - pModel->AddUndo(o3tl::make_unique<FmUndoModelReplaceAction>(*pModel, pFormObject, xOldModel)); + pModel->AddUndo(std::make_unique<FmUndoModelReplaceAction>(*pModel, pFormObject, xOldModel)); } else { diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 942109f61000..7d1d35c50f19 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -59,7 +59,6 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <vcl/outdev.hxx> -#include <o3tl/make_unique.hxx> #include <memory> @@ -640,9 +639,9 @@ namespace svx std::unique_ptr<SfxTabDialogController> xDialog; if (_eSet == eCharAttribs) - xDialog = o3tl::make_unique<TextControlCharAttribDialog>(rReq.GetFrameWeld(), *xCurrentItems, *pFontList); + xDialog = std::make_unique<TextControlCharAttribDialog>(rReq.GetFrameWeld(), *xCurrentItems, *pFontList); else - xDialog = o3tl::make_unique<TextControlParaAttribDialog>(rReq.GetFrameWeld(), *xCurrentItems); + xDialog = std::make_unique<TextControlParaAttribDialog>(rReq.GetFrameWeld(), *xCurrentItems); if ( RET_OK == xDialog->run() ) { const SfxItemSet& rModifiedItems = *xDialog->GetOutputItemSet(); diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 795332f0708e..9e5c93bc7ca5 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -54,7 +54,6 @@ #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -703,7 +702,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // add their undo actions out-of-order SolarMutexGuard aSolarGuard; - rModel.AddUndo(o3tl::make_unique<FmUndoPropertyAction>(rModel, evt)); + rModel.AddUndo(std::make_unique<FmUndoPropertyAction>(rModel, evt)); } } else diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index afc4e2ca8b63..b2c137b038cf 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1054,7 +1054,7 @@ namespace svxform // UndoAction for removal if ( bUndo && GetNavModel()->m_pPropChangeList->CanUndo()) { - pFormModel->AddUndo(o3tl::make_unique<FmUndoContainerAction>(*pFormModel, FmUndoContainerAction::Removed, + pFormModel->AddUndo(std::make_unique<FmUndoContainerAction>(*pFormModel, FmUndoContainerAction::Removed, xContainer, xCurrentChild, nIndex)); } else if( !GetNavModel()->m_pPropChangeList->CanUndo() ) @@ -1086,7 +1086,7 @@ namespace svxform // UndoAction for insertion if ( bUndo && GetNavModel()->m_pPropChangeList->CanUndo()) - pFormModel->AddUndo(o3tl::make_unique<FmUndoContainerAction>(*pFormModel, FmUndoContainerAction::Inserted, + pFormModel->AddUndo(std::make_unique<FmUndoContainerAction>(*pFormModel, FmUndoContainerAction::Inserted, xContainer, xCurrentChild, nIndex)); // insert in new container diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index c178c68b6439..91526fa70238 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -287,7 +287,7 @@ namespace svxform // UndoAction if ( bUndo && m_pPropChangeList->CanUndo()) { - m_pFormModel->AddUndo(o3tl::make_unique<FmUndoContainerAction>(*m_pFormModel, + m_pFormModel->AddUndo(std::make_unique<FmUndoContainerAction>(*m_pFormModel, FmUndoContainerAction::Inserted, xContainer, xElement, @@ -396,7 +396,7 @@ namespace svxform { if ( bUndo && m_pPropChangeList->CanUndo()) { - m_pFormModel->AddUndo(o3tl::make_unique<FmUndoContainerAction>(*m_pFormModel, + m_pFormModel->AddUndo(std::make_unique<FmUndoContainerAction>(*m_pFormModel, FmUndoContainerAction::Removed, xContainer, xElement, nContainerIndex )); diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index e46c426191af..e71fe38fd6dc 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -19,7 +19,6 @@ #include <sdr/primitive2d/sdrprimitivetools.hxx> #include <osl/mutex.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/lazydelete.hxx> #include <vcl/BitmapTools.hxx> @@ -57,7 +56,7 @@ namespace drawinglayer BitmapEx aBitmap = vcl::bitmap::CreateFromData(cross, 3, 3, 12, 32); // create and exchange at aRetVal - aRetVal.set(o3tl::make_unique<BitmapEx>(aBitmap)); + aRetVal.set(std::make_unique<BitmapEx>(aBitmap)); } return aRetVal.get() ? *aRetVal.get() : BitmapEx(); diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 805a65a676d6..00a5aa89c17c 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -31,7 +31,6 @@ #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -281,7 +280,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrContourTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrContourTextPrimitive2D>( + return std::make_unique<SdrContourTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), getUnitPolyPolygon(), @@ -336,7 +335,7 @@ namespace drawinglayer basegfx::B2DPolyPolygon aNewPolyPolygon(getPathPolyPolygon()); aNewPolyPolygon.transform(rTransform); - return o3tl::make_unique<SdrPathTextPrimitive2D>( + return std::make_unique<SdrPathTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), aNewPolyPolygon, @@ -406,7 +405,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrBlockTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrBlockTextPrimitive2D>( + return std::make_unique<SdrBlockTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), @@ -464,7 +463,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap()); + return std::make_unique<SdrAutoFitTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap()); } // provide unique ID @@ -508,7 +507,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrChainedTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform()); + return std::make_unique<SdrChainedTextPrimitive2D>(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform()); } // provide unique ID @@ -555,7 +554,7 @@ namespace drawinglayer std::unique_ptr<SdrTextPrimitive2D> SdrStretchTextPrimitive2D::createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const { - return o3tl::make_unique<SdrStretchTextPrimitive2D>( + return std::make_unique<SdrStretchTextPrimitive2D>( getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 6a706aca8c24..7e9d500d8719 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -21,7 +21,6 @@ #include <utility> -#include <o3tl/make_unique.hxx> #include <sdr/properties/attributeproperties.hxx> #include <sdr/properties/itemsettools.hxx> #include <tools/debug.hxx> @@ -133,7 +132,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> AttributeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // ranges from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 301b804e4bc6..431f9a39bd16 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/captionproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -35,7 +34,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> CaptionProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>( + return std::make_unique<SfxItemSet>( rPool, svl::Items< // Ranges from SdrAttrObj, SdrCaptionObj: diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index ba874bb4ca4d..1a89ac8a014d 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/circleproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -37,7 +36,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> CircleProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>( + return std::make_unique<SfxItemSet>( rPool, svl::Items< // Ranges from SdrAttrObj, SdrCircObj diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index e8e63311916b..12629b001482 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/connectorproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -35,7 +34,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> ConnectorProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>( + return std::make_unique<SfxItemSet>( rPool, svl::Items< // Ranges from SdrAttrObj, SdrEdgeObj: diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 849681f8d915..a51fb7359b6c 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/customshapeproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -64,7 +63,7 @@ namespace sdr std::unique_ptr<SfxItemSet> CustomShapeProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>( + return std::make_unique<SfxItemSet>( rPool, svl::Items< // Ranges from SdrAttrObj: diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 063205ff405c..28c25ca68212 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <svx/sdr/properties/defaultproperties.hxx> #include <sdr/properties/itemsettools.hxx> #include <svl/itemset.hxx> @@ -41,7 +40,7 @@ namespace sdr std::unique_ptr<SfxItemSet> DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { // Basic implementation; Basic object has NO attributes - return o3tl::make_unique<SfxItemSet>(rPool); + return std::make_unique<SfxItemSet>(rPool); } DefaultProperties::DefaultProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index a86421656d26..21737a40b58f 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/e3dproperties.hxx> #include <svl/itemset.hxx> #include <svx/svddef.hxx> @@ -33,7 +32,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> E3dProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // ranges from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index 3193ec882364..8c32d6c97dcf 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/emptyproperties.hxx> #include <svl/itemset.hxx> #include <svx/svddef.hxx> @@ -37,7 +36,7 @@ namespace sdr { // Basic implementation; Basic object has NO attributes assert(!"EmptyProperties::CreateObjectSpecificItemSet() should never be called"); - return o3tl::make_unique<SfxItemSet>(rPool); + return std::make_unique<SfxItemSet>(rPool); } EmptyProperties::EmptyProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 0ef07cfd8c5e..7693c54ef66f 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/graphicproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -52,7 +51,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> GraphicProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // range from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 410e2c641f48..b5be536ede5b 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/groupproperties.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> @@ -40,7 +39,7 @@ namespace sdr // Groups have in principle no ItemSet. To support methods like // GetMergedItemSet() the local one is used. Thus, all items in the pool // may be used and a pool itemset is created. - return o3tl::make_unique<SfxItemSet>(rPool); + return std::make_unique<SfxItemSet>(rPool); } GroupProperties::GroupProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 38d0d73fcd23..95887ab7e311 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/measureproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -41,7 +40,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> MeasureProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>( + return std::make_unique<SfxItemSet>( rPool, svl::Items< // Ranges from SdrAttrObj, SdrMeasureObj: diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 9e4706fcf72d..66278b2d2b40 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/pageproperties.hxx> #include <svl/itemset.hxx> #include <svx/svdobj.hxx> @@ -36,7 +35,7 @@ namespace sdr std::unique_ptr<SfxItemSet> PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { // override to legally return a valid ItemSet - return o3tl::make_unique<SfxItemSet>(rPool); + return std::make_unique<SfxItemSet>(rPool); } PageProperties::PageProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index e65995f92371..25de1b505eb4 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <sdr/properties/textproperties.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -47,7 +46,7 @@ namespace sdr { std::unique_ptr<SfxItemSet> TextProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // range from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 969cd2c18a01..3df26b91e0f6 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -35,7 +35,6 @@ #include <svtools/toolbarmenu.hxx> #include <svx/tbcontrl.hxx> #include <sfx2/opengrf.hxx> -#include <o3tl/make_unique.hxx> #include <bitmaps.hlst> using namespace css; @@ -224,7 +223,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) } } - pList->Insert(o3tl::make_unique<XBitmapEntry>(aGraphic, aName)); + pList->Insert(std::make_unique<XBitmapEntry>(aGraphic, aName)); pList->Save(); mpLbFillAttr->Clear(); mpLbFillAttr->Fill(pList); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index f382299d9be3..27dab493d2ed 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -41,7 +41,6 @@ #include <svx/strings.hrc> #include <svx/svdoashp.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> #include <memory> #include <vector> @@ -1568,7 +1567,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, if(pLast && pSrcPath->GetOutlinerParaObject()) { - pLast->SetOutlinerParaObject(o3tl::make_unique<OutlinerParaObject>(*pSrcPath->GetOutlinerParaObject())); + pLast->SetOutlinerParaObject(std::make_unique<OutlinerParaObject>(*pSrcPath->GetOutlinerParaObject())); } } else if(pCustomShape) @@ -1608,7 +1607,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, OutlinerParaObject* pParaObj = pCustomShape->GetOutlinerParaObject(); if(pParaObj) { - pTextObj->NbcSetOutlinerParaObject(o3tl::make_unique<OutlinerParaObject>(*pParaObj)); + pTextObj->NbcSetOutlinerParaObject(std::make_unique<OutlinerParaObject>(*pParaObj)); } // copy all attributes diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 6ea58083d472..5dbb948f7a5c 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -19,7 +19,6 @@ #include "svdfmtf.hxx" #include <editeng/editdata.hxx> -#include <o3tl/make_unique.hxx> #include <math.h> #include <svx/xpoly.hxx> #include <vcl/svapp.hxx> @@ -108,9 +107,9 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( mpVD->SetLineColor(); mpVD->SetFillColor(); maOldLineColor.SetRed( mpVD->GetLineColor().GetRed() + 1 ); - mpLineAttr = o3tl::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{}); - mpFillAttr = o3tl::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); - mpTextAttr = o3tl::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + mpLineAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{}); + mpFillAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + mpTextAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); checkClip(); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index a44c508f390c..d4f0448baf0b 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -57,7 +57,6 @@ #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> #include <sfx2/viewsh.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -829,53 +828,53 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) if (bWdt0 && bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); } else if (!bStdDrag && (bWdt0 || bHgt0)) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); } else { if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopLeft(), SdrHdlKind::UpperLeft)); } if (!bLimitedRotation && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopCenter(), SdrHdlKind::Upper)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopCenter(), SdrHdlKind::Upper)); } if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.TopRight(), SdrHdlKind::UpperRight)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.TopRight(), SdrHdlKind::UpperRight)); } if (!bLimitedRotation && !bWdt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.LeftCenter(), SdrHdlKind::Left )); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.LeftCenter(), SdrHdlKind::Left )); } if (!bLimitedRotation && !bWdt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.RightCenter(), SdrHdlKind::Right)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.RightCenter(), SdrHdlKind::Right)); } if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomLeft(), SdrHdlKind::LowerLeft)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomLeft(), SdrHdlKind::LowerLeft)); } if (!bLimitedRotation && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomCenter(), SdrHdlKind::Lower)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomCenter(), SdrHdlKind::Lower)); } if (!bWdt0 && !bHgt0) { - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(aRect.BottomRight(), SdrHdlKind::LowerRight)); } } } @@ -1050,7 +1049,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SdrDragMode::Rotate: { // add rotation center - maHdlList.AddHdl(o3tl::make_unique<SdrHdl>(maRef1, SdrHdlKind::Ref1)); + maHdlList.AddHdl(std::make_unique<SdrHdl>(maRef1, SdrHdlKind::Ref1)); break; } case SdrDragMode::Mirror: diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 4f04204be823..0e9435871639 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -83,7 +83,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svdobjplusdata.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -807,7 +806,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, css::beans: std::unique_ptr<sdr::properties::BaseProperties> SdrObjCustomShape::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::CustomShapeProperties>(*this); + return std::make_unique<sdr::properties::CustomShapeProperties>(*this); } SdrObjCustomShape::SdrObjCustomShape(SdrModel& rSdrModel) @@ -3038,7 +3037,7 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf std::unique_ptr<sdr::contact::ViewContact> SdrObjCustomShape::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrObjCustomShape>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrObjCustomShape>(*this); } // #i33136# diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 578e84147e34..3f6601a874ee 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -71,13 +71,12 @@ #include <sdr/properties/attributeproperties.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/xlinjoit.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; std::unique_ptr<sdr::properties::BaseProperties> SdrAttrObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::AttributeProperties>(*this); + return std::make_unique<sdr::properties::AttributeProperties>(*this); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 5aaa8ca3a442..04fd58f3c2a5 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -131,7 +131,6 @@ #include <rtl/strbuf.hxx> #include <svdobjplusdata.hxx> #include <svdobjuserdatalist.hxx> -#include <o3tl/make_unique.hxx> #include <boost/optional.hpp> #include <libxml/xmlwriter.h> @@ -218,7 +217,7 @@ struct SdrObject::Impl std::unique_ptr<sdr::properties::BaseProperties> SdrObject::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::EmptyProperties>(*this); + return std::make_unique<sdr::properties::EmptyProperties>(*this); } sdr::properties::BaseProperties& SdrObject::GetProperties() const @@ -259,7 +258,7 @@ void SdrObject::RemoveObjectUser(sdr::ObjectUser& rOldUser) std::unique_ptr<sdr::contact::ViewContact> SdrObject::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrObj>(*this); } sdr::contact::ViewContact& SdrObject::GetViewContact() const diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index ac2fde0070e3..d57ab18e0dbe 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -58,7 +58,6 @@ #include <svx/xlnwtit.hxx> #include <svx/xpoly.hxx> #include <svx/xpool.hxx> -#include <o3tl/make_unique.hxx> enum EscDir {LKS,RTS,OBN,UNT}; @@ -177,7 +176,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const tools::Rectangle& rRe std::unique_ptr<sdr::properties::BaseProperties> SdrCaptionObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::CaptionProperties>(*this); + return std::make_unique<sdr::properties::CaptionProperties>(*this); } @@ -185,7 +184,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrCaptionObj::CreateObjectSpec std::unique_ptr<sdr::contact::ViewContact> SdrCaptionObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrCaptionObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrCaptionObj>(*this); } diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 8c75e024a513..94f350e1863c 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -49,7 +49,6 @@ #include <svx/xlnstwit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xpool.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -94,7 +93,7 @@ static Point GetAnglePnt(const tools::Rectangle& rR, long nAngle) std::unique_ptr<sdr::properties::BaseProperties> SdrCircObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::CircleProperties>(*this); + return std::make_unique<sdr::properties::CircleProperties>(*this); } @@ -102,7 +101,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrCircObj::CreateObjectSpecifi std::unique_ptr<sdr::contact::ViewContact> SdrCircObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrCircObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrCircObj>(*this); } SdrCircObj::SdrCircObj( diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 4a4bec00afc8..bef5e27ef0be 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -47,7 +47,6 @@ #include <svx/sxenditm.hxx> #include <svx/xpoly.hxx> #include <svx/xpool.hxx> -#include <o3tl/make_unique.hxx> void SdrObjConnection::ResetVars() { @@ -145,7 +144,7 @@ long SdrEdgeInfoRec::ImpGetLineOffset(SdrEdgeLineCode eLineCode, const XPolygon& std::unique_ptr<sdr::properties::BaseProperties> SdrEdgeObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::ConnectorProperties>(*this); + return std::make_unique<sdr::properties::ConnectorProperties>(*this); } @@ -153,7 +152,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrEdgeObj::CreateObjectSpecifi std::unique_ptr<sdr::contact::ViewContact> SdrEdgeObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrEdgeObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrEdgeObj>(*this); } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5a77bb8eab31..b98fa5efa4f6 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -62,7 +62,6 @@ #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> #include <memory> #include <vcl/GraphicLoader.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -127,7 +126,7 @@ void SdrGraphicLink::Closed() std::unique_ptr<sdr::properties::BaseProperties> SdrGrafObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::GraphicProperties>(*this); + return std::make_unique<sdr::properties::GraphicProperties>(*this); } @@ -135,7 +134,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrGrafObj::CreateObjectSpecifi std::unique_ptr<sdr::contact::ViewContact> SdrGrafObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfGraphic>(*this); + return std::make_unique<sdr::contact::ViewContactOfGraphic>(*this); } // check if SVG and if try to get ObjectInfoPrimitive2D and extract info @@ -1231,7 +1230,7 @@ void SdrGrafObj::addCropHandles(SdrHdlList& rTarget) const } rTarget.AddHdl( - o3tl::make_unique<SdrCropViewHdl>( + std::make_unique<SdrCropViewHdl>( aMatrixForCropViewHdl, GetGraphicObject().GetGraphic(), fCropLeft, @@ -1244,21 +1243,21 @@ void SdrGrafObj::addCropHandles(SdrHdlList& rTarget) const basegfx::B2DPoint aPos; aPos = aMatrix * basegfx::B2DPoint(0.0, 0.0); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::UpperLeft, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::UpperLeft, fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(0.5, 0.0); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Upper, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Upper, fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(1.0, 0.0); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::UpperRight, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::UpperRight, fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(0.0, 0.5); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Left , fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Left , fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(1.0, 0.5); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Right, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Right, fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(0.0, 1.0); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::LowerLeft, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::LowerLeft, fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(0.5, 1.0); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Lower, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Lower, fShearX, fRotate)); aPos = aMatrix * basegfx::B2DPoint(1.0, 1.0); - rTarget.AddHdl(o3tl::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::LowerRight, fShearX, fRotate)); + rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::LowerRight, fShearX, fRotate)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 7168b6206e61..f4c391eab0a3 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -49,18 +49,17 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <libxml/xmlwriter.h> -#include <o3tl/make_unique.hxx> // BaseProperties section std::unique_ptr<sdr::properties::BaseProperties> SdrObjGroup::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::GroupProperties>(*this); + return std::make_unique<sdr::properties::GroupProperties>(*this); } // DrawContact section std::unique_ptr<sdr::contact::ViewContact> SdrObjGroup::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfGroup>(*this); + return std::make_unique<sdr::contact::ViewContactOfGroup>(*this); } SdrObjGroup::SdrObjGroup(SdrModel& rSdrModel) diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index cf14585cea5f..e75ed7b9935a 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -69,7 +69,6 @@ #include <svx/xpoly.hxx> #include <unotools/syslocale.hxx> #include <unotools/localedatawrapper.hxx> -#include <o3tl/make_unique.hxx> SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} @@ -188,7 +187,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind std::unique_ptr<sdr::properties::BaseProperties> SdrMeasureObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::MeasureProperties>(*this); + return std::make_unique<sdr::properties::MeasureProperties>(*this); } @@ -196,7 +195,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrMeasureObj::CreateObjectSpec std::unique_ptr<sdr::contact::ViewContact> SdrMeasureObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrMeasureObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrMeasureObj>(*this); } diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 7dd3f37d119b..30bb94c6d659 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -39,7 +39,6 @@ #include <svx/strings.hrc> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <avmedia/mediawindow.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; @@ -80,7 +79,7 @@ bool SdrMediaObj::HasTextEdit() const std::unique_ptr<sdr::contact::ViewContact> SdrMediaObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrMediaObj>( *this ); + return std::make_unique<sdr::contact::ViewContactOfSdrMediaObj>( *this ); } void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 0b8fac18ca8f..754681fca0ad 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -85,7 +85,6 @@ #include <svx/svdpage.hxx> #include <rtl/ref.hxx> #include <bitmaps.hlst> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> using namespace ::com::sun::star; @@ -671,14 +670,14 @@ static bool ImplIsMathObj( const uno::Reference < embed::XEmbeddedObject >& rObj std::unique_ptr<sdr::properties::BaseProperties> SdrOle2Obj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::OleProperties>(*this); + return std::make_unique<sdr::properties::OleProperties>(*this); } // DrawContact section std::unique_ptr<sdr::contact::ViewContact> SdrOle2Obj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrOle2Obj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrOle2Obj>(*this); } void SdrOle2Obj::Init() @@ -1196,7 +1195,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText) const if(pOPO) { - pClone->NbcSetOutlinerParaObject(o3tl::make_unique<OutlinerParaObject>(*pOPO)); + pClone->NbcSetOutlinerParaObject(std::make_unique<OutlinerParaObject>(*pOPO)); } } diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 817662601e95..6dc8dbe1b5ae 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -31,14 +31,13 @@ #include <svl/itemset.hxx> #include <sdr/properties/pageproperties.hxx> #include <svx/sdr/contact/viewcontactofpageobj.hxx> -#include <o3tl/make_unique.hxx> // BaseProperties section std::unique_ptr<sdr::properties::BaseProperties> SdrPageObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::PageProperties>(*this); + return std::make_unique<sdr::properties::PageProperties>(*this); } @@ -46,7 +45,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrPageObj::CreateObjectSpecifi std::unique_ptr<sdr::contact::ViewContact> SdrPageObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfPageObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfPageObj>(*this); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 68bb5e40e542..5146c088c435 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -51,7 +51,6 @@ #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/sdr/attribute/sdrformtextattribute.hxx> -#include <o3tl/make_unique.hxx> #include <memory> #include <sal/log.hxx> @@ -1618,7 +1617,7 @@ SdrPathObjGeoData::~SdrPathObjGeoData() std::unique_ptr<sdr::contact::ViewContact> SdrPathObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrPathObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrPathObj>(*this); } diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 348ef3738842..c01d026e4095 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -43,7 +43,6 @@ #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -51,7 +50,7 @@ using namespace com::sun::star; std::unique_ptr<sdr::properties::BaseProperties> SdrRectObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::RectangleProperties>(*this); + return std::make_unique<sdr::properties::RectangleProperties>(*this); } @@ -59,7 +58,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrRectObj::CreateObjectSpecifi std::unique_ptr<sdr::contact::ViewContact> SdrRectObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfSdrRectObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfSdrRectObj>(*this); } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index da6a4280a1eb..0168db2cf199 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -60,7 +60,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> #include <vcl/virdev.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> using namespace com::sun::star; @@ -68,13 +67,13 @@ using namespace com::sun::star; // BaseProperties section std::unique_ptr<sdr::properties::BaseProperties> SdrTextObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<sdr::properties::TextProperties>(*this); + return std::make_unique<sdr::properties::TextProperties>(*this); } // DrawContact section std::unique_ptr<sdr::contact::ViewContact> SdrTextObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfTextObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfTextObj>(*this); } SdrTextObj::SdrTextObj(SdrModel& rSdrModel) diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 390baaab60ef..4a02dc64042b 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -49,7 +49,6 @@ #include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> #include <svx/svdograf.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; using namespace sdr::contact; @@ -522,7 +521,7 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) std::unique_ptr<sdr::contact::ViewContact> SdrUnoObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfUnoControl>( *this ); + return std::make_unique<sdr::contact::ViewContactOfUnoControl>( *this ); } diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index e0fa4bf168e2..82194cd799b7 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -28,7 +28,6 @@ #include <svx/svdograf.hxx> #include <svx/svddrgv.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <o3tl/make_unique.hxx> sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const @@ -40,7 +39,7 @@ sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const // #i27224# std::unique_ptr<sdr::contact::ViewContact> SdrVirtObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfVirtObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfVirtObj>(*this); } SdrVirtObj::SdrVirtObj( diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index bbaf342f7a36..1095a08e54e3 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -31,7 +31,6 @@ #include <vcl/graph.hxx> #include <editeng/editdata.hxx> -#include <o3tl/make_unique.hxx> #include <math.h> #include <svx/xpoly.hxx> #include <vcl/svapp.hxx> @@ -147,12 +146,12 @@ ImpSdrPdfImport::ImpSdrPdfImport(SdrModel& rModel, SdrLayerID nLay, const tools: mpVD->SetLineColor(); mpVD->SetFillColor(); maOldLineColor.SetRed(mpVD->GetLineColor().GetRed() + 1); - mpLineAttr = o3tl::make_unique<SfxItemSet>(rModel.GetItemPool(), - svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{}); - mpFillAttr = o3tl::make_unique<SfxItemSet>(rModel.GetItemPool(), - svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); - mpTextAttr = o3tl::make_unique<SfxItemSet>(rModel.GetItemPool(), - svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + mpLineAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), + svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{}); + mpFillAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), + svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + mpTextAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), + svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); checkClip(); FPDF_LIBRARY_CONFIG aConfig; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 107bd1a0ad05..62b44d810e9a 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -46,7 +46,6 @@ #include <svx/svdotable.hxx> // #i124389# #include <vcl/svapp.hxx> #include <sfx2/viewsh.hxx> -#include <o3tl/make_unique.hxx> // iterates over all views and unmarks this SdrObject if it is marked @@ -266,7 +265,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave for(size_t nObjNum = 0; nObjNum < nObjCount; ++nObjNum) { pUndoGroup->AddAction( - o3tl::make_unique<SdrUndoAttrObj>(*pOL->GetObj(nObjNum), bStyleSheet1)); + std::make_unique<SdrUndoAttrObj>(*pOL->GetObj(nObjNum), bStyleSheet1)); } } @@ -389,7 +388,7 @@ void SdrUndoAttrObj::Undo() if(pTextUndo) { - pObj->SetOutlinerParaObject(o3tl::make_unique<OutlinerParaObject>(*pTextUndo)); + pObj->SetOutlinerParaObject(std::make_unique<OutlinerParaObject>(*pTextUndo)); } } @@ -467,7 +466,7 @@ void SdrUndoAttrObj::Redo() // #i8508# if(pTextRedo) { - pObj->SetOutlinerParaObject(o3tl::make_unique<OutlinerParaObject>(*pTextRedo)); + pObj->SetOutlinerParaObject(std::make_unique<OutlinerParaObject>(*pTextRedo)); } } @@ -569,7 +568,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) pUndoGroup.reset(new SdrUndoGroup(pObj->getSdrModelFromSdrObject())); const size_t nObjCount = pOL->GetObjCount(); for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) { - pUndoGroup->AddAction(o3tl::make_unique<SdrUndoGeoObj>(*pOL->GetObj(nObjNum))); + pUndoGroup->AddAction(std::make_unique<SdrUndoGeoObj>(*pOL->GetObj(nObjNum))); } } else @@ -1145,7 +1144,7 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) if (pTextObj!=nullptr) { if( bUndo ) - rView.AddUndo(o3tl::make_unique<SdrUndoObjSetText>(*pTextObj,0)); + rView.AddUndo(std::make_unique<SdrUndoObjSetText>(*pTextObj,0)); std::unique_ptr<OutlinerParaObject> pText1; if (pNewText) @@ -1687,62 +1686,62 @@ SdrUndoFactory::~SdrUndoFactory(){} std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ) { - return o3tl::make_unique<SdrUndoMoveObj>( rObject, rDist ); + return std::make_unique<SdrUndoMoveObj>( rObject, rDist ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) { - return o3tl::make_unique<SdrUndoGeoObj>( rObject ); + return std::make_unique<SdrUndoGeoObj>( rObject ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return o3tl::make_unique<SdrUndoAttrObj>( rObject, bStyleSheet1, bSaveText ); + return std::make_unique<SdrUndoAttrObj>( rObject, bStyleSheet1, bSaveText ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return o3tl::make_unique<SdrUndoRemoveObj>( rObject, bOrdNumDirect ); + return std::make_unique<SdrUndoRemoveObj>( rObject, bOrdNumDirect ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect ) { - return o3tl::make_unique<SdrUndoInsertObj>( rObject, bOrdNumDirect ); + return std::make_unique<SdrUndoInsertObj>( rObject, bOrdNumDirect ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { - return o3tl::make_unique<SdrUndoDelObj>( rObject, bOrdNumDirect ); + return std::make_unique<SdrUndoDelObj>( rObject, bOrdNumDirect ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect ) { - return o3tl::make_unique<SdrUndoNewObj>( rObject, bOrdNumDirect ); + return std::make_unique<SdrUndoNewObj>( rObject, bOrdNumDirect ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return o3tl::make_unique<SdrUndoCopyObj>( rObject, bOrdNumDirect ); + return std::make_unique<SdrUndoCopyObj>( rObject, bOrdNumDirect ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) { - return o3tl::make_unique<SdrUndoObjOrdNum>( rObject, nOldOrdNum1, nNewOrdNum1 ); + return std::make_unique<SdrUndoObjOrdNum>( rObject, nOldOrdNum1, nNewOrdNum1 ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return o3tl::make_unique<SdrUndoReplaceObj>( rOldObject, rNewObject, bOrdNumDirect ); + return std::make_unique<SdrUndoReplaceObj>( rOldObject, rNewObject, bOrdNumDirect ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) { - return o3tl::make_unique<SdrUndoObjectLayerChange>( rObject, aOldLayer, aNewLayer ); + return std::make_unique<SdrUndoObjectLayerChange>( rObject, aOldLayer, aNewLayer ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) { - return o3tl::make_unique<SdrUndoObjSetText>( rNewObj, nText ); + return std::make_unique<SdrUndoObjSetText>( rNewObj, nText ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectStrAttr( SdrObject& rObject, @@ -1750,50 +1749,50 @@ std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoObjectStrAttr( SdrObjec const OUString& sOldStr, const OUString& sNewStr ) { - return o3tl::make_unique<SdrUndoObjStrAttr>( rObject, eObjStrAttrType, sOldStr, sNewStr ); + return std::make_unique<SdrUndoObjStrAttr>( rObject, eObjStrAttrType, sOldStr, sNewStr ); } // layer std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) { - return o3tl::make_unique<SdrUndoNewLayer>( nLayerNum, rNewLayerAdmin, rNewModel ); + return std::make_unique<SdrUndoNewLayer>( nLayerNum, rNewLayerAdmin, rNewModel ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) { - return o3tl::make_unique<SdrUndoDelLayer>( nLayerNum, rNewLayerAdmin, rNewModel ); + return std::make_unique<SdrUndoDelLayer>( nLayerNum, rNewLayerAdmin, rNewModel ); } // page std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { - return o3tl::make_unique<SdrUndoDelPage>(rPage); + return std::make_unique<SdrUndoDelPage>(rPage); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoNewPage(SdrPage& rPage) { - return o3tl::make_unique<SdrUndoNewPage>( rPage ); + return std::make_unique<SdrUndoNewPage>( rPage ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoCopyPage(SdrPage& rPage) { - return o3tl::make_unique<SdrUndoCopyPage>( rPage ); + return std::make_unique<SdrUndoCopyPage>( rPage ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) { - return o3tl::make_unique<SdrUndoSetPageNum>( rNewPg, nOldPageNum1, nNewPageNum1 ); + return std::make_unique<SdrUndoSetPageNum>( rNewPg, nOldPageNum1, nNewPageNum1 ); } // master page std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoPageRemoveMasterPage(SdrPage& rChangedPage) { - return o3tl::make_unique<SdrUndoPageRemoveMasterPage>( rChangedPage ); + return std::make_unique<SdrUndoPageRemoveMasterPage>( rChangedPage ); } std::unique_ptr<SdrUndoAction> SdrUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChangedPage) { - return o3tl::make_unique<SdrUndoPageChangeMasterPage>(rChangedPage); + return std::make_unique<SdrUndoPageChangeMasterPage>(rChangedPage); } diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 26fd096a886f..b8dc76a832e9 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -38,7 +38,7 @@ #include <svx/IAccessibleViewForwarder.hxx> #include <svx/unoshtxt.hxx> #include <svx/svdotext.hxx> -#include <o3tl/make_unique.hxx> + using namespace sdr::table; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -83,7 +83,7 @@ void AccessibleCell::Init() { // non-empty text -> use full-fledged edit source right away - mpText.reset( new AccessibleTextHelper( o3tl::make_unique<SvxTextEditSource>(mxCell->GetObject(), mxCell.get(), *pView, *pWindow) ) ); + mpText.reset( new AccessibleTextHelper( std::make_unique<SvxTextEditSource>(mxCell->GetObject(), mxCell.get(), *pView, *pWindow) ) ); if( mxCell.is() && mxCell.get()->IsActiveCell() ) mpText->SetFocus(); mpText->SetEventSource(this); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index d2908706168a..391cd13a4009 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -27,7 +27,6 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <o3tl/any.hxx> -#include <o3tl/make_unique.hxx> #include <svl/style.hxx> #include <svl/itemset.hxx> @@ -177,7 +176,7 @@ namespace sdr // create a new itemset std::unique_ptr<SfxItemSet> CellProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // range from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, @@ -519,7 +518,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) // not set (!) if(nullptr != xSourceCell->GetOutlinerParaObject()) { - SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>(*xSourceCell->GetOutlinerParaObject()) ); + SetOutlinerParaObject( std::make_unique<OutlinerParaObject>(*xSourceCell->GetOutlinerParaObject()) ); } SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -822,7 +821,7 @@ void Cell::AddUndo() if( rObj.IsInserted() && rObj.getSdrModelFromSdrObject().IsUndoEnabled() ) { CellRef xCell( this ); - rObj.getSdrModelFromSdrObject().AddUndo( o3tl::make_unique<CellUndo>( &rObj, xCell ) ); + rObj.getSdrModelFromSdrObject().AddUndo( std::make_unique<CellUndo>( &rObj, xCell ) ); // Undo action for the after-text-edit-ended stack. SdrTableObj* pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(&rObj); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 535ca23d7f55..f3ba86591d18 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <o3tl/make_unique.hxx> #include <vcl/canvastools.hxx> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -127,7 +126,7 @@ void TableProperties::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNe // create a new itemset std::unique_ptr<SfxItemSet> TableProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) { - return o3tl::make_unique<SfxItemSet>(rPool, + return std::make_unique<SfxItemSet>(rPool, // range from SdrAttrObj svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, @@ -834,7 +833,7 @@ void SdrTableObjImpl::UpdateCells( tools::Rectangle const & rArea ) std::unique_ptr<sdr::properties::BaseProperties> SdrTableObj::CreateObjectSpecificProperties() { - return o3tl::make_unique<TableProperties>(*this); + return std::make_unique<TableProperties>(*this); } @@ -843,7 +842,7 @@ std::unique_ptr<sdr::properties::BaseProperties> SdrTableObj::CreateObjectSpecif std::unique_ptr<sdr::contact::ViewContact> SdrTableObj::CreateObjectSpecificViewContact() { - return o3tl::make_unique<sdr::contact::ViewContactOfTableObj>(*this); + return std::make_unique<sdr::contact::ViewContactOfTableObj>(*this); } SdrTableObj::SdrTableObj(SdrModel& rSdrModel) @@ -2147,15 +2146,15 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const // add remaining handles SdrHdlList tempList(nullptr); - tempList.AddHdl( o3tl::make_unique<TableBorderHdl>( maRect, !IsTextEditActive() ) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.TopLeft(),SdrHdlKind::UpperLeft) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.TopCenter(),SdrHdlKind::Upper) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.TopRight(),SdrHdlKind::UpperRight) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.LeftCenter(),SdrHdlKind::Left) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.RightCenter(),SdrHdlKind::Right) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.BottomLeft(),SdrHdlKind::LowerLeft) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.BottomCenter(),SdrHdlKind::Lower) ); - tempList.AddHdl( o3tl::make_unique<SdrHdl>(maRect.BottomRight(),SdrHdlKind::LowerRight) ); + tempList.AddHdl( std::make_unique<TableBorderHdl>( maRect, !IsTextEditActive() ) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.TopLeft(),SdrHdlKind::UpperLeft) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.TopCenter(),SdrHdlKind::Upper) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.TopRight(),SdrHdlKind::UpperRight) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.LeftCenter(),SdrHdlKind::Left) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.RightCenter(),SdrHdlKind::Right) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.BottomLeft(),SdrHdlKind::LowerLeft) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.BottomCenter(),SdrHdlKind::Lower) ); + tempList.AddHdl( std::make_unique<SdrHdl>(maRect.BottomRight(),SdrHdlKind::LowerRight) ); for( size_t nHdl = 0; nHdl < tempList.GetHdlCount(); ++nHdl ) tempList.GetHdl(nHdl)->SetMoveOutside(true); tempList.MoveTo(rHdlList); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 581f6e8f754f..d79e094bf601 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -69,7 +69,6 @@ #include <memory> #include <o3tl/enumarray.hxx> #include <o3tl/enumrange.hxx> -#include <o3tl/make_unique.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/lok.hxx> #include <sfx2/viewsh.hxx> @@ -1080,7 +1079,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) if( bUndo ) { rModel.BegUndo(SvxResId(STR_TABLE_STYLE)); - rModel.AddUndo(o3tl::make_unique<TableStyleUndo>(rTableObj)); + rModel.AddUndo(std::make_unique<TableStyleUndo>(rTableObj)); } rTableObj.setTableStyle( xNewTableStyle ); @@ -1174,7 +1173,7 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs ) if( bUndo ) { rModel.BegUndo( SvxResId(STR_TABLE_STYLE_SETTINGS) ); - rModel.AddUndo(o3tl::make_unique<TableStyleUndo>(rTableObj)); + rModel.AddUndo(std::make_unique<TableStyleUndo>(rTableObj)); } rTableObj.setTableStyleSettings( aSettings ); diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 866d2cb514a1..8c54d538b374 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -37,7 +37,6 @@ #include "tablecolumns.hxx" #include "tableundo.hxx" #include <o3tl/safeint.hxx> -#include <o3tl/make_unique.hxx> #include <svx/svdotable.hxx> #include <svx/svdmodel.hxx> #include <svx/strings.hrc> @@ -635,7 +634,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) (*aCellIter++) = getCell( nIndex + nOffset, nRow ); } - rModel.AddUndo( o3tl::make_unique<InsertColUndo>( xThis, nIndex, aNewColumns, aNewCells ) ); + rModel.AddUndo( std::make_unique<InsertColUndo>( xThis, nIndex, aNewColumns, aNewCells ) ); } const sal_Int32 nRowCount = getRowCountImpl(); @@ -710,7 +709,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) (*aCellIter++) = getCell( nIndex + nOffset, nRow ); } - rModel.AddUndo( o3tl::make_unique<RemoveColUndo>( xThis, nIndex, aRemovedCols, aRemovedCells ) ); + rModel.AddUndo( std::make_unique<RemoveColUndo>( xThis, nIndex, aRemovedCols, aRemovedCells ) ); } // only rows before and inside the removed rows are considered @@ -805,7 +804,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) rModel.BegUndo( SvxResId(STR_TABLE_INSROW) ); rModel.AddUndo( rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) ); TableModelRef xThis( this ); - rModel.AddUndo( o3tl::make_unique<InsertRowUndo>( xThis, nIndex, aNewRows ) ); + rModel.AddUndo( std::make_unique<InsertRowUndo>( xThis, nIndex, aNewRows ) ); } // check if cells merge over new columns @@ -868,7 +867,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) for( sal_Int32 nOffset = 0; nOffset < nCount; ++nOffset ) aRemovedRows[nOffset] = maRows[nIndex+nOffset]; - rModel.AddUndo( o3tl::make_unique<RemoveRowUndo>( xThis, nIndex, aRemovedRows ) ); + rModel.AddUndo( std::make_unique<RemoveRowUndo>( xThis, nIndex, aRemovedRows ) ); } // only rows before and inside the removed rows are considered diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 663c56a42c9c..7b1b070b4458 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -20,7 +20,6 @@ #include <sdr/properties/textproperties.hxx> #include <editeng/outlobj.hxx> -#include <o3tl/make_unique.hxx> #include <cell.hxx> #include "tableundo.hxx" @@ -108,7 +107,7 @@ void CellUndo::setDataToCell( const Data& rData ) mxCell->mpProperties.reset(); if( rData.mpOutlinerParaObject ) - mxCell->SetOutlinerParaObject( o3tl::make_unique<OutlinerParaObject>(*rData.mpOutlinerParaObject) ); + mxCell->SetOutlinerParaObject( std::make_unique<OutlinerParaObject>(*rData.mpOutlinerParaObject) ); else mxCell->RemoveOutlinerParaObject(); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 3620bbbf2006..d9e819c31d55 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -37,7 +37,6 @@ #include <svx/fillctrl.hxx> #include <svx/itemwin.hxx> #include <memory> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; @@ -372,7 +371,7 @@ void SvxFillToolBoxControl::Update() aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END; XGradientList aGradientList( "", ""/*TODO?*/ ); - aGradientList.Insert(o3tl::make_unique<XGradientEntry>(mpFillGradientItem->GetGradientValue(), aTmpStr)); + aGradientList.Insert(std::make_unique<XGradientEntry>(mpFillGradientItem->GetGradientValue(), aTmpStr)); aGradientList.SetDirty( false ); const BitmapEx aBmp = aGradientList.GetUiBitmap( 0 ); @@ -430,7 +429,7 @@ void SvxFillToolBoxControl::Update() aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END; XHatchList aHatchList( "", ""/*TODO?*/ ); - aHatchList.Insert(o3tl::make_unique<XHatchEntry>(mpHatchItem->GetHatchValue(), aTmpStr)); + aHatchList.Insert(std::make_unique<XHatchEntry>(mpHatchItem->GetHatchValue(), aTmpStr)); aHatchList.SetDirty( false ); const BitmapEx & aBmp = aHatchList.GetUiBitmap( 0 ); @@ -491,7 +490,7 @@ void SvxFillToolBoxControl::Update() XPropertyList::AsBitmapList( XPropertyList::CreatePropertyList( XPropertyListType::Bitmap, "TmpList", ""/*TODO?*/)); - xBitmapList->Insert(o3tl::make_unique<XBitmapEntry>(mpBitmapItem->GetGraphicObject(), aTmpStr)); + xBitmapList->Insert(std::make_unique<XBitmapEntry>(mpBitmapItem->GetGraphicObject(), aTmpStr)); xBitmapList->SetDirty( false ); mpLbFillAttr->Fill( xBitmapList ); mpLbFillAttr->SelectEntryPos(mpLbFillAttr->GetEntryCount() - 1); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 1f158dab2855..309d905ff160 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -39,7 +39,6 @@ #include <svx/dialmgr.hxx> #include <svx/unoapi.hxx> #include <memory> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -370,7 +369,7 @@ void SvxLineEndWindow::FillValueSet() // First entry: no line end. // An entry is temporarily added to get the UI bitmap basegfx::B2DPolyPolygon aNothing; - mpLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aNothing, SvxResId(RID_SVXSTR_NONE))); + mpLineEndList->Insert(std::make_unique<XLineEndEntry>(aNothing, SvxResId(RID_SVXSTR_NONE))); const XLineEndEntry* pEntry = mpLineEndList->GetLineEnd(nCount); BitmapEx aBmp = mpLineEndList->GetUiBitmap( nCount ); OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index b10dfbdfe369..7f72bbe9ad31 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -20,8 +20,6 @@ #include <set> -#include <o3tl/make_unique.hxx> - #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svl/style.hxx> @@ -80,7 +78,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service void SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { - maItemSetVector.push_back( o3tl::make_unique< SfxItemSet >( *mpModelPool, std::initializer_list<SfxItemSet::Pair>{{mnWhich, mnWhich}} ) ); + maItemSetVector.push_back( std::make_unique< SfxItemSet >( *mpModelPool, std::initializer_list<SfxItemSet::Pair>{{mnWhich, mnWhich}} ) ); std::unique_ptr<NameOrIndex> xNewItem(createItem()); xNewItem->SetName(aName); diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 3faaaed600b5..e9c16bc98bcb 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <o3tl/any.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/implbase.hxx> @@ -266,7 +265,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXColorTable::createEntry(const OUString& r if( !(rAny >>= aColor) ) return std::unique_ptr<XPropertyEntry>(); - return o3tl::make_unique<XColorEntry>(aColor, rName); + return std::make_unique<XColorEntry>(aColor, rName); } // XElementAccess @@ -333,7 +332,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& // #86265# make sure polygon is closed aPolyPolygon.setClosed(true); - return o3tl::make_unique<XLineEndEntry>(aPolyPolygon, rName); + return std::make_unique<XLineEndEntry>(aPolyPolygon, rName); } // XElementAccess @@ -410,7 +409,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXDashTable::createEntry(const OUString& rN aXDash.SetDashLen(aLineDash.DashLen); aXDash.SetDistance(aLineDash.Distance); - return o3tl::make_unique<XDashEntry>(aXDash, rName); + return std::make_unique<XDashEntry>(aXDash, rName); } // XElementAccess @@ -482,7 +481,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r aXHatch.SetDistance( aUnoHatch.Distance ); aXHatch.SetAngle( aUnoHatch.Angle ); - return o3tl::make_unique<XHatchEntry>(aXHatch, rName); + return std::make_unique<XHatchEntry>(aXHatch, rName); } // XElementAccess @@ -566,7 +565,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString aXGradient.SetEndIntens( aGradient.EndIntensity ); aXGradient.SetSteps( aGradient.StepCount ); - return o3tl::make_unique<XGradientEntry>(aXGradient, rName); + return std::make_unique<XGradientEntry>(aXGradient, rName); } // XElementAccess @@ -637,7 +636,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& return nullptr; GraphicObject aGraphicObject(aGraphic); - return o3tl::make_unique<XBitmapEntry>(aGraphicObject, rName); + return std::make_unique<XBitmapEntry>(aGraphicObject, rName); } // XElementAccess diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index d6b0a443accb..c5051395d546 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -25,7 +25,6 @@ #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <svx/xtable.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; @@ -98,7 +97,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno:: if( pList.is() ) { - pList->Insert(o3tl::make_unique<XColorEntry>(aColor, aName)); + pList->Insert(std::make_unique<XColorEntry>(aColor, aName)); } } @@ -122,7 +121,7 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno: if( nIndex == -1 ) throw container::NoSuchElementException(); - pList->Replace(nIndex, o3tl::make_unique<XColorEntry>(nColor, aName )); + pList->Replace(nIndex, std::make_unique<XColorEntry>(nColor, aName )); } // XNameAccess diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 1de895279a5e..01d639df58ed 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/PointSequence.hpp> -#include <o3tl/make_unique.hxx> #include <svl/style.hxx> #include <comphelper/sequence.hxx> @@ -142,7 +141,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( void SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { maItemSetVector.push_back( - o3tl::make_unique<SfxItemSet>( *mpModelPool, svl::Items<XATTR_LINESTART, XATTR_LINEEND>{} )); + std::make_unique<SfxItemSet>( *mpModelPool, svl::Items<XATTR_LINESTART, XATTR_LINEEND>{} )); auto pInSet = maItemSetVector.back().get(); XLineEndItem aEndMarker(XATTR_LINEEND); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 15975dd9cc79..54e0a354b975 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <o3tl/any.hxx> -#include <o3tl/make_unique.hxx> #include <svl/itempool.hxx> #include <editeng/memberids.h> #include <tools/stream.hxx> @@ -866,7 +865,7 @@ std::unique_ptr<XLineDashItem> XLineDashItem::checkForUniqueItem( SdrModel* pMod // if the given name is not valid, replace it! if( aUniqueName != GetName() ) - return o3tl::make_unique<XLineDashItem>( aUniqueName, aDash ); + return std::make_unique<XLineDashItem>( aUniqueName, aDash ); } return nullptr; @@ -1078,7 +1077,7 @@ std::unique_ptr<XLineStartItem> XLineStartItem::checkForUniqueItem( SdrModel* pM return nullptr; // force empty name for empty polygons - return o3tl::make_unique<XLineStartItem>( "", maPolyPolygon ); + return std::make_unique<XLineStartItem>( "", maPolyPolygon ); } if( maPolyPolygon.count() > 1 ) @@ -1266,7 +1265,7 @@ std::unique_ptr<XLineStartItem> XLineStartItem::checkForUniqueItem( SdrModel* pM } else { - return o3tl::make_unique<XLineStartItem>( aUniqueName, maPolyPolygon ); + return std::make_unique<XLineStartItem>( aUniqueName, maPolyPolygon ); } } } @@ -1329,7 +1328,7 @@ std::unique_ptr<XLineEndItem> XLineEndItem::checkForUniqueItem( SdrModel* pModel return nullptr; // force empty name for empty polygons - return o3tl::make_unique<XLineEndItem>( "", maPolyPolygon ); + return std::make_unique<XLineEndItem>( "", maPolyPolygon ); } if( maPolyPolygon.count() > 1 ) @@ -1517,7 +1516,7 @@ std::unique_ptr<XLineEndItem> XLineEndItem::checkForUniqueItem( SdrModel* pModel } else { - return o3tl::make_unique<XLineEndItem>( aUniqueName, maPolyPolygon ); + return std::make_unique<XLineEndItem>( aUniqueName, maPolyPolygon ); } } } @@ -2264,7 +2263,7 @@ std::unique_ptr<XFillGradientItem> XFillGradientItem::checkForUniqueItem( SdrMod // if the given name is not valid, replace it! if( aUniqueName != GetName() ) - return o3tl::make_unique<XFillGradientItem>( aUniqueName, aGradient, Which() ); + return std::make_unique<XFillGradientItem>( aUniqueName, aGradient, Which() ); } return nullptr; @@ -2360,7 +2359,7 @@ std::unique_ptr<XFillFloatTransparenceItem> XFillFloatTransparenceItem::checkFor // if the given name is not valid, replace it! if( aUniqueName != GetName() ) { - return o3tl::make_unique<XFillFloatTransparenceItem>( aUniqueName, GetGradientValue(), true ); + return std::make_unique<XFillFloatTransparenceItem>( aUniqueName, GetGradientValue(), true ); } } } @@ -2369,7 +2368,7 @@ std::unique_ptr<XFillFloatTransparenceItem> XFillFloatTransparenceItem::checkFor // #85953# if disabled, force name to empty string if( !GetName().isEmpty() ) { - return o3tl::make_unique<XFillFloatTransparenceItem>(OUString(), GetGradientValue(), false); + return std::make_unique<XFillFloatTransparenceItem>(OUString(), GetGradientValue(), false); } } @@ -2616,7 +2615,7 @@ std::unique_ptr<XFillHatchItem> XFillHatchItem::checkForUniqueItem( SdrModel* pM // if the given name is not valid, replace it! if( aUniqueName != GetName() ) - return o3tl::make_unique<XFillHatchItem>( aUniqueName, aHatch ); + return std::make_unique<XFillHatchItem>( aUniqueName, aHatch ); } return nullptr; @@ -2837,7 +2836,7 @@ XLineAttrSetItem::XLineAttrSetItem( std::unique_ptr<SfxItemSet>&& pItemSet ) : XLineAttrSetItem::XLineAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_LINE, - o3tl::make_unique<SfxItemSet>( *pItemPool, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{})) + std::make_unique<SfxItemSet>( *pItemPool, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{})) { } @@ -2865,7 +2864,7 @@ XFillAttrSetItem::XFillAttrSetItem( std::unique_ptr<SfxItemSet>&& pItemSet ) : XFillAttrSetItem::XFillAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_FILL, - o3tl::make_unique<SfxItemSet>( *pItemPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{})) + std::make_unique<SfxItemSet>( *pItemPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{})) { } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 60865b03fcd9..e15e11bc808c 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <o3tl/make_unique.hxx> #include <tools/stream.hxx> #include <vcl/window.hxx> #include <vcl/virdev.hxx> @@ -333,7 +332,7 @@ std::unique_ptr<XFillBitmapItem> XFillBitmapItem::checkForUniqueItem( SdrModel* // if the given name is not valid, replace it! if( aUniqueName != GetName() ) { - return o3tl::make_unique<XFillBitmapItem>(aUniqueName, maGraphicObject); + return std::make_unique<XFillBitmapItem>(aUniqueName, maGraphicObject); } } diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index e21a584273ca..555df737be18 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/make_unique.hxx> #include <svx/xtable.hxx> #include <svx/xattr.hxx> #include <svx/xpool.hxx> @@ -110,10 +109,10 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster) // create SetItems rPoolDefaults[XATTRSET_LINE - XATTR_START] = new XLineAttrSetItem( - o3tl::make_unique<SfxItemSet>( + std::make_unique<SfxItemSet>( *_pMaster, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{})); rPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem( - o3tl::make_unique<SfxItemSet>( + std::make_unique<SfxItemSet>( *_pMaster, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{})); // create ItemInfos diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 3c616ecb999c..be2091125d2d 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -27,8 +27,6 @@ #include <svx/xtable.hxx> #include <svx/xpool.hxx> -#include <o3tl/make_unique.hxx> - using namespace com::sun::star; XColorListRef XColorList::CreateStdColorList() @@ -70,18 +68,18 @@ bool XColorList::Create() // <!-- Gray palette from white to black --> const OUString aStrGrey( SvxResId( RID_SVXSTR_COLOR_GREY ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xff ), SvxResId( RID_SVXSTR_COLOR_WHITE ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xee, 0xee, 0xee ), aStrGrey + " 1" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xdd, 0xdd, 0xdd ), aStrGrey + " 2" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xcc, 0xcc, 0xcc ), aStrGrey + " 3" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xb2, 0xb2, 0xb2 ), aStrGrey + " 4" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x99, 0x99 ), aStrGrey + " 5" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x80, 0x80, 0x80 ), aStrGrey + " 6" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x66, 0x66, 0x66 ), aStrGrey + " 7" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x33, 0x33, 0x33 ), aStrGrey + " 8" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x1c, 0x1c, 0x1c ), aStrGrey + " 9" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x11, 0x11, 0x11 ), aStrGrey + " 10") ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x00, 0x00 ), SvxResId( RID_SVXSTR_COLOR_BLACK ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xff ), SvxResId( RID_SVXSTR_COLOR_WHITE ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xee, 0xee, 0xee ), aStrGrey + " 1" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xdd, 0xdd, 0xdd ), aStrGrey + " 2" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xcc, 0xcc, 0xcc ), aStrGrey + " 3" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xb2, 0xb2, 0xb2 ), aStrGrey + " 4" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x99, 0x99, 0x99 ), aStrGrey + " 5" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x80, 0x80, 0x80 ), aStrGrey + " 6" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x66, 0x66, 0x66 ), aStrGrey + " 7" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x33, 0x33, 0x33 ), aStrGrey + " 8" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x1c, 0x1c, 0x1c ), aStrGrey + " 9" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x11, 0x11, 0x11 ), aStrGrey + " 10") ); + Insert( std::make_unique<XColorEntry>( Color( 0x00, 0x00, 0x00 ), SvxResId( RID_SVXSTR_COLOR_BLACK ) ) ); // <!-- Base colors step 0 to 10 --> const sal_uInt32 nNumColorsInGroup(12); @@ -121,37 +119,37 @@ bool XColorList::Create() for(b = 0; b < nNumColorsInGroup; b++) { - Insert( o3tl::make_unique<XColorEntry>( Color(aStdCol[nOffset + b]), aStrCol[b] + aSuffix ) ); + Insert( std::make_unique<XColorEntry>( Color(aStdCol[nOffset + b]), aStrCol[b] + aSuffix ) ); } } // <!-- use some 'nice' colors from original palette --> - Insert( o3tl::make_unique<XColorEntry>( Color( 0xe6, 0xe6, 0xff ), SvxResId( RID_SVXSTR_COLOR_BLUEGREY) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xCF, 0xE7, 0xF5 ), SvxResId( RID_SVXSTR_COLOR_BLUE_CLASSIC ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xe6, 0xe6, 0xff ), SvxResId( RID_SVXSTR_COLOR_BLUEGREY) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xCF, 0xE7, 0xF5 ), SvxResId( RID_SVXSTR_COLOR_BLUE_CLASSIC ) ) ); // <!-- add 'pale' colors from original palette --> - Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x99, 0xff ), SvxResId( RID_SVXSTR_COLOR_VIOLET ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x99, 0x33, 0x66 ), SvxResId( RID_SVXSTR_COLOR_BORDEAUX ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xcc ), SvxResId( RID_SVXSTR_COLOR_PALE_YELLOW ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xcc, 0xff, 0xff ), SvxResId( RID_SVXSTR_COLOR_PALE_GREEN ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x66, 0x00, 0x66 ), SvxResId( RID_SVXSTR_COLOR_DARKVIOLET ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0x80, 0x80 ), SvxResId( RID_SVXSTR_COLOR_SALMON ) ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x66, 0xcc ), SvxResId( RID_SVXSTR_COLOR_SEABLUE ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x99, 0x99, 0xff ), SvxResId( RID_SVXSTR_COLOR_VIOLET ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x99, 0x33, 0x66 ), SvxResId( RID_SVXSTR_COLOR_BORDEAUX ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xff, 0xff, 0xcc ), SvxResId( RID_SVXSTR_COLOR_PALE_YELLOW ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xcc, 0xff, 0xff ), SvxResId( RID_SVXSTR_COLOR_PALE_GREEN ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x66, 0x00, 0x66 ), SvxResId( RID_SVXSTR_COLOR_DARKVIOLET ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xff, 0x80, 0x80 ), SvxResId( RID_SVXSTR_COLOR_SALMON ) ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x00, 0x66, 0xcc ), SvxResId( RID_SVXSTR_COLOR_SEABLUE ) ) ); // <!-- add Chart colors from original palette (also 12, coincidence?) --> const OUString aStrChart( SvxResId( RID_SVXSTR_COLOR_CHART ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x45, 0x86 ), aStrChart + " 1" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0x42, 0x0e ), aStrChart + " 2" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0xd3, 0x20 ), aStrChart + " 3" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x57, 0x9d, 0x1c ), aStrChart + " 4" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x7e, 0x00, 0x21 ), aStrChart + " 5" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x83, 0xca, 0xff ), aStrChart + " 6" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x31, 0x40, 0x04 ), aStrChart + " 7" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xae, 0xcf, 0x00 ), aStrChart + " 8" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x4b, 0x1f, 0x6f ), aStrChart + " 9" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xff, 0x95, 0x0e ), aStrChart + " 10" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0xc5, 0x00, 0x0b ), aStrChart + " 11" ) ); - Insert( o3tl::make_unique<XColorEntry>( Color( 0x00, 0x84, 0xd1 ), aStrChart + " 12" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x00, 0x45, 0x86 ), aStrChart + " 1" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xff, 0x42, 0x0e ), aStrChart + " 2" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xff, 0xd3, 0x20 ), aStrChart + " 3" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x57, 0x9d, 0x1c ), aStrChart + " 4" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x7e, 0x00, 0x21 ), aStrChart + " 5" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x83, 0xca, 0xff ), aStrChart + " 6" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x31, 0x40, 0x04 ), aStrChart + " 7" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xae, 0xcf, 0x00 ), aStrChart + " 8" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x4b, 0x1f, 0x6f ), aStrChart + " 9" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xff, 0x95, 0x0e ), aStrChart + " 10" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0xc5, 0x00, 0x0b ), aStrChart + " 11" ) ); + Insert( std::make_unique<XColorEntry>( Color( 0x00, 0x84, 0xd1 ), aStrChart + " 12" ) ); return(165 == Count()); } diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index b4161521693d..53bf2ec0d1fe 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -32,7 +32,6 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> #include <memory> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -68,9 +67,9 @@ bool XDashList::Create() { const OUString aStr(SvxResId(RID_SVXSTR_LINESTYLE)); - Insert(o3tl::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,1, 50,1, 50, 50),aStr + " 1")); - Insert(o3tl::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,1,500,1,500,500),aStr + " 2")); - Insert(o3tl::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,2, 50,3,250,120),aStr + " 3")); + Insert(std::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,1, 50,1, 50, 50),aStr + " 1")); + Insert(std::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,1,500,1,500,500),aStr + " 2")); + Insert(std::make_unique<XDashEntry>(XDash(css::drawing::DashStyle_RECT,2, 50,3,250,120),aStr + " 3")); return true; } diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index c882f3ff959e..fe082b782c88 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -33,7 +33,6 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <memory> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -68,17 +67,17 @@ bool XGradientList::Create() OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT)); aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; - Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_BLACK, COL_WHITE, css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_BLACK, COL_WHITE, css::awt::GradientStyle_LINEAR , 0,10,10, 0,100,100),aStr.toString())); aStr[nLen] = '2'; - Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_BLUE, COL_RED, css::awt::GradientStyle_AXIAL , 300,20,20,10,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_BLUE, COL_RED, css::awt::GradientStyle_AXIAL , 300,20,20,10,100,100),aStr.toString())); aStr[nLen] = '3'; - Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_RED, COL_YELLOW,css::awt::GradientStyle_RADIAL , 600,30,30,20,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_RED, COL_YELLOW,css::awt::GradientStyle_RADIAL , 600,30,30,20,100,100),aStr.toString())); aStr[nLen] = '4'; - Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_YELLOW , COL_GREEN, css::awt::GradientStyle_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_YELLOW , COL_GREEN, css::awt::GradientStyle_ELLIPTICAL, 900,40,40,30,100,100),aStr.toString())); aStr[nLen] = '5'; - Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_GREEN , COL_MAGENTA,css::awt::GradientStyle_SQUARE , 1200,50,50,40,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_GREEN , COL_MAGENTA,css::awt::GradientStyle_SQUARE , 1200,50,50,40,100,100),aStr.toString())); aStr[nLen] = '6'; - Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_MAGENTA, COL_YELLOW ,css::awt::GradientStyle_RECT , 1900,60,60,50,100,100),aStr.toString())); + Insert(std::make_unique<XGradientEntry>(XGradient(COL_MAGENTA, COL_YELLOW ,css::awt::GradientStyle_RECT , 1900,60,60,50,100,100),aStr.toString())); return true; } diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index d7e7944bf60c..ee26a5e90041 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -32,7 +32,6 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <memory> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; @@ -67,11 +66,11 @@ bool XHatchList::Create() aStr.append(" 1"); sal_Int32 nLen = aStr.getLength() - 1; - Insert(o3tl::make_unique<XHatchEntry>(XHatch(COL_BLACK,css::drawing::HatchStyle_SINGLE,100, 0),aStr.toString())); + Insert(std::make_unique<XHatchEntry>(XHatch(COL_BLACK,css::drawing::HatchStyle_SINGLE,100, 0),aStr.toString())); aStr[nLen] = '2'; - Insert(o3tl::make_unique<XHatchEntry>(XHatch(COL_RED ,css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString())); + Insert(std::make_unique<XHatchEntry>(XHatch(COL_RED ,css::drawing::HatchStyle_DOUBLE, 80,450),aStr.toString())); aStr[nLen] = '3'; - Insert(o3tl::make_unique<XHatchEntry>(XHatch(COL_BLUE ,css::drawing::HatchStyle_TRIPLE,120, 0),aStr.toString())); + Insert(std::make_unique<XHatchEntry>(XHatch(COL_BLUE ,css::drawing::HatchStyle_TRIPLE,120, 0),aStr.toString())); return true; } diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index f10883f4b784..05d3bdd5f60c 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -32,7 +32,6 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <memory> -#include <o3tl/make_unique.hxx> using namespace com::sun::star; @@ -63,7 +62,7 @@ bool XLineEndList::Create() aTriangle.append(basegfx::B2DPoint(0.0, 30.0)); aTriangle.append(basegfx::B2DPoint(20.0, 30.0)); aTriangle.setClosed(true); - Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aTriangle), SvxResId( RID_SVXSTR_ARROW ) ) ); + Insert( std::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aTriangle), SvxResId( RID_SVXSTR_ARROW ) ) ); basegfx::B2DPolygon aSquare; aSquare.append(basegfx::B2DPoint(0.0, 0.0)); @@ -71,10 +70,10 @@ bool XLineEndList::Create() aSquare.append(basegfx::B2DPoint(10.0, 10.0)); aSquare.append(basegfx::B2DPoint(0.0, 10.0)); aSquare.setClosed(true); - Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aSquare), SvxResId( RID_SVXSTR_SQUARE ) ) ); + Insert( std::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aSquare), SvxResId( RID_SVXSTR_SQUARE ) ) ); basegfx::B2DPolygon aCircle(basegfx::utils::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0)); - Insert( o3tl::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aCircle), SvxResId( RID_SVXSTR_CIRCLE ) ) ); + Insert( std::make_unique<XLineEndEntry>( basegfx::B2DPolyPolygon(aCircle), SvxResId( RID_SVXSTR_CIRCLE ) ) ); return true; } diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index d207bb15de4c..9f73b5175763 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -31,8 +31,6 @@ #include <vcl/svapp.hxx> #include <vcl/BitmapTools.hxx> -#include <o3tl/make_unique.hxx> - using namespace com::sun::star; XBitmapEntry* XPatternList::GetBitmap(long nIndex) const @@ -58,28 +56,28 @@ bool XPatternList::Create() // white/white bitmap aStr.append(" 1"); aBitmap = vcl::bitmap::createHistorical8x8FromArray(aArray, COL_WHITE, COL_WHITE); - Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); + Insert(std::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); // black/white bitmap aArray[ 0] = 1; aArray[ 9] = 1; aArray[18] = 1; aArray[27] = 1; aArray[36] = 1; aArray[45] = 1; aArray[54] = 1; aArray[63] = 1; aStr[nLen] = '2'; aBitmap = vcl::bitmap::createHistorical8x8FromArray(aArray, COL_BLACK, COL_WHITE); - Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); + Insert(std::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); // lightred/white bitmap aArray[ 7] = 1; aArray[14] = 1; aArray[21] = 1; aArray[28] = 1; aArray[35] = 1; aArray[42] = 1; aArray[49] = 1; aArray[56] = 1; aStr[nLen] = '3'; aBitmap = vcl::bitmap::createHistorical8x8FromArray(aArray, COL_LIGHTRED, COL_WHITE); - Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); + Insert(std::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); // lightblue/white bitmap aArray[24] = 1; aArray[25] = 1; aArray[26] = 1; aArray[29] = 1; aArray[30] = 1; aArray[31] = 1; aStr[nLen] = '4'; aBitmap = vcl::bitmap::createHistorical8x8FromArray(aArray, COL_LIGHTBLUE, COL_WHITE); - Insert(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); + Insert(std::make_unique<XBitmapEntry>(Graphic(aBitmap), aStr.toString())); return true; } |