summaryrefslogtreecommitdiff
path: root/slideshow/source/inc/interruptabledelayevent.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:16 +0200
commit0553d10867217e30a86c88c17ccb15a06030ce07 (patch)
tree4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /slideshow/source/inc/interruptabledelayevent.hxx
parentd0ac8f1e7866c637be15f081b59ef456aacb954a (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:26 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962 Merge: 7234327 29a7259 Author: Jan Holesovsky <kendy@suse.cz> Date: Wed Sep 8 11:34:03 2010 +0200 Merge commit 'ooo/OOO330_m7' commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7) Merge: 10146e0 6b04480 Author: Kurt Zenker <kz@openoffice.org> Date: Tue Aug 31 15:10:03 2010 +0200 CWS-TOOLING: integrate CWS impress197 commit 6b04480dd88a5bd048d12874dc8c07630670c239 Author: sj <sj@openoffice.org> Date: Mon Aug 9 14:11:58 2010 +0200 impress197: #163250# fixed string handling, improved polygon splitting sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++------------- 1 files changed, 83 insertions(+), 45 deletions(-) commit a37d85f979d1616b158c918762821ed82b1e0691 Merge: 1380a03 d766efe Author: Christian Lippka <christian.lippka@sun.com> Date: Fri Aug 6 14:53:07 2010 +0200 merge commit 1380a03aaf7464643eb99de1488ab5b372663ccd Author: Christian Lippka <christian.lippka@sun.com> Date: Wed Aug 4 10:48:35 2010 +0200 #i113603# only change layout shape size on init or of user call is set sd/source/core/sdpage.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8 Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> Date: Thu Jan 1 00:00:00 1970 +0000 impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor. sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++-- sd/source/ui/view/sdwindow.cxx | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-)
Notes
Notes: split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'slideshow/source/inc/interruptabledelayevent.hxx')
-rw-r--r--slideshow/source/inc/interruptabledelayevent.hxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index 4a6f6e3000e0..8e824faa2453 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@ namespace slideshow
class DelayFacade : public Event
{
public:
- DelayFacade( const EventSharedPtr& rEvent,
- double nTimeout ) :
+ DelayFacade( const EventSharedPtr& rEvent,
+ double nTimeout ) :
#if OSL_DEBUG_LEVEL > 1
Event(::rtl::OUString::createFromAscii("DelayFacade")),
#endif
@@ -88,8 +88,8 @@ namespace slideshow
}
private:
- EventSharedPtr mpEvent;
- double mnTimeout;
+ EventSharedPtr mpEvent;
+ double mnTimeout;
};
/// Return value for makeInterruptableDelay()
@@ -99,14 +99,14 @@ namespace slideshow
event. When enqueued, this event will fire the
requested action only after the specified timeout.
*/
- EventSharedPtr mpTimeoutEvent;
+ EventSharedPtr mpTimeoutEvent;
/** This member contains a pointer to the interruption
event. When enqueued, this event will fire
immediately, interrupting a potentially waiting
timeout event.
*/
- EventSharedPtr mpImmediateEvent;
+ EventSharedPtr mpImmediateEvent;
};
/** Generate an interruptable delay event.
@@ -133,8 +133,8 @@ namespace slideshow
specified amount of time, and the other fires the given
functor immediately.
*/
- template< typename Functor > InterruptableEventPair makeInterruptableDelay( const Functor& rFunctor,
- double nTimeout )
+ template< typename Functor > InterruptableEventPair makeInterruptableDelay( const Functor& rFunctor,
+ double nTimeout )
{
InterruptableEventPair aRes;