summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-12-13 13:46:11 +0000
committerKurt Zenker <kz@openoffice.org>2006-12-13 13:46:11 +0000
commit48112c777c5d7e803dd97b98bf3e03197f310b17 (patch)
tree7f1eebf0e001091a55cceee5828711691c9be764 /canvas
parentb42fe193ed1d767395959748fad2eb99ca6b4c45 (diff)
INTEGRATION: CWS presfixes09 (1.5.36); FILE MERGED
2006/10/18 14:00:02 thb 1.5.36.3: RESYNC: (1.6-1.8); FILE MERGED 2006/09/15 15:41:10 thb 1.5.36.2: RESYNC: (1.5-1.6); FILE MERGED 2006/03/06 22:49:00 thb 1.5.36.1: #i49357# Reworked canvas/window association (canvas is now window-listener, and exposes the associated window via a property)
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/tools/elapsedtime.cxx15
1 files changed, 2 insertions, 13 deletions
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index c97857dc0600..e8463db3e910 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: elapsedtime.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: obo $ $Date: 2006-10-12 11:31:24 $
+ * last change: $Author: kz $ $Date: 2006-12-13 14:46:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -165,17 +165,6 @@ void ElapsedTime::reset()
void ElapsedTime::adjustTimer( double fOffset, bool /*bLimitToLastQueriedTime*/ )
{
-#if 0
- if (bLimitToLastQueriedTime) {
- const double fCurrentTime = getElapsedTimeImpl();
- if (m_fLastQueriedTime > (fCurrentTime + fOffset)) {
- // TODO(Q3): Once the dust has settled, reduce to
- // OSL_TRACE here!
- OSL_ENSURE( false, "### adjustTimer(): clamping!" );
- fOffset = (m_fLastQueriedTime - fCurrentTime);
- }
- }
-#endif
// to make getElapsedTime() become _larger_, have to reduce
// m_fStartTime.
m_fStartTime -= fOffset;