summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-13 13:43:38 +0200
committerNoel Grandin <noel@peralex.com>2015-11-13 15:43:11 +0200
commit442666210fb0a04e298172a288211619becedc45 (patch)
tree660725dfcfa087116912a997849ac4c3b755c2bd /sc
parent8f6ecf15644b641f729c24822fcb6bb29617ef57 (diff)
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I4360e3238407d9cc7d664c543868cdb66271dbe8
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/fillinfo.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 50285c0452bc..89c81a6b31e6 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -42,7 +42,9 @@
#include "cellvalue.hxx"
#include "mtvcellfunc.hxx"
-#include <boost/ptr_container/ptr_vector.hpp>
+#include <vector>
+#include <memory>
+#include <o3tl/make_unique.hxx>
const sal_uInt16 ROWINFO_MAX = 1024;
@@ -677,7 +679,7 @@ void ScDocument::FillInfo(
pCondFormList->endRendering();
// bedingte Formatierung auswerten
- ::boost::ptr_vector<ScPatternAttr> aAltPatterns;
+ std::vector< std::unique_ptr<ScPatternAttr> > aAltPatterns;
// favour preview over condition
if (bAnyCondition || bAnyPreview)
{
@@ -693,8 +695,8 @@ void ScDocument::FillInfo(
{
if ( ScStyleSheet* pPreviewStyle = GetPreviewCellStyle( nCol, pRowInfo[nArrRow].nRowNo, nTab ) )
{
- aAltPatterns.push_back( new ScPatternAttr( *pInfo->pPatternAttr ) );
- pModifiedPatt = &aAltPatterns.back();
+ aAltPatterns.push_back( o3tl::make_unique<ScPatternAttr>( *pInfo->pPatternAttr ) );
+ pModifiedPatt = aAltPatterns.back().get();
pModifiedPatt->SetStyleSheet( pPreviewStyle );
}
}