summaryrefslogtreecommitdiff
path: root/sc/source/ui/docshell/autostyl.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-12 09:22:17 +0200
committerNoel Grandin <noel@peralex.com>2015-11-12 10:45:03 +0200
commit774707888d7af5ba657b59c945619e799e30e9d5 (patch)
tree491d7975b166e4711a39d048c95542ff39690d26 /sc/source/ui/docshell/autostyl.cxx
parent82896e32ed91b432f796bbb9441592a7fb9cb61c (diff)
sc: boost::ptr_vector->std::vector
Change-Id: I52f6d12da17bf8a6ba14064d3cbb8ff6d968f9d5
Diffstat (limited to 'sc/source/ui/docshell/autostyl.cxx')
-rw-r--r--sc/source/ui/docshell/autostyl.cxx17
1 files changed, 3 insertions, 14 deletions
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 7edcbef4ccec..1e099613e34b 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -24,18 +24,7 @@
#include "docsh.hxx"
#include "sc.hrc"
-struct ScAutoStyleInitData
-{
- ScRange aRange;
- OUString aStyle1;
- sal_uLong nTimeout;
- OUString aStyle2;
-
- ScAutoStyleInitData( const ScRange& rR, const OUString& rSt1, sal_uLong nT, const OUString& rSt2 ) :
- aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {}
-};
-
-inline sal_uLong TimeNow() // Sekunden
+static inline sal_uLong TimeNow() // Sekunden
{
return (sal_uLong) time(nullptr);
}
@@ -86,13 +75,13 @@ ScAutoStyleList::~ScAutoStyleList()
void ScAutoStyleList::AddInitial( const ScRange& rRange, const OUString& rStyle1,
sal_uLong nTimeout, const OUString& rStyle2 )
{
- aInitials.push_back(new ScAutoStyleInitData( rRange, rStyle1, nTimeout, rStyle2 ));
+ aInitials.push_back( ScAutoStyleInitData( rRange, rStyle1, nTimeout, rStyle2 ) );
aInitIdle.Start();
}
IMPL_LINK_NOARG_TYPED(ScAutoStyleList, InitHdl, Idle *, void)
{
- boost::ptr_vector<ScAutoStyleInitData>::iterator iter;
+ std::vector<ScAutoStyleInitData>::iterator iter;
for (iter = aInitials.begin(); iter != aInitials.end(); ++iter)
{
// apply first style immediately