diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-17 00:01:31 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-18 09:49:12 +0100 |
| commit | ba28af8aa576869a5e6a4f3129af302c824d31a5 (patch) | |
| tree | 89fa65a1b964625ea01030d6c80260217f2cde28 | |
| parent | fd1cfd25b48cb4bd5c87e9cb317b37699ca3a1d6 (diff) | |
o3tl::make_unique -> std::make_unique in chart2...cui
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I2ba0b9b44971166bd79527b52745f3c40dc14387
Reviewed-on: https://gerrit.libreoffice.org/66490
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
44 files changed, 208 insertions, 254 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 80d404307127..620897210db1 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; @@ -85,7 +84,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg SdrObject * pTextObj = m_pDrawViewWrapper->getNamedSdrObject( aCID ); if( pTextObj ) { - m_pTextHelper.reset( new ::accessibility::AccessibleTextHelper(o3tl::make_unique<SvxTextEditSource>(*pTextObj, nullptr, *pView, *pWindow)) ); + m_pTextHelper.reset( new ::accessibility::AccessibleTextHelper(std::make_unique<SvxTextEditSource>(*pTextObj, nullptr, *pView, *pWindow)) ); m_pTextHelper->SetEventSource( xEventSource ); } } diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 785bda5a3adc..c3787eb933c6 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -23,7 +23,6 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/frame/XModel.hpp> -#include <o3tl/make_unique.hxx> namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } @@ -74,7 +73,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) } svt::OGenericUnoDialog::Dialog ChartTypeUnoDlg::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) { - return svt::OGenericUnoDialog::Dialog(o3tl::make_unique<ChartTypeDialog>(Application::GetFrameWeld(rParent), m_xChartModel)); + return svt::OGenericUnoDialog::Dialog(std::make_unique<ChartTypeDialog>(Application::GetFrameWeld(rParent), m_xChartModel)); } uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() { diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 855885b459d6..72cc850b3415 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -29,7 +29,6 @@ #include <svtools/valueset.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/weld.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> @@ -656,24 +655,24 @@ ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference< } } - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<ColumnChartDialogController>()); - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<BarChartDialogController>()); - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<PieChartDialogController>()); - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<AreaChartDialogController>()); - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<LineChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<ColumnChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<BarChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<PieChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<AreaChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<LineChartDialogController>()); if (bEnableComplexChartTypes) { - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<XYChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<XYChartDialogController>()); m_aChartTypeDialogControllerList.push_back( - o3tl::make_unique<BubbleChartDialogController>()); + std::make_unique<BubbleChartDialogController>()); } - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<NetChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<NetChartDialogController>()); if (bEnableComplexChartTypes) { - m_aChartTypeDialogControllerList.push_back(o3tl::make_unique<StockChartDialogController>()); + m_aChartTypeDialogControllerList.push_back(std::make_unique<StockChartDialogController>()); } m_aChartTypeDialogControllerList.push_back( - o3tl::make_unique<CombiColumnLineChartDialogController>()); + std::make_unique<CombiColumnLineChartDialogController>()); for (auto const& elem : m_aChartTypeDialogControllerList) { diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 23eb9ab0b349..6896cd4f208c 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -67,7 +67,6 @@ #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <svx/unoapi.hxx> -#include <o3tl/make_unique.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <tools/diagnose_ex.h> @@ -158,7 +157,7 @@ std::unique_ptr<ReferenceSizeProvider> ChartController::impl_createReferenceSize { awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) ); - return o3tl::make_unique<ReferenceSizeProvider>( + return std::make_unique<ReferenceSizeProvider>( aPageSize, Reference<chart2::XChartDocument>(getModel(), uno::UNO_QUERY)); } @@ -412,7 +411,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel ) } pDestPage->InsertObject( pNewObj ); - m_pDrawViewWrapper->AddUndo( o3tl::make_unique<SdrUndoInsertObj>( *pNewObj ) ); + m_pDrawViewWrapper->AddUndo( std::make_unique<SdrUndoInsertObj>( *pNewObj ) ); xSelShape = xShape; } } @@ -475,7 +474,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons if ( pObj ) { m_pDrawViewWrapper->BegUndo( SvxResId( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) ); - m_pDrawViewWrapper->AddUndo( o3tl::make_unique<SdrUndoInsertObj>( *pObj ) ); + m_pDrawViewWrapper->AddUndo( std::make_unique<SdrUndoInsertObj>( *pObj ) ); m_pDrawViewWrapper->EndUndo(); impl_switchDiagramPositioningToExcludingPositioning(); diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 7c2225f9087e..67db8d3e4503 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -23,7 +23,6 @@ #include "ChartTransferable.hxx" -#include <o3tl/make_unique.hxx> #include <sot/exchange.hxx> #include <sot/storage.hxx> #include <unotools/streamwrap.hxx> @@ -52,7 +51,7 @@ ChartTransferable::ChartTransferable( : m_pMarkedObjModel( nullptr ) ,m_bDrawing( bDrawing ) { - std::unique_ptr<SdrExchangeView> pExchgView(o3tl::make_unique<SdrView>( rSdrModel )); + std::unique_ptr<SdrExchangeView> pExchgView(std::make_unique<SdrView>( rSdrModel )); SdrPageView* pPv = pExchgView->ShowSdrPage( rSdrModel.GetPage( 0 )); if( pSelectedObj ) pExchgView->MarkObj( pSelectedObj, pPv ); diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx index a664c30490bc..a068bacf0c29 100644 --- a/chart2/source/controller/main/SelectionHelper.cxx +++ b/chart2/source/controller/main/SelectionHelper.cxx @@ -28,7 +28,6 @@ #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <o3tl/make_unique.hxx> namespace chart { @@ -595,7 +594,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) for( sal_uInt32 nM = 0; nM < aPolygon.count(); nM++) { const ::basegfx::B2DPoint aPoint(aPolygon.getB2DPoint(nM)); - rHdlList.AddHdl(o3tl::make_unique<SdrHdl>(Point(basegfx::fround(aPoint.getX()), basegfx::fround(aPoint.getY())), SdrHdlKind::Poly)); + rHdlList.AddHdl(std::make_unique<SdrHdl>(Point(basegfx::fround(aPoint.getX()), basegfx::fround(aPoint.getY())), SdrHdlKind::Poly)); } } return true; @@ -640,7 +639,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList ) } Point aPos = pSubObj->GetCurrentBoundRect().Center(); - rHdlList.AddHdl(o3tl::make_unique<SdrHdl>(aPos,SdrHdlKind::Poly)); + rHdlList.AddHdl(std::make_unique<SdrHdl>(aPos,SdrHdlKind::Poly)); } return true; } diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index cdf781085d90..f8ac3e7d62ef 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -19,7 +19,6 @@ #include "BarPositionHelper.hxx" #include <DateHelper.hxx> -#include <o3tl/make_unique.hxx> namespace chart { @@ -45,7 +44,7 @@ BarPositionHelper::~BarPositionHelper() std::unique_ptr<PlottingPositionHelper> BarPositionHelper::clone() const { - return o3tl::make_unique<BarPositionHelper>(*this); + return std::make_unique<BarPositionHelper>(*this); } void BarPositionHelper::updateSeriesCount( double fSeriesCount ) diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 26b34dc2108a..055f2743baba 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -61,7 +61,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <editeng/unoprnms.hxx> #include <tools/color.hxx> -#include <o3tl/make_unique.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> #include <basegfx/vector/b2dvector.hxx> @@ -1867,7 +1866,7 @@ private: if (it == m_SeriesGroup.end()) { std::pair<GroupMinMaxType::iterator,bool> r = - m_SeriesGroup.insert(std::make_pair(fX, o3tl::make_unique<SeriesMinMaxType>())); + m_SeriesGroup.insert(std::make_pair(fX, std::make_unique<SeriesMinMaxType>())); if (!r.second) // insertion failed. @@ -2622,9 +2621,9 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter( else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE) ) pRet = new PieChart(xChartTypeModel,nDimensionCount, bExcludingPositioning ); else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_NET) ) - pRet = new NetChart(xChartTypeModel,nDimensionCount,true,o3tl::make_unique<PolarPlottingPositionHelper>()); + pRet = new NetChart(xChartTypeModel,nDimensionCount,true,std::make_unique<PolarPlottingPositionHelper>()); else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) ) - pRet = new NetChart(xChartTypeModel,nDimensionCount,false,o3tl::make_unique<PolarPlottingPositionHelper>()); + pRet = new NetChart(xChartTypeModel,nDimensionCount,false,std::make_unique<PolarPlottingPositionHelper>()); else if( aChartType.equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) ) pRet = new CandleStickChart(xChartTypeModel,nDimensionCount); else diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 281a3da4c040..2382894e383a 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <o3tl/make_unique.hxx> #include <rtl/math.hxx> #include <tools/helpers.hxx> @@ -81,7 +80,7 @@ PlottingPositionHelper::~PlottingPositionHelper() std::unique_ptr<PlottingPositionHelper> PlottingPositionHelper::clone() const { - return o3tl::make_unique<PlottingPositionHelper>(*this); + return std::make_unique<PlottingPositionHelper>(*this); } std::unique_ptr<PlottingPositionHelper> PlottingPositionHelper::createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ) @@ -337,7 +336,7 @@ PolarPlottingPositionHelper::~PolarPlottingPositionHelper() std::unique_ptr<PlottingPositionHelper> PolarPlottingPositionHelper::clone() const { - return o3tl::make_unique<PolarPlottingPositionHelper>(*this); + return std::make_unique<PolarPlottingPositionHelper>(*this); } void PolarPlottingPositionHelper::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix) diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index b48359afdde1..f799388c727b 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -37,7 +37,6 @@ #include <dbase/DResultSet.hxx> #include <strings.hrc> #include <unotools/sharedunocomponent.hxx> -#include <o3tl/make_unique.hxx> using namespace ::comphelper; @@ -163,7 +162,7 @@ void ODbaseIndex::openIndexFile() std::unique_ptr<OIndexIterator> ODbaseIndex::createIterator() { openIndexFile(); - return o3tl::make_unique<OIndexIterator>(this); + return std::make_unique<OIndexIterator>(this); } bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue) diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index c48073ed2a41..f071b4b66d51 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -40,7 +40,6 @@ #include <connectivity/dbexception.hxx> #include <connectivity/sqlerror.hxx> #include <cppuhelper/typeprovider.hxx> -#include <o3tl/make_unique.hxx> #include <rtl/string.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> @@ -628,11 +627,11 @@ OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pCo ,m_nLength(0) { if (eds_check_version( 3, 7, 6 ) == nullptr) - m_pVersionHelper = o3tl::make_unique<OEvoabVersion38Helper>(); + m_pVersionHelper = std::make_unique<OEvoabVersion38Helper>(); else if (eds_check_version( 3, 6, 0 ) == nullptr) - m_pVersionHelper = o3tl::make_unique<OEvoabVersion36Helper>(); + m_pVersionHelper = std::make_unique<OEvoabVersion36Helper>(); else - m_pVersionHelper = o3tl::make_unique<OEvoabVersion35Helper>(); + m_pVersionHelper = std::make_unique<OEvoabVersion35Helper>(); #define REGISTER_PROP( id, member ) \ registerProperty( \ diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx index 8c37dd7fa147..dc83d9c3dec8 100644 --- a/connectivity/source/drivers/macab/MacabHeader.cxx +++ b/connectivity/source/drivers/macab/MacabHeader.cxx @@ -25,7 +25,6 @@ #include <math.h> #include <com/sun/star/sdbc/DataType.hpp> #include <connectivity/dbconversion.hxx> -#include <o3tl/make_unique.hxx> using namespace connectivity::macab; using namespace com::sun::star::sdbc; @@ -37,7 +36,7 @@ MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields) { sal_Int32 i; size = _size; - fields = o3tl::make_unique<macabfield *[]>(size); + fields = std::make_unique<macabfield *[]>(size); for(i = 0; i < size; i++) { if(_fields[i] == nullptr) @@ -87,7 +86,7 @@ void MacabHeader::operator+= (const MacabHeader *r) { sal_Int32 i; size = rSize; - fields = o3tl::make_unique<macabfield *[]>(size); + fields = std::make_unique<macabfield *[]>(size); for(i = 0; i < size; i++) { fields[i] = r->copy(i); diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index 89a5094c48e0..5d95e320ef20 100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.cxx @@ -21,7 +21,6 @@ #include "MacabRecord.hxx" #include "macabutilities.hxx" #include <com/sun/star/util/DateTime.hpp> -#include <o3tl/make_unique.hxx> #include <premac.h> #include <Carbon/Carbon.h> @@ -43,7 +42,7 @@ MacabRecord::MacabRecord() MacabRecord::MacabRecord(const sal_Int32 _size) { size = _size; - fields = o3tl::make_unique<macabfield *[]>(size); + fields = std::make_unique<macabfield *[]>(size); sal_Int32 i; for(i = 0; i < size; i++) fields[i] = nullptr; diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 19fa868a2b28..58695a8701ff 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.cxx @@ -33,7 +33,6 @@ #include <AddressBook/ABAddressBookC.h> #include <postmac.h> #include <com/sun/star/util/DateTime.hpp> -#include <o3tl/make_unique.hxx> using namespace connectivity::macab; using namespace com::sun::star::util; @@ -635,12 +634,12 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert multiLabel = OUStringToCFString(multiLabelString); hdr.reset(createHeaderForProperty(multiType, multiValue, multiLabel)); if (!hdr) - hdr = o3tl::make_unique<MacabHeader>(); + hdr = std::make_unique<MacabHeader>(); multiLengthSecondLevel += hdr->getSize(); } else { - hdr = o3tl::make_unique<MacabHeader>(); + hdr = std::make_unique<MacabHeader>(); } if(multiValue) CFRelease(multiValue); @@ -785,7 +784,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert arrLabel = OUStringToCFString(arrLabelString); auto hdr = std::unique_ptr<MacabHeader>(createHeaderForProperty(arrType, arrValue, arrLabel)); if (!hdr) - hdr = o3tl::make_unique<MacabHeader>(); + hdr = std::make_unique<MacabHeader>(); length += hdr->getSize(); CFRelease(arrLabel); arrHeaders.push_back(std::move(hdr)); diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx index 0baa759da14c..87978f592fe9 100644 --- a/connectivity/source/drivers/writer/WCatalog.cxx +++ b/connectivity/source/drivers/writer/WCatalog.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <connectivity/sdbcx/VCollection.hxx> -#include <o3tl/make_unique.hxx> #include <writer/WConnection.hxx> @@ -55,7 +54,7 @@ void OWriterCatalog::refreshTables() if (m_pTables) m_pTables->reFill(aVector); else - m_pTables = o3tl::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector); + m_pTables = std::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector); } } // namespace writer diff --git a/connectivity/source/inc/writer/WConnection.hxx b/connectivity/source/inc/writer/WConnection.hxx index 7fdbdfa13310..5b3eae535e18 100644 --- a/connectivity/source/inc/writer/WConnection.hxx +++ b/connectivity/source/inc/writer/WConnection.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <unotools/closeveto.hxx> -#include <o3tl/make_unique.hxx> namespace com { @@ -81,7 +80,7 @@ class OWriterConnection : public file::OConnection { m_xDesktop = rDesktop; m_xDesktop->addTerminateListener(this); - m_pCloseListener = o3tl::make_unique<utl::CloseVeto>(rCloseable, true); + m_pCloseListener = std::make_unique<utl::CloseVeto>(rCloseable, true); } void stop() diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index a0af6822c200..dafc0f95caf6 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -330,7 +330,6 @@ #include <i18nutil/paper.hxx> #include <i18nutil/transliteration.hxx> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/make_unique.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <officecfg/Office/Common.hxx> diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx index ecfe145bd0f7..3908896763b4 100644 --- a/cui/source/customize/CommandCategoryListBox.cxx +++ b/cui/source/customize/CommandCategoryListBox.cxx @@ -41,7 +41,6 @@ #include <strings.hrc> #include <bitmaps.hlst> #include <comphelper/sequenceashashmap.hxx> -#include <o3tl/make_unique.hxx> #include <i18nutil/searchopt.hxx> #include <sal/log.hxx> @@ -142,7 +141,7 @@ void CommandCategoryListBox::Init( { // Add the category of "All commands" nEntryPos = InsertEntry( CuiResId(RID_SVXSTR_ALLFUNCTIONS) ); - m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) ); + m_aGroupInfo.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) ); SetEntryData( nEntryPos, m_aGroupInfo.back().get() ); } @@ -169,7 +168,7 @@ void CommandCategoryListBox::Init( nEntryPos = InsertEntry( sGroupName ); m_aGroupInfo.push_back( - o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_FUNCTION, rGroupID ) ); + std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_FUNCTION, rGroupID ) ); SetEntryData( nEntryPos, m_aGroupInfo.back().get() ); } @@ -183,7 +182,7 @@ void CommandCategoryListBox::Init( OUString sMacros( CuiResId(RID_SVXSTR_MACROS) ); nEntryPos = InsertEntry( sMacros ); m_aGroupInfo.push_back( - o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, nullptr) ); + std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, nullptr) ); SetEntryData( nEntryPos, m_aGroupInfo.back().get() ); // Add styles category @@ -191,7 +190,7 @@ void CommandCategoryListBox::Init( nEntryPos = InsertEntry( sStyle ); //TODO: last param should contain user data? m_aGroupInfo.push_back( - o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); + std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); SetEntryData( nEntryPos, m_aGroupInfo.back().get() ); } catch(const css::uno::RuntimeException&) @@ -239,7 +238,7 @@ void CommandCategoryListBox::FillFunctionsList( SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName, aImage, aImage ); - m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) ); + m_aGroupInfo.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) ); SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get(); pGrpInfo->sCommand = rInfo.Command; pGrpInfo->sLabel = sUIName; @@ -345,7 +344,7 @@ void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionLi rootNode->acquire(); m_aGroupInfo.push_back( - o3tl::make_unique<SfxGroupInfo_Impl>( + std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>(rootNode.get()) ) ); // Add main macro groups @@ -376,7 +375,7 @@ void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionLi SvTreeListEntry* pMacroGroup = pFunctionListBox->InsertEntry( sUIName ); m_aGroupInfo.push_back( - o3tl::make_unique<SfxGroupInfo_Impl>( + std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0 ) ); SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get(); pMacroGroup->SetUserData(pGrpInfo); @@ -413,7 +412,7 @@ void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionLi SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pIt.sLabel ); // Name of the style family - m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0 ) ); + m_aGroupInfo.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0 ) ); SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get(); pFuncEntry->SetUserData(pGrpInfo); pFuncEntry->EnableChildrenOnDemand(); @@ -444,7 +443,7 @@ void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionLi sUIName, pFuncEntry ); m_aGroupInfo.push_back( - o3tl::make_unique<SfxGroupInfo_Impl>( + std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pStyle ) ); m_aGroupInfo.back()->sCommand = pStyle->sCommand; @@ -501,7 +500,7 @@ void CommandCategoryListBox::addChildren( SvTreeListEntry* pNewEntry = pFunctionListBox->InsertEntry( sUIName, parentEntry ); - m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, + m_aGroupInfo.push_back( std::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>( child.get()))); pNewEntry->SetUserData( m_aGroupInfo.back().get() ); pNewEntry->EnableChildrenOnDemand(); @@ -563,7 +562,7 @@ void CommandCategoryListBox::addChildren( SvTreeListEntry* pNewEntry = pFunctionListBox->InsertEntry( sUIName, aImage, aImage, parentEntry ); - m_aGroupInfo.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SCRIPT, 0, pScriptURI )); + m_aGroupInfo.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SCRIPT, 0, pScriptURI )); m_aGroupInfo.back()->sCommand = uri; m_aGroupInfo.back()->sLabel = sUIName; m_aGroupInfo.back()->sHelpText = description; diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index bf0247ca5f2c..06836f52d6ea 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -63,7 +63,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/configmgr.hxx> -#include <o3tl/make_unique.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 306d5477c63c..01746d0c10e5 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -63,7 +63,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/configmgr.hxx> -#include <o3tl/make_unique.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index f213e382d422..7f8abc0d83a0 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -71,7 +71,6 @@ #include <vcl/help.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <o3tl/make_unique.hxx> // namespaces using namespace css; @@ -1074,8 +1073,8 @@ void SfxAcceleratorConfigPage::CreateCustomItems(SvTreeListEntry* pEntry, const OUString& sCol1 , const OUString& sCol2) { - pEntry->ReplaceItem(o3tl::make_unique<SfxAccCfgLBoxString_Impl>(sCol1), 1); - pEntry->ReplaceItem(o3tl::make_unique<SfxAccCfgLBoxString_Impl>(sCol2), 2); + pEntry->ReplaceItem(std::make_unique<SfxAccCfgLBoxString_Impl>(sCol1), 1); + pEntry->ReplaceItem(std::make_unique<SfxAccCfgLBoxString_Impl>(sCol2), 2); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index ba0653a15a25..406f89d4f7ac 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -65,7 +65,6 @@ #include <dialmgr.hxx> #include <unotools/configmgr.hxx> -#include <o3tl/make_unique.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> @@ -1742,7 +1741,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( pNewEntryData->GetStyle() & css::ui::ItemStyle::DROP_DOWN ) { // add new popup painter, it gets destructed by the entry - pNewEntry->ReplaceItem( o3tl::make_unique<PopupPainter>(aName), pNewEntry->ItemCount() - 1 ); + pNewEntry->ReplaceItem( std::make_unique<PopupPainter>(aName), pNewEntry->ItemCount() - 1 ); } } diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 4969c2740cca..14367102b237 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -65,7 +65,6 @@ #include <vcl/fixed.hxx> #include <vcl/help.hxx> #include <vcl/vclmedit.hxx> -#include <o3tl/make_unique.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -520,7 +519,7 @@ void SfxConfigGroupListBox::InitModule() { // Add All Commands category SvTreeListEntry* pEntry = InsertEntry( CuiResId(RID_SVXSTR_ALLFUNCTIONS) ); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) ); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) ); pEntry->SetUserData(aArr.back().get()); } @@ -540,7 +539,7 @@ void SfxConfigGroupListBox::InitModule() { continue; } SvTreeListEntry* pEntry = InsertEntry(sGroupName); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_FUNCTION, rGroupID ) ); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_FUNCTION, rGroupID ) ); pEntry->SetUserData(aArr.back().get()); } } @@ -674,7 +673,7 @@ void SfxConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip SetExpandedEntryBmp( pNewEntry, aImage ); SetCollapsedEntryBmp( pNewEntry, aImage ); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>( theChild.get()))); pNewEntry->SetUserData( aArr.back().get() ); @@ -716,7 +715,7 @@ void SfxConfigGroupListBox::FillFunctionsList(const css::uno::Sequence<DispatchI { OUString sUIName = MapCommand2UIName(rInfo.Command); SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName ); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) ); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) ); SfxGroupInfo_Impl* pGrpInfo = aArr.back().get(); pGrpInfo->sCommand = rInfo.Command; pGrpInfo->sLabel = sUIName; @@ -767,7 +766,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent //get autodestructed and become invalid when accessed later. rootNode->acquire(); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>(rootNode.get()))); OUString aTitle(xImp->m_sDlgMacros); SvTreeListEntry *pNewEntry = InsertEntry( aTitle ); @@ -787,7 +786,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent { OUString sStyle(xImp->m_aStrGroupStyles); SvTreeListEntry *pEntry = InsertEntry( sStyle ); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); // TODO last parameter should contain user data + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); // TODO last parameter should contain user data pEntry->SetUserData( aArr.back().get() ); pEntry->EnableChildrenOnDemand(); } @@ -1007,7 +1006,7 @@ void SfxConfigGroupListBox::GroupSelected() pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); - pFunctionListBox->aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SCRIPT, 0, pScriptURI )); + pFunctionListBox->aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SCRIPT, 0, pScriptURI )); pFunctionListBox->aArr.back()->sCommand = uri; pFunctionListBox->aArr.back()->sLabel = children[n]->getName(); pFunctionListBox->aArr.back()->sHelpText = description; @@ -1033,7 +1032,7 @@ void SfxConfigGroupListBox::GroupSelected() { SfxStyleInfo_Impl* pStyle = new SfxStyleInfo_Impl(lStyle); SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel ); - pFunctionListBox->aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pStyle ) ); + pFunctionListBox->aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pStyle ) ); pFunctionListBox->aArr.back()->sCommand = pStyle->sCommand; pFunctionListBox->aArr.back()->sLabel = pStyle->sLabel; pFuncEntry->SetUserData( pFunctionListBox->aArr.back().get() ); @@ -1113,7 +1112,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) { SfxStyleInfo_Impl* pFamily = new SfxStyleInfo_Impl(lStyleFamily); SvTreeListEntry* pStyleEntry = InsertEntry( pFamily->sLabel, pEntry ); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pFamily )); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pFamily )); pStyleEntry->SetUserData( aArr.back().get() ); pStyleEntry->EnableChildrenOnDemand( false ); } @@ -1259,7 +1258,7 @@ void CuiConfigGroupListBox::InitModule() if ( c1 ) { // Add All Commands category - aArr.push_back(o3tl::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_ALLFUNCTIONS, 0)); + aArr.push_back(std::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_ALLFUNCTIONS, 0)); m_xTreeView->append(OUString::number(reinterpret_cast<sal_Int64>(aArr.back().get())), CuiResId(RID_SVXSTR_ALLFUNCTIONS)); } @@ -1279,7 +1278,7 @@ void CuiConfigGroupListBox::InitModule() catch(const css::container::NoSuchElementException&) { continue; } - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_FUNCTION, rGroupID ) ); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_FUNCTION, rGroupID ) ); m_xTreeView->append(OUString::number(reinterpret_cast<sal_Int64>(aArr.back().get())), sGroupName); } @@ -1380,7 +1379,7 @@ void CuiConfigGroupListBox::FillScriptList(const css::uno::Reference< css::scrip OUString aImage = GetImage(theChild, m_xContext, bIsRootNode); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>( theChild.get()))); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(aArr.back().get()))); @@ -1399,7 +1398,7 @@ void CuiConfigGroupListBox::FillFunctionsList(const css::uno::Sequence<DispatchI for (const auto & rInfo : xCommands) { OUString sUIName = MapCommand2UIName(rInfo.Command); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) ); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SLOT, 0 ) ); SfxGroupInfo_Impl* pGrpInfo = aArr.back().get(); pGrpInfo->sCommand = rInfo.Command; pGrpInfo->sLabel = sUIName; @@ -1450,7 +1449,7 @@ void CuiConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent //get autodestructed and become invalid when accessed later. rootNode->acquire(); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_SCRIPTCONTAINER, 0, static_cast<void *>(rootNode.get()))); OUString aTitle(xImp->m_sDlgMacros); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(aArr.back().get()))); @@ -1467,7 +1466,7 @@ void CuiConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent // add styles if ( bEventMode ) { - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); // TODO last parameter should contain user data + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); // TODO last parameter should contain user data OUString sStyle(xImp->m_aStrGroupStyles); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(aArr.back().get()))); m_xTreeView->insert(nullptr, -1, &sStyle, &sId, nullptr, nullptr, nullptr, true); @@ -1684,7 +1683,7 @@ void CuiConfigGroupListBox::GroupSelected() OUString* pScriptURI = new OUString( uri ); OUString aImage = GetImage(children[n], Reference< XComponentContext >(), false); - m_pFunctionListBox->aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SCRIPT, 0, pScriptURI )); + m_pFunctionListBox->aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::FUNCTION_SCRIPT, 0, pScriptURI )); m_pFunctionListBox->aArr.back()->sCommand = uri; m_pFunctionListBox->aArr.back()->sLabel = children[n]->getName(); m_pFunctionListBox->aArr.back()->sHelpText = description; @@ -1711,7 +1710,7 @@ void CuiConfigGroupListBox::GroupSelected() for (auto const& lStyle : lStyles) { SfxStyleInfo_Impl* pStyle = new SfxStyleInfo_Impl(lStyle); - m_pFunctionListBox->aArr.push_back(o3tl::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_STYLES, 0, pStyle)); + m_pFunctionListBox->aArr.push_back(std::make_unique<SfxGroupInfo_Impl>(SfxCfgKind::GROUP_STYLES, 0, pStyle)); m_pFunctionListBox->aArr.back()->sCommand = pStyle->sCommand; m_pFunctionListBox->aArr.back()->sLabel = pStyle->sLabel; OUString sId(OUString::number(reinterpret_cast<sal_Int64>(m_pFunctionListBox->aArr.back().get()))); @@ -1760,7 +1759,7 @@ IMPL_LINK(CuiConfigGroupListBox, ExpandingHdl, weld::TreeIter&, rIter, bool) for (auto const& lStyleFamily : lStyleFamilies) { SfxStyleInfo_Impl* pFamily = new SfxStyleInfo_Impl(lStyleFamily); - aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pFamily )); + aArr.push_back( std::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_STYLES, 0, pFamily )); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(aArr.back().get()))); m_xTreeView->insert(&rIter, -1, &pFamily->sLabel, &sId, nullptr, nullptr, nullptr, false); } diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 45b5db7632c4..bb3786e09d99 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -40,7 +40,6 @@ #include <strings.hrc> #include <vcl/builderfactory.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <o3tl/make_unique.hxx> #include <algorithm> #include <iterator> @@ -533,7 +532,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents) OUString* pEventName = new OUString( sEventName ); _pE->SetUserData( static_cast<void*>(pEventName) ); OUString sNew( eventURL ); - _pE->ReplaceItem(o3tl::make_unique<IconLBoxString>(sNew, &mpImpl->aMacroImg, &mpImpl->aComponentImg), + _pE->ReplaceItem(std::make_unique<IconLBoxString>(sNew, &mpImpl->aMacroImg, &mpImpl->aComponentImg), LB_MACROS_ITEMPOS ); rListBox.GetModel()->InvalidateEntry( _pE ); rListBox.Select( _pE ); @@ -676,7 +675,7 @@ void SvxMacroTabPage_::GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* // update the listbox entry pImpl->pEventLB->SetUpdateMode( false ); - pE->ReplaceItem(o3tl::make_unique<IconLBoxString>(sEventURL, &pImpl->aMacroImg, &pImpl->aComponentImg), + pE->ReplaceItem(std::make_unique<IconLBoxString>(sEventURL, &pImpl->aMacroImg, &pImpl->aComponentImg), LB_MACROS_ITEMPOS ); rListBox.GetModel()->InvalidateEntry( pE ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 962c17d3387d..eb2d0ff4655f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -765,7 +765,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void) SpellContinue_Impl(); } - m_pSentenceED->AddUndoAction(o3tl::make_unique<SpellUndoAction_Impl>(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink)); + m_pSentenceED->AddUndoAction(std::make_unique<SpellUndoAction_Impl>(SPELLUNDO_CHANGE_LANGUAGE, aDialogUndoLink)); } SpellDialog::UpdateBoxes_Impl(); } @@ -2003,7 +2003,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pTextEngine->RemoveAttribs( 0, sal_uInt16(TEXTATTR_FONTWEIGHT) ); //put the appropriate action on the Undo-stack - AddUndoAction( o3tl::make_unique<SpellUndoAction_Impl>( + AddUndoAction( std::make_unique<SpellUndoAction_Impl>( SPELLUNDO_UNDO_EDIT_MODE, GetSpellDialog()->aDialogUndoLink) ); pSpellDialog->m_pChangePB->Enable(); } diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index ad5cf3819cad..e90574a8426e 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -33,7 +33,6 @@ #include <vcl/fontcharmap.hxx> #include <vcl/virdev.hxx> #include <svl/stritem.hxx> -#include <o3tl/make_unique.hxx> #include <officecfg/Office/Common.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/dispatchcommand.hxx> @@ -105,38 +104,38 @@ SvxCharacterMap::SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet, , m_xRecentGrid(m_xBuilder->weld_widget("viewgrid")) , m_xFavGrid(m_xBuilder->weld_widget("favgrid")) , m_xShowChar(new weld::CustomWeld(*m_xBuilder, "showchar", m_aShowChar)) - , m_xRecentCharView{o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar1", m_aRecentCharView[0]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar2", m_aRecentCharView[1]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar3", m_aRecentCharView[2]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar4", m_aRecentCharView[3]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar5", m_aRecentCharView[4]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar6", m_aRecentCharView[5]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar7", m_aRecentCharView[6]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar8", m_aRecentCharView[7]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar9", m_aRecentCharView[8]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar10", m_aRecentCharView[9]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar11", m_aRecentCharView[10]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar12", m_aRecentCharView[11]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar13", m_aRecentCharView[12]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar14", m_aRecentCharView[13]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar15", m_aRecentCharView[14]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar16", m_aRecentCharView[15])} - , m_xFavCharView{o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar1", m_aFavCharView[0]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar2", m_aFavCharView[1]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar3", m_aFavCharView[2]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar4", m_aFavCharView[3]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar5", m_aFavCharView[4]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar6", m_aFavCharView[5]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar7", m_aFavCharView[6]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar8", m_aFavCharView[7]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar9", m_aFavCharView[8]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar10", m_aFavCharView[9]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar11", m_aFavCharView[10]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar12", m_aFavCharView[11]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar13", m_aFavCharView[12]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar14", m_aFavCharView[13]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar15", m_aFavCharView[14]), - o3tl::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar16", m_aFavCharView[15])} + , m_xRecentCharView{std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar1", m_aRecentCharView[0]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar2", m_aRecentCharView[1]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar3", m_aRecentCharView[2]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar4", m_aRecentCharView[3]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar5", m_aRecentCharView[4]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar6", m_aRecentCharView[5]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar7", m_aRecentCharView[6]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar8", m_aRecentCharView[7]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar9", m_aRecentCharView[8]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar10", m_aRecentCharView[9]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar11", m_aRecentCharView[10]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar12", m_aRecentCharView[11]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar13", m_aRecentCharView[12]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar14", m_aRecentCharView[13]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar15", m_aRecentCharView[14]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "viewchar16", m_aRecentCharView[15])} + , m_xFavCharView{std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar1", m_aFavCharView[0]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar2", m_aFavCharView[1]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar3", m_aFavCharView[2]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar4", m_aFavCharView[3]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar5", m_aFavCharView[4]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar6", m_aFavCharView[5]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar7", m_aFavCharView[6]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar8", m_aFavCharView[7]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar9", m_aFavCharView[8]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar10", m_aFavCharView[9]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar11", m_aFavCharView[10]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar12", m_aFavCharView[11]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar13", m_aFavCharView[12]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar14", m_aFavCharView[13]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar15", m_aFavCharView[14]), + std::make_unique<weld::CustomWeld>(*m_xBuilder, "favchar16", m_aFavCharView[15])} , m_xShowSet(new SvxShowCharSet(m_xBuilder->weld_scrolled_window("showscroll"), m_xVirDev)) , m_xShowSetArea(new weld::CustomWeld(*m_xBuilder, "showcharset", *m_xShowSet)) , m_xSearchSet(new SvxSearchCharSet(m_xBuilder->weld_scrolled_window("searchscroll"), m_xVirDev)) diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index a3e31a91dbd4..9612b8195bd6 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -21,7 +21,6 @@ #include <osl/diagnose.h> #include <comphelper/lok.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> #include <cuihyperdlg.hxx> @@ -124,7 +123,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) GetCancelButton().SetText ( CuiResId(RID_SVXSTR_HYPDLG_CLOSEBUT) ); // create itemset for tabpages - mpItemSet = o3tl::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_HYPERLINK_GETLINK, + mpItemSet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_HYPERLINK_GETLINK, SID_HYPERLINK_SETLINK>{} ); SvxHyperlinkItem aItem(SID_HYPERLINK_GETLINK); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 379ceeb47240..d70a3671c30f 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -25,7 +25,6 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/builderfactory.hxx> -#include <o3tl/make_unique.hxx> #include <strings.hrc> #include <bitmaps.hlst> @@ -234,7 +233,7 @@ void SFTreeListBox::Init( const OUString& language ) getLangNodeFromRootNode( children[ n ], language ); insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC), - nullptr, true, o3tl::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL ); + nullptr, true, std::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL ); } SetUpdateMode( true ); @@ -315,11 +314,11 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference< OUString name( children[ n ]->getName() ); if ( children[ n ]->getType() != browse::BrowseNodeTypes::SCRIPT) { - insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, o3tl::make_unique< SFEntry >( children[ n ],model)); + insertEntry(name, RID_CUIBMP_LIB, pRootEntry, true, std::make_unique< SFEntry >( children[ n ],model)); } else { - insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, o3tl::make_unique< SFEntry >( children[ n ],model)); + insertEntry(name, RID_CUIBMP_MACRO, pRootEntry, false, std::make_unique< SFEntry >( children[ n ],model)); } } } @@ -935,12 +934,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if ( aChildNode->getType() == browse::BrowseNodeTypes::SCRIPT ) { pNewEntry = m_pScriptsBox->insertEntry( aChildName, - RID_CUIBMP_MACRO, pEntry, false, o3tl::make_unique< SFEntry >( aChildNode,xDocumentModel ) ); + RID_CUIBMP_MACRO, pEntry, false, std::make_unique< SFEntry >( aChildNode,xDocumentModel ) ); } else { pNewEntry = m_pScriptsBox->insertEntry( aChildName, - RID_CUIBMP_LIB, pEntry, false, o3tl::make_unique< SFEntry >( aChildNode,xDocumentModel ) ); + RID_CUIBMP_LIB, pEntry, false, std::make_unique< SFEntry >( aChildNode,xDocumentModel ) ); // If the Parent is not loaded then set to // loaded, this will prevent RequestingChildren ( called diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index e1cf0b926aea..41a8e4adc96b 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -42,7 +42,6 @@ #include <i18nlangtag/mslangid.hxx> #include <comphelper/string.hxx> #include <osl/file.hxx> -#include <o3tl/make_unique.hxx> #include <stack> #include <algorithm> @@ -228,10 +227,10 @@ SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const OUS { aText = OUString::number( nVal ) + ". "; } - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(OUString())); // add empty column + pEntry->AddItem(std::make_unique<SvLBoxString>(OUString())); // add empty column aText += rText; - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise crash - pEntry->AddItem(o3tl::make_unique<AlternativesString>(*this, aText)); + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise crash + pEntry->AddItem(std::make_unique<AlternativesString>(*this, aText)); SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); GetModel()->Insert( pEntry ); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index dd8c8bf1c3d4..ec5fcd417a65 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -988,7 +988,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateFrameDialog(vcl::Win // TabDialog outside the drawing layer VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateAutoCorrTabDialog(weld::Window* pParent, const SfxItemSet* pAttrSet) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<OfaAutoCorrDlg>(pParent, pAttrSet)); + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<OfaAutoCorrDlg>(pParent, pAttrSet)); } VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateCustomizeTabDialog( @@ -1007,7 +1007,7 @@ VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateTextTabDialog(wel const SfxItemSet* pAttrSet, SdrView* pView) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxTextTabDialog>(pParent, pAttrSet, pView)); + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<SvxTextTabDialog>(pParent, pAttrSet, pView)); } // TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog @@ -1015,13 +1015,13 @@ VclPtr<AbstractSvxCaptionDialog> AbstractDialogFactory_Impl::CreateCaptionDialog const SdrView* pView, SvxAnchorIds nAnchorTypes) { - return VclPtr<AbstractSvxCaptionDialog_Impl>::Create(o3tl::make_unique<SvxCaptionTabDialog>(pParent, pView, nAnchorTypes)); + return VclPtr<AbstractSvxCaptionDialog_Impl>::Create(std::make_unique<SvxCaptionTabDialog>(pParent, pView, nAnchorTypes)); } VclPtr<AbstractSvxDistributeDialog> AbstractDialogFactory_Impl::CreateSvxDistributeDialog(weld::Window* pParent, const SfxItemSet& rAttr) { - return VclPtr<AbstractSvxDistributeDialog_Impl>::Create(o3tl::make_unique<SvxDistributeDialog>(pParent, rAttr, SvxDistributeHorizontal::NONE, SvxDistributeVertical::NONE)); + return VclPtr<AbstractSvxDistributeDialog_Impl>::Create(std::make_unique<SvxDistributeDialog>(pParent, rAttr, SvxDistributeHorizontal::NONE, SvxDistributeVertical::NONE)); } VclPtr<AbstractHangulHanjaConversionDialog> AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(vcl::Window* pParent, @@ -1044,17 +1044,17 @@ VclPtr<AbstractHyphenWordDialog> AbstractDialogFactory_Impl::CreateHyphenWordDia css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper) { - return VclPtr<AbstractHyphenWordDialog_Impl>::Create(o3tl::make_unique<SvxHyphenWordDialog>(rWord, nLang, pParent, xHyphen, pWrapper)); + return VclPtr<AbstractHyphenWordDialog_Impl>::Create(std::make_unique<SvxHyphenWordDialog>(rWord, nLang, pParent, xHyphen, pWrapper)); } VclPtr<AbstractFmShowColsDialog> AbstractDialogFactory_Impl::CreateFmShowColsDialog(weld::Window* pParent) { - return VclPtr<AbstractFmShowColsDialog_Impl>::Create(o3tl::make_unique<FmShowColsDialog>(pParent)); + return VclPtr<AbstractFmShowColsDialog_Impl>::Create(std::make_unique<FmShowColsDialog>(pParent)); } VclPtr<AbstractSvxZoomDialog> AbstractDialogFactory_Impl::CreateSvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) { - return VclPtr<AbstractSvxZoomDialog_Impl>::Create(o3tl::make_unique<SvxZoomDialog>(pParent, rCoreSet)); + return VclPtr<AbstractSvxZoomDialog_Impl>::Create(std::make_unique<SvxZoomDialog>(pParent, rCoreSet)); } VclPtr<AbstractSpellDialog> AbstractDialogFactory_Impl::CreateSvxSpellDialog( @@ -1069,7 +1069,7 @@ VclPtr<AbstractSpellDialog> AbstractDialogFactory_Impl::CreateSvxSpellDialog( VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateActualizeProgressDialog(weld::Window* pParent, GalleryTheme* pThm) { - return VclPtr<CuiAbstractController_Impl>::Create(o3tl::make_unique<ActualizeProgress>(pParent, pThm)); + return VclPtr<CuiAbstractController_Impl>::Create(std::make_unique<ActualizeProgress>(pParent, pThm)); } VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateScriptErrorDialog(const css::uno::Any& rException) @@ -1107,20 +1107,20 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( VclPtr<AbstractTitleDialog> AbstractDialogFactory_Impl::CreateTitleDialog(weld::Window* pParent, const OUString& rOldText) { - return VclPtr<AbstractTitleDialog_Impl>::Create(o3tl::make_unique<TitleDialog>(pParent, rOldText)); + return VclPtr<AbstractTitleDialog_Impl>::Create(std::make_unique<TitleDialog>(pParent, rOldText)); } VclPtr<AbstractGalleryIdDialog> AbstractDialogFactory_Impl::CreateGalleryIdDialog(weld::Window* pParent, GalleryTheme* pThm) { - return VclPtr<AbstractGalleryIdDialog_Impl>::Create(o3tl::make_unique<GalleryIdDialog>(pParent, pThm)); + return VclPtr<AbstractGalleryIdDialog_Impl>::Create(std::make_unique<GalleryIdDialog>(pParent, pThm)); } VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(weld::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<GalleryThemeProperties>( + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<GalleryThemeProperties>( pParent, pData, pItemSet)); } @@ -1137,7 +1137,7 @@ VclPtr<AbstractURLDlg> AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateTabItemDialog(weld::Window* pParent, const SfxItemSet& rSet) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxSearchFormatDialog>( + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<SvxSearchFormatDialog>( pParent, rSet)); } @@ -1155,7 +1155,7 @@ VclPtr<AbstractSvxSearchSimilarityDialog> AbstractDialogFactory_Impl::CreateSvxS sal_uInt16 nShorter, sal_uInt16 nLonger) { - return VclPtr<AbstractSvxSearchSimilarityDialog_Impl>::Create(o3tl::make_unique<SvxSearchSimilarityDialog>(pParent, bRelax, nOther, nShorter, nLonger)); + return VclPtr<AbstractSvxSearchSimilarityDialog_Impl>::Create(std::make_unique<SvxSearchSimilarityDialog>(pParent, bRelax, nOther, nShorter, nLonger)); } VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( @@ -1163,7 +1163,7 @@ VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxBorderBackgrou const SfxItemSet& rCoreSet, bool bEnableDrawingLayerFillStyles) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxBorderBackgroundDlg>( + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<SvxBorderBackgroundDlg>( pParent, rCoreSet, /*bEnableSelector*/true, @@ -1183,7 +1183,7 @@ VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSchTransformTabDi const SdrView* pSdrView, bool bSizeTabPage) { - auto pDlg = o3tl::make_unique<SvxTransformTabDialog>(pParent, pAttr, pSdrView, + auto pDlg = std::make_unique<SvxTransformTabDialog>(pParent, pAttr, pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize); pDlg->RemoveTabPage( "RID_SVXPAGE_ANGLE" ); pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" ); @@ -1194,17 +1194,17 @@ VclPtr<AbstractSvxJSearchOptionsDialog> AbstractDialogFactory_Impl::CreateSvxJSe const SfxItemSet& rOptionsSet, TransliterationFlags nInitialFlags) { - return VclPtr<AbstractSvxJSearchOptionsDialog_Impl>::Create(o3tl::make_unique<SvxJSearchOptionsDialog>(pParent, rOptionsSet, nInitialFlags)); + return VclPtr<AbstractSvxJSearchOptionsDialog_Impl>::Create(std::make_unique<SvxJSearchOptionsDialog>(pParent, rOptionsSet, nInitialFlags)); } VclPtr<AbstractFmInputRecordNoDialog> AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog(weld::Window* pParent) { - return VclPtr<AbstractFmInputRecordNoDialog_Impl>::Create(o3tl::make_unique<FmInputRecordNoDialog>(pParent)); + return VclPtr<AbstractFmInputRecordNoDialog_Impl>::Create(std::make_unique<FmInputRecordNoDialog>(pParent)); } VclPtr<AbstractSvxNewDictionaryDialog> AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog(weld::Window* pParent) { - return VclPtr<AbstractSvxNewDictionaryDialog_Impl>::Create(o3tl::make_unique<SvxNewDictionaryDialog>(pParent)); + return VclPtr<AbstractSvxNewDictionaryDialog_Impl>::Create(std::make_unique<SvxNewDictionaryDialog>(pParent)); } VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent, @@ -1217,17 +1217,17 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxEditDictionaryDia VclPtr<AbstractSvxNameDialog> AbstractDialogFactory_Impl::CreateSvxNameDialog(weld::Window* pParent, const OUString& rName, const OUString& rDesc) { - return VclPtr<AbstractSvxNameDialog_Impl>::Create(o3tl::make_unique<SvxNameDialog>(pParent, rName, rDesc)); + return VclPtr<AbstractSvxNameDialog_Impl>::Create(std::make_unique<SvxNameDialog>(pParent, rName, rDesc)); } VclPtr<AbstractSvxObjectNameDialog> AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) { - return VclPtr<AbstractSvxObjectNameDialog_Impl>::Create(o3tl::make_unique<SvxObjectNameDialog>(pParent, rName)); + return VclPtr<AbstractSvxObjectNameDialog_Impl>::Create(std::make_unique<SvxObjectNameDialog>(pParent, rName)); } VclPtr<AbstractSvxObjectTitleDescDialog> AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(weld::Window* pParent, const OUString& rTitle, const OUString& rDescription) { - return VclPtr<AbstractSvxObjectTitleDescDialog_Impl>::Create(o3tl::make_unique<SvxObjectTitleDescDialog>(pParent, rTitle, rDescription)); + return VclPtr<AbstractSvxObjectTitleDescDialog_Impl>::Create(std::make_unique<SvxObjectTitleDescDialog>(pParent, rTitle, rDescription)); } VclPtr<AbstractSvxMultiPathDialog> AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(vcl::Window* pParent) @@ -1238,7 +1238,7 @@ VclPtr<AbstractSvxMultiPathDialog> AbstractDialogFactory_Impl::CreateSvxMultiPat VclPtr<AbstractSvxMultiPathDialog> AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(weld::Window* pParent) { - return VclPtr<AbstractSvxPathSelectDialog_Impl>::Create(o3tl::make_unique<SvxPathSelectDialog>(pParent)); + return VclPtr<AbstractSvxPathSelectDialog_Impl>::Create(std::make_unique<SvxPathSelectDialog>(pParent)); } VclPtr<AbstractSvxHpLinkDlg> AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl::Window* pParent, @@ -1262,37 +1262,37 @@ VclPtr<AbstractFmSearchDialog> AbstractDialogFactory_Impl::CreateFmSearchDialog( VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterEmboss(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterEmboss>(pParent, rGraphic, RectPoint::MM)); + return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(std::make_unique<GraphicFilterEmboss>(pParent, rGraphic, RectPoint::MM)); } VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterPoster(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterPoster>(pParent, rGraphic, 16)); + return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(std::make_unique<GraphicFilterPoster>(pParent, rGraphic, 16)); } VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterSepia(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterSepia>(pParent, rGraphic, 10)); + return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(std::make_unique<GraphicFilterSepia>(pParent, rGraphic, 10)); } VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(weld::Window* pParent, const Graphic& rGraphic, double nRadius) { - return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterSmooth>(pParent, rGraphic, nRadius)); + return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(std::make_unique<GraphicFilterSmooth>(pParent, rGraphic, nRadius)); } VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterSolarize(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterSolarize>(pParent, rGraphic, 128, false /*bInvert*/)); + return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(std::make_unique<GraphicFilterSolarize>(pParent, rGraphic, 128, false /*bInvert*/)); } VclPtr<AbstractGraphicFilterDialog> AbstractDialogFactory_Impl::CreateGraphicFilterMosaic(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(o3tl::make_unique<GraphicFilterMosaic>(pParent, rGraphic, 4, 4, false /*bEnhanceEdges*/)); + return VclPtr<AbstractGraphicFilterDialog_Impl>::Create(std::make_unique<GraphicFilterMosaic>(pParent, rGraphic, 4, 4, false /*bEnhanceEdges*/)); } VclPtr<AbstractSvxAreaTabDialog> AbstractDialogFactory_Impl::CreateSvxAreaTabDialog(weld::Window* pParent, @@ -1300,7 +1300,7 @@ VclPtr<AbstractSvxAreaTabDialog> AbstractDialogFactory_Impl::CreateSvxAreaTabDia SdrModel* pModel, bool bShadow) { - return VclPtr<AbstractSvxAreaTabDialog_Impl>::Create(o3tl::make_unique<SvxAreaTabDialog>(pParent, pAttr, pModel, bShadow)); + return VclPtr<AbstractSvxAreaTabDialog_Impl>::Create(std::make_unique<SvxAreaTabDialog>(pParent, pAttr, pModel, bShadow)); } VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxLineTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog @@ -1308,19 +1308,19 @@ VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxLineTabDialog( const SdrObject* pObj , bool bHasObj) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxLineTabDialog>(pParent, pAttr, pModel, pObj,bHasObj)); + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<SvxLineTabDialog>(pParent, pAttr, pModel, pObj,bHasObj)); } VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateCharMapDialog(weld::Window* pParent, const SfxItemSet& rAttr, bool bInsert) { - return VclPtr<AbstractSvxCharacterMapDialog_Impl>::Create(o3tl::make_unique<SvxCharacterMap>(pParent, &rAttr, bInsert)); + return VclPtr<AbstractSvxCharacterMapDialog_Impl>::Create(std::make_unique<SvxCharacterMap>(pParent, &rAttr, bInsert)); } VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateEventConfigDialog(weld::Window* pParent, const SfxItemSet& rAttr, const Reference< XFrame >& _rxDocumentFrame) { - return VclPtr<CuiAbstractSingleTabController_Impl>::Create(o3tl::make_unique<SfxMacroAssignDlg>(pParent, _rxDocumentFrame, rAttr)); + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SfxMacroAssignDlg>(pParent, _rxDocumentFrame, rAttr)); } VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(vcl::Window* pParent, @@ -1333,10 +1333,10 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(vcl::Windo { case RID_SVXPAGE_MEASURE : { - return VclPtr<CuiAbstractSingleTabController_Impl>::Create(o3tl::make_unique<SvxMeasureDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SvxMeasureDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); } case RID_SVXPAGE_CONNECTION : - return VclPtr<CuiAbstractSingleTabController_Impl>::Create(o3tl::make_unique<SvxConnectionDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); + return VclPtr<CuiAbstractSingleTabController_Impl>::Create(std::make_unique<SvxConnectionDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); case RID_SFXPAGE_DBREGISTER : pDlg = VclPtr<DatabaseRegistrationDialog>::Create( pParent, rAttr ); @@ -1356,7 +1356,7 @@ VclPtr<AbstractSvxPostItDialog> AbstractDialogFactory_Impl::CreateSvxPostItDialo const SfxItemSet& rCoreSet, bool bPrevNext ) { - return VclPtr<AbstractSvxPostItDialog_Impl>::Create(o3tl::make_unique<SvxPostItDialog>(pParent, rCoreSet, bPrevNext)); + return VclPtr<AbstractSvxPostItDialog_Impl>::Create(std::make_unique<SvxPostItDialog>(pParent, rCoreSet, bPrevNext)); } class SvxMacroAssignDialog : public VclAbstractDialog @@ -1564,7 +1564,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateEditObjectDialog(wel { if ( rCommand == ".uno:InsertObjectFloatingFrame" ) { - auto pDlg = o3tl::make_unique<SfxInsertFloatingFrameDialog>(pParent, xObj); + auto pDlg = std::make_unique<SfxInsertFloatingFrameDialog>(pParent, xObj); pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); return VclPtr<AbstractInsertObjectDialog_Impl>::Create( std::move(pDlg) ); } @@ -1573,7 +1573,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateEditObjectDialog(wel VclPtr<SfxAbstractPasteDialog> AbstractDialogFactory_Impl::CreatePasteDialog(weld::Window* pParent) { - return VclPtr<AbstractPasteDialog_Impl>::Create(o3tl::make_unique<SvPasteObjectDialog>(pParent)); + return VclPtr<AbstractPasteDialog_Impl>::Create(std::make_unique<SvPasteObjectDialog>(pParent)); } VclPtr<SfxAbstractLinksDialog> AbstractDialogFactory_Impl::CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p) @@ -1586,7 +1586,7 @@ VclPtr<SfxAbstractLinksDialog> AbstractDialogFactory_Impl::CreateLinksDialog( vc VclPtr<SfxAbstractTabDialog> AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, const SdrObject* /*pObj*/) { - return VclPtr<CuiAbstractTabController_Impl>::Create(o3tl::make_unique<SvxFormatCellsDialog>(pParent, pAttr, rModel)); + return VclPtr<CuiAbstractTabController_Impl>::Create(std::make_unique<SvxFormatCellsDialog>(pParent, pAttr, rModel)); } VclPtr<SvxAbstractSplitTableDialog> AbstractDialogFactory_Impl::CreateSvxSplitTableDialog(weld::Window* pParent, bool bIsTableVertical, long nMaxVertical) @@ -1613,7 +1613,7 @@ VclPtr<SvxAbstractInsRowColDlg> AbstractDialogFactory_Impl::CreateSvxInsRowColDl VclPtr<AbstractPasswordToOpenModifyDialog> AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( weld::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) { - return VclPtr<AbstractPasswordToOpenModifyDialog_Impl>::Create(o3tl::make_unique<PasswordToOpenModifyDialog>(pParent, nMaxPasswdLen, bIsPasswordToModify)); + return VclPtr<AbstractPasswordToOpenModifyDialog_Impl>::Create(std::make_unique<PasswordToOpenModifyDialog>(pParent, nMaxPasswdLen, bIsPasswordToModify)); } VclPtr<AbstractScreenshotAnnotationDlg> AbstractDialogFactory_Impl::CreateScreenshotAnnotationDlg( @@ -1628,7 +1628,7 @@ VclPtr<AbstractSignatureLineDialog> AbstractDialogFactory_Impl::CreateSignatureL weld::Window* pParent, const Reference<XModel> xModel, bool bEditExisting) { return VclPtr<AbstractSignatureLineDialog_Impl>::Create( - o3tl::make_unique<SignatureLineDialog>(pParent, xModel, bEditExisting)); + std::make_unique<SignatureLineDialog>(pParent, xModel, bEditExisting)); } VclPtr<AbstractSignSignatureLineDialog> @@ -1636,7 +1636,7 @@ AbstractDialogFactory_Impl::CreateSignSignatureLineDialog(weld::Window* pParent, const Reference<XModel> xModel) { return VclPtr<AbstractSignSignatureLineDialog_Impl>::Create( - o3tl::make_unique<SignSignatureLineDialog>(pParent, xModel)); + std::make_unique<SignSignatureLineDialog>(pParent, xModel)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index d95fb1cc3e20..238e8b3dedcb 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -27,7 +27,6 @@ #include <svtools/fontsubstconfig.hxx> #include "fontsubs.hxx" #include <helpids.h> -#include <o3tl/make_unique.hxx> /*********************************************************************/ /* */ @@ -120,13 +119,13 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF if (!m_xCheckButtonData) m_xCheckButtonData.reset(new SvLBoxButtonData(m_pCheckLB)); - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom! + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); // otherwise boom! - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); + pEntry->AddItem(std::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); + pEntry->AddItem(std::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont1)); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rFont2)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rFont1)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rFont2)); return pEntry; } diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 986f5ac4f164..eb9205335b10 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -23,7 +23,6 @@ #include <vcl/headbar.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> -#include <o3tl/make_unique.hxx> namespace svx { // class OptLBoxString_Impl ---------------------------------------------- @@ -72,7 +71,7 @@ void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rT { // initialize all columns with own class (column 0 == Bitmap) SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nCol )); - pEntry->ReplaceItem(o3tl::make_unique<OptLBoxString_Impl>(rCol.GetText()), nCol); + pEntry->ReplaceItem(std::make_unique<OptLBoxString_Impl>(rCol.GetText()), nCol); } } diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index f91faa83b25d..f203320bd0c9 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <unotools/textsearch.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> #include <memory> @@ -204,13 +203,13 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const OUS bool bInsertToPrefBox) { SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>( Image(), Image(), false)); //It is needed, otherwise causes crash - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rProp)); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rStatus)); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rType)); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rValue)); - m_vectorUserData.push_back(o3tl::make_unique<UserData>(rPropertyPath)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rProp)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rStatus)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rType)); + pEntry->AddItem(std::make_unique<SvLBoxString>(rValue)); + m_vectorUserData.push_back(std::make_unique<UserData>(rPropertyPath)); pEntry->SetUserData(m_vectorUserData.back().get()); if(bInsertToPrefBox) @@ -283,16 +282,16 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces { // not leaf node SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>( SvTreeListBox::GetDefaultExpandedNodeImage(), SvTreeListBox::GetDefaultCollapsedNodeImage(), false)); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(seqItems[i])); + pEntry->AddItem(std::make_unique<SvLBoxString>(seqItems[i])); //It is needed, without this the selection line will be truncated. - pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); + pEntry->AddItem(std::make_unique<SvLBoxString>("")); + pEntry->AddItem(std::make_unique<SvLBoxString>("")); + pEntry->AddItem(std::make_unique<SvLBoxString>("")); - m_vectorUserData.push_back(o3tl::make_unique<UserData>(xNextNameAccess, lineage + 1)); + m_vectorUserData.push_back(std::make_unique<UserData>(xNextNameAccess, lineage + 1)); pEntry->SetUserData(m_vectorUserData.back().get()); pEntry->EnableChildrenOnDemand(); m_pPrefBox->Insert( pEntry, pParentEntry ); @@ -774,7 +773,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) ); if (it != m_prefBoxEntries.end()) { - (*it)->ReplaceItem(o3tl::make_unique<SvLBoxString>(sDialogValue), 4); + (*it)->ReplaceItem(std::make_unique<SvLBoxString>(sDialogValue), 4); SvTreeListEntries::iterator modifiedIt = std::find_if( m_modifiedPrefBoxEntries.begin(), m_modifiedPrefBoxEntries.end(), @@ -787,7 +786,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) if( modifiedIt != m_modifiedPrefBoxEntries.end()) { - (*modifiedIt)->ReplaceItem(o3tl::make_unique<SvLBoxString>(sDialogValue), 4); + (*modifiedIt)->ReplaceItem(std::make_unique<SvLBoxString>(sDialogValue), 4); } else { @@ -887,14 +886,14 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry) if(!hasEntry) { pParentEntry = new SvTreeListEntry; - pParentEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( + pParentEntry->AddItem(std::make_unique<SvLBoxContextBmp>( SvTreeListBox::GetDefaultExpandedNodeImage(), SvTreeListBox::GetDefaultCollapsedNodeImage(), false)); - pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>(sParentName)); + pParentEntry->AddItem(std::make_unique<SvLBoxString>(sParentName)); //It is needed, without this the selection line will be truncated. - pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); - pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); - pParentEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); + pParentEntry->AddItem(std::make_unique<SvLBoxString>("")); + pParentEntry->AddItem(std::make_unique<SvLBoxString>("")); + pParentEntry->AddItem(std::make_unique<SvLBoxString>("")); pParentEntry->EnableChildrenOnDemand(false); m_pPrefBox->Insert( pParentEntry, pGrandParentEntry ); } diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 3c48b0132211..1ea0e4ae245d 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <o3tl/make_unique.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> #include "optfltr.hxx" @@ -334,16 +333,16 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, if (!m_xCheckButtonData) m_xCheckButtonData.reset(new SvLBoxButtonData(m_pCheckLB)); - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>( + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>( Image(), Image(), false)); - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>( + pEntry->AddItem(std::make_unique<SvLBoxButton>( SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>( + pEntry->AddItem(std::make_unique<SvLBoxButton>( saveEnabled ? SvLBoxButtonKind::EnabledCheckbox : SvLBoxButtonKind::DisabledCheckbox, m_xCheckButtonData.get())); - pEntry->AddItem(o3tl::make_unique<SvLBoxString>(_rTxt)); + pEntry->AddItem(std::make_unique<SvLBoxString>(_rTxt)); pEntry->SetUserData( reinterpret_cast<void*>(_nType) ); m_pCheckLB->Insert( pEntry ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 20ead90689cb..d9002fddbc46 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -30,7 +30,6 @@ #include <sfx2/sfxuno.hxx> #include <sfx2/dispatch.hxx> #include <tools/urlobj.hxx> -#include <o3tl/make_unique.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> @@ -1662,11 +1661,11 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) m_xCheckButtonData.reset(new SvLBoxButtonData(m_pLinguOptionsCLB)); if (CBCOL_FIRST == nCol) - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); + pEntry->AddItem(std::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); if (CBCOL_SECOND == nCol) - pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); // empty column - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); - pEntry->AddItem(o3tl::make_unique<BrwString_Impl>(rTxt)); + pEntry->AddItem(std::make_unique<SvLBoxString>("")); // empty column + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); + pEntry->AddItem(std::make_unique<BrwString_Impl>(rTxt)); return pEntry; } @@ -1784,11 +1783,11 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol } if (CBCOL_FIRST == nCol) - pEntry->AddItem(o3tl::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); + pEntry->AddItem(std::make_unique<SvLBoxButton>(SvLBoxButtonKind::EnabledCheckbox, m_xCheckButtonData.get())); if (CBCOL_SECOND == nCol) - pEntry->AddItem(o3tl::make_unique<SvLBoxString>("")); // empty column - pEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); - pEntry->AddItem(o3tl::make_unique<BrwStringDic_Impl>(rTxt)); + pEntry->AddItem(std::make_unique<SvLBoxString>("")); // empty column + pEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); + pEntry->AddItem(std::make_unique<BrwStringDic_Impl>(rTxt)); return pEntry; } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 435fd0acb04c..0555cc339caf 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -75,7 +75,6 @@ #include <editeng/optitems.hxx> #include <editeng/unolingu.hxx> #include <linguistic/misc.hxx> -#include <o3tl/make_unique.hxx> #include <officecfg/Office/OptionsDialog.hxx> #include <osl/module.hxx> #include <osl/process.h> @@ -999,7 +998,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() ? pGroupInfo->m_pShell->CreateItemSet( pGroupInfo->m_nDialogId ) : CreateItemSet( pGroupInfo->m_nDialogId ); if(!pGroupInfo->m_pOutItemSet) - pGroupInfo->m_pOutItemSet = o3tl::make_unique<SfxItemSet>( + pGroupInfo->m_pOutItemSet = std::make_unique<SfxItemSet>( *pGroupInfo->m_pInItemSet->GetPool(), pGroupInfo->m_pInItemSet->GetRanges()); @@ -1096,7 +1095,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId { case SID_GENERAL_OPTIONS: { - pRet = o3tl::make_unique<SfxItemSet>( + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items< SID_HTML_MODE, SID_HTML_MODE, @@ -1137,7 +1136,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId break; case SID_LANGUAGE_OPTIONS : { - pRet = o3tl::make_unique<SfxItemSet>( + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items< SID_ATTR_CHAR_CJK_LANGUAGE, SID_ATTR_CHAR_CJK_LANGUAGE, @@ -1205,7 +1204,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId } break; case SID_INET_DLG : - pRet = o3tl::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_BASIC_ENABLED, SID_BASIC_ENABLED, //SID_OPTIONS_START - ..END SID_SAVEREL_INET, SID_SAVEREL_FSYS, @@ -1214,7 +1213,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId SfxGetpApp()->GetOptions(*pRet); break; case SID_FILTER_DLG: - pRet = o3tl::make_unique<SfxItemSet>( + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items< SID_ATTR_WARNALIENFORMAT, SID_ATTR_WARNALIENFORMAT, @@ -1225,7 +1224,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId break; case SID_SB_STARBASEOPTIONS: - pRet = o3tl::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_SB_POOLING_ENABLED, SID_SB_DB_REGISTER>{} ); ::offapp::ConnectionPoolConfig::GetOptions(*pRet); svx::DbRegisteredNamesConfig::GetOptions(*pRet); @@ -1234,7 +1233,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId case SID_SCH_EDITOPTIONS: { SvxChartOptions aChartOpt; - pRet = o3tl::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_SCH_EDITOPTIONS, SID_SCH_EDITOPTIONS>{} ); + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_SCH_EDITOPTIONS, SID_SCH_EDITOPTIONS>{} ); pRet->Put( SvxChartColorTableItem( SID_SCH_EDITOPTIONS, aChartOpt.GetDefaultColors() ) ); break; } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index af460fbe60a3..f18d7dc5c120 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> #include <rtl/strbuf.hxx> -#include <o3tl/make_unique.hxx> #include <autocdlg.hxx> #include <editeng/acorrcfg.hxx> diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 5f392652f64c..d23661eb560c 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -34,7 +34,6 @@ #include <headertablistbox.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> -#include <o3tl/make_unique.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XFrame; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 60e8fafc30e5..39e6b8a2cfa6 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -42,7 +42,6 @@ #include <svx/svxdlg.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dialoghelper.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> using namespace com::sun::star; @@ -762,7 +761,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void) if( !nError ) { - m_pBitmapList->Insert(o3tl::make_unique<XBitmapEntry>(aGraphic, aName), nCount); + m_pBitmapList->Insert(std::make_unique<XBitmapEntry>(aGraphic, aName), nCount); sal_Int32 nId = m_xBitmapLB->GetItemId( nCount - 1 ); BitmapEx aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_xBitmapLB->GetIconSize() ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 5d6cacbea86f..d9cb5c3fddf7 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -43,8 +43,6 @@ #include <svx/strings.hrc> #include <sal/log.hxx> -#include <o3tl/make_unique.hxx> - #define DEFAULT_GRADIENTSTEP 64 using namespace com::sun::star; @@ -386,7 +384,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, weld::Button&, void) static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)), static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) ); - m_pGradientList->Insert(o3tl::make_unique<XGradientEntry>(aXGradient, aName), nCount); + m_pGradientList->Insert(std::make_unique<XGradientEntry>(aXGradient, aName), nCount); sal_Int32 nId = m_xGradientLB->GetItemId(nCount - 1); //calculate the last ID BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( nCount, m_xGradientLB->GetIconSize() ); @@ -425,7 +423,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, weld::Button&, void) static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)), static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) ); - m_pGradientList->Replace(o3tl::make_unique<XGradientEntry>(aXGradient, aName), nPos); + m_pGradientList->Replace(std::make_unique<XGradientEntry>(aXGradient, aName), nPos); BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_xGradientLB->GetIconSize() ); m_xGradientLB->RemoveItem( nId ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 74c25cbefa3a..c63738672414 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -45,8 +45,6 @@ #include <svx/strings.hrc> #include <sal/log.hxx> -#include <o3tl/make_unique.hxx> - using namespace com::sun::star; SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) @@ -454,7 +452,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void) GetCoreValue( *m_xMtrDistance, m_ePoolUnit ), static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) ); - m_pHatchingList->Insert(o3tl::make_unique<XHatchEntry>(aXHatch, aName), nCount); + m_pHatchingList->Insert(std::make_unique<XHatchEntry>(aXHatch, aName), nCount); sal_Int32 nId = m_xHatchLB->GetItemId(nCount - 1); // calculate the last ID BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_xHatchLB->GetIconSize() ); @@ -483,7 +481,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, weld::Button&, void) GetCoreValue( *m_xMtrDistance, m_ePoolUnit ), static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) ); - m_pHatchingList->Replace(o3tl::make_unique<XHatchEntry>(aXHatch, aName), nPos); + m_pHatchingList->Replace(std::make_unique<XHatchEntry>(aXHatch, aName), nPos); BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_xHatchLB->GetIconSize() ); m_xHatchLB->RemoveItem( nId ); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 9d0a57943c09..1d38acd64070 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -42,7 +42,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <svx/strings.hrc> -#include <o3tl/make_unique.hxx> #include <cuitabarea.hxx> #define XOUT_WIDTH 150 @@ -524,7 +523,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, weld::Button&, void) FillDash_Impl(); long nDashCount = pDashList->Count(); - pDashList->Insert( o3tl::make_unique<XDashEntry>(aDash, aName), nDashCount ); + pDashList->Insert( std::make_unique<XDashEntry>(aDash, aName), nDashCount ); m_xLbLineStyles->Append( *pDashList->GetDash(nDashCount), pDashList->GetUiBitmap(nDashCount) ); m_xLbLineStyles->set_active(m_xLbLineStyles->get_count() - 1); @@ -592,7 +591,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, weld::Button&, void) bLoop = false; FillDash_Impl(); - pDashList->Replace(o3tl::make_unique<XDashEntry>(aDash, aName), nPos); + pDashList->Replace(std::make_unique<XDashEntry>(aDash, aName), nPos); m_xLbLineStyles->Modify(*pDashList->GetDash(nPos), nPos, pDashList->GetUiBitmap(nPos)); m_xLbLineStyles->set_active(nPos); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 18282f52fa69..97f6305781eb 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -46,8 +46,6 @@ #include <svx/dialogs.hrc> #include <svx/strings.hrc> -#include <o3tl/make_unique.hxx> - #define XOUT_WIDTH 150 SvxLineEndDefTabPage::SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) @@ -331,7 +329,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, weld::Button&, void) if(pOldEntry) { // #123497# Need to replace the existing entry with a new one - pLineEndList->Replace(o3tl::make_unique<XLineEndEntry>(pOldEntry->GetLineEnd(), aName), nPos); + pLineEndList->Replace(std::make_unique<XLineEndEntry>(pOldEntry->GetLineEnd(), aName), nPos); m_xEdtName->set_text(aName); @@ -424,7 +422,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, weld::Button&, void) bLoop = false; auto nLineEndCount = pLineEndList->Count(); - pLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aNewPolyPolygon, aName), nLineEndCount); + pLineEndList->Insert(std::make_unique<XLineEndEntry>(aNewPolyPolygon, aName), nLineEndCount); // add to the ListBox m_xLbLineEnds->Append(*pLineEndList->GetLineEnd(nLineEndCount), pLineEndList->GetUiBitmap(nLineEndCount)); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 56ada28c2681..1d77214eeb08 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -49,8 +49,6 @@ #include <sfx2/opengrf.hxx> #include <sal/log.hxx> -#include <o3tl/make_unique.hxx> - using namespace com::sun::star; /************************************************************************* @@ -436,7 +434,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, weld::Button&, void) const BitmapEx aBitmapEx(m_xBitmapCtl->GetBitmapEx()); // #i123497# Need to replace the existing entry with a new one (old returned needs to be deleted) - m_pPatternList->Replace(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmapEx), aName), nPos); + m_pPatternList->Replace(std::make_unique<XBitmapEntry>(Graphic(aBitmapEx), aName), nPos); BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( static_cast<sal_uInt16>( nPos ), m_xPatternLB->GetIconSize() ); m_xPatternLB->RemoveItem(nId); |