[Libreoffice-commits] core.git: sc/source
Noel Grandin
noel at peralex.com
Fri Nov 13 05:43:36 PST 2015
sc/source/core/data/fillinfo.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 442666210fb0a04e298172a288211619becedc45
Author: Noel Grandin <noel at peralex.com>
Date: Fri Nov 13 13:43:38 2015 +0200
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I4360e3238407d9cc7d664c543868cdb66271dbe8
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 50285c0..89c81a6 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 );
}
}
More information about the Libreoffice-commits
mailing list