diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:57:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:57:03 +0000 |
| commit | 942153e7c6454a77b6606954930bcfdbe085e5a9 (patch) | |
| tree | a0350d37bf29f9dd37a355f96ae0347d795f13a6 /slideshow/source/engine/activities/activitiesfactory.cxx | |
| parent | 71017ee1e1d27d56ff74ff817b0eee8ee8c247b5 (diff) | |
INTEGRATION: CWS sb59 (1.6.44); FILE MERGED
2006/08/11 20:35:45 thb 1.6.44.1: #i68336# Made slideshow warning free
Diffstat (limited to 'slideshow/source/engine/activities/activitiesfactory.cxx')
| -rw-r--r-- | slideshow/source/engine/activities/activitiesfactory.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index b537b0779f2d..a044a6d50871 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -4,9 +4,9 @@ * * $RCSfile: activitiesfactory.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-17 08:31:36 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:57:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -264,6 +264,8 @@ public: nModifiedTime ) ) ) ); } + using BaseType::perform; + /// perform override for DiscreteActivityBase base void perform( sal_uInt32 nFrame, sal_uInt32 nRepeatCount ) const { @@ -502,6 +504,8 @@ public: nFractionalIndex ) ) ) ); } + using BaseType::perform; + /// perform override for DiscreteActivityBase base void perform( sal_uInt32 nFrame, sal_uInt32 nRepeatCount ) const { @@ -831,6 +835,8 @@ public: mpAnim->end(); } + using SimpleContinuousActivityBase::perform; + /// perform override for ContinuousActivityBase virtual void perform( double nModifiedTime, sal_uInt32 ) const { |