diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 13:27:11 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 13:27:11 +0000 |
commit | 961c9f77cce91fc1aec6021e308d7f1097e718bf (patch) | |
tree | c8fdfe64776d0699c06678cbe7b211cdaebe7356 /sdext/source/presenter/PresenterAnimator.hxx | |
parent | be46996fa10461a9a07c7ec0686fdb8f27a4ca19 (diff) |
INTEGRATION: CWS presenterscreen (1.2.4); FILE MERGED
2008/04/22 08:25:57 af 1.2.4.2: RESYNC: (1.2-1.3); FILE MERGED
2008/04/18 14:51:11 af 1.2.4.1: #i18486# Changed implementation of PresenterTimer.
Diffstat (limited to 'sdext/source/presenter/PresenterAnimator.hxx')
-rw-r--r-- | sdext/source/presenter/PresenterAnimator.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sdext/source/presenter/PresenterAnimator.hxx b/sdext/source/presenter/PresenterAnimator.hxx index 307644ecc1ec..71656f707de3 100644 --- a/sdext/source/presenter/PresenterAnimator.hxx +++ b/sdext/source/presenter/PresenterAnimator.hxx @@ -8,7 +8,7 @@ * * $RCSfile: PresenterAnimator.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -61,8 +61,7 @@ private: typedef ::std::multimap<sal_uInt64,SharedPresenterAnimation> AnimationList; AnimationList maFutureAnimations; AnimationList maActiveAnimations; - class Timer; - ::boost::scoped_ptr<Timer> mpTimer; + sal_Int32 mnCurrentTaskId; sal_uInt64 mnNextTime; void Process (void); |