diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-26 19:58:39 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-29 07:15:17 +0100 |
| commit | 6d5af783bfd899253908c926853233a99df6f4e0 (patch) | |
| tree | fa55756e111c599c3147b161212967e63e278ccc /sc/source/ui/view/output2.cxx | |
| parent | 7a576383308edec3d6538986310264bfc0f1c213 (diff) | |
o3tl::make_unique -> std::make_unique in sc
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib69a4a2a08b1edbc0f40beac00f7f68075b479a1
Reviewed-on: https://gerrit.libreoffice.org/66967
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/view/output2.cxx')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 5fecb743df94..dcb67b9e2e4a 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -53,7 +53,6 @@ #include <vcl/outdev.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <vcl/settings.hxx> -#include <o3tl/make_unique.hxx> #include <sal/log.hxx> #include <unotools/charclass.hxx> @@ -1635,7 +1634,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co } if ( mpDoc->GetPreviewFont() || mpDoc->GetPreviewCellStyle() ) { - aAltPatterns.push_back(o3tl::make_unique<ScPatternAttr>(*pPattern)); + aAltPatterns.push_back(std::make_unique<ScPatternAttr>(*pPattern)); ScPatternAttr* pAltPattern = aAltPatterns.back().get(); if ( ScStyleSheet* pPreviewStyle = mpDoc->GetPreviewCellStyle( nCellX, nCellY, nTab ) ) { @@ -1658,7 +1657,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co pPattern->GetItem(ATTR_LINEBREAK, pCondSet).GetValue()) { // Disable line break when the cell content is numeric. - aAltPatterns.push_back(o3tl::make_unique<ScPatternAttr>(*pPattern)); + aAltPatterns.push_back(std::make_unique<ScPatternAttr>(*pPattern)); ScPatternAttr* pAltPattern = aAltPatterns.back().get(); SfxBoolItem aLineBreak(ATTR_LINEBREAK, false); pAltPattern->GetItemSet().Put(aLineBreak); |