diff options
| -rw-r--r-- | sc/source/ui/docshell/autostyl.cxx | 17 | ||||
| -rw-r--r-- | sc/source/ui/inc/autostyl.hxx | 17 |
2 files changed, 16 insertions, 18 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 diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index adc371b9ceae..caf2d45dbea0 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_AUTOSTYL_HXX #define INCLUDED_SC_SOURCE_UI_INC_AUTOSTYL_HXX -#include <boost/ptr_container/ptr_vector.hpp> #include <vector> #include <rtl/ustring.hxx> #include <vcl/timer.hxx> @@ -28,7 +27,6 @@ class ScDocShell; class ScRange; -struct ScAutoStyleInitData; struct ScAutoStyleData { @@ -39,6 +37,17 @@ struct ScAutoStyleData ScAutoStyleData( sal_uLong nT, const ScRange& rR, const OUString& rT ) : nTimeout(nT), aRange(rR), aStyle(rT) {} }; +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) {} +}; + class ScAutoStyleList { @@ -48,8 +57,8 @@ private: Timer aTimer; Idle aInitIdle; sal_uLong nTimerStart; - std::vector<ScAutoStyleData> aEntries; - boost::ptr_vector<ScAutoStyleInitData> aInitials; + std::vector<ScAutoStyleData> aEntries; + std::vector<ScAutoStyleInitData> aInitials; void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); |