summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-01-17 00:01:31 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-18 09:49:12 +0100
commitba28af8aa576869a5e6a4f3129af302c824d31a5 (patch)
tree89fa65a1b964625ea01030d6c80260217f2cde28 /cui/source/tabpages
parentfd1cfd25b48cb4bd5c87e9cb317b37699ca3a1d6 (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>
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/autocdlg.cxx1
-rw-r--r--cui/source/tabpages/macroass.cxx1
-rw-r--r--cui/source/tabpages/tpbitmap.cxx3
-rw-r--r--cui/source/tabpages/tpgradnt.cxx6
-rw-r--r--cui/source/tabpages/tphatch.cxx6
-rw-r--r--cui/source/tabpages/tplnedef.cxx5
-rw-r--r--cui/source/tabpages/tplneend.cxx6
-rw-r--r--cui/source/tabpages/tppattern.cxx4
8 files changed, 10 insertions, 22 deletions
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);