summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx4
-rw-r--r--sd/source/ui/annotations/annotationmanagerimpl.hxx2
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx2
-rw-r--r--sd/source/ui/dlg/filedlg.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx4
-rw-r--r--sd/source/ui/inc/slideshow.hxx3
-rw-r--r--sd/source/ui/inc/view/viewoverlaymanager.hxx2
-rw-r--r--sd/source/ui/presenter/CanvasUpdateRequester.hxx4
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx9
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx5
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx3
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx4
14 files changed, 23 insertions, 31 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 9bd85c0d95ef..19bfe1870cdf 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -101,8 +101,8 @@ private:
::Window* mpWindow;
sal_Int32 mnFocusedIndex;
bool mbModelChangeLocked;
- sal_uLong mnUpdateChildrenUserEventId;
- sal_uLong mnSelectionChangeUserEventId;
+ ImplSVEvent * mnUpdateChildrenUserEventId;
+ ImplSVEvent * mnSelectionChangeUserEventId;
void UpdateChildren (void);
};
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 4ac5997d923c..5636c5d01bf1 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -124,7 +124,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxSelectedAnnotation;
bool mbShowAnnotations;
- sal_uLong mnUpdateTagsEvent;
+ ImplSVEvent * mnUpdateTagsEvent;
Font maFont;
};
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 8006922db4c8..869ae81fb527 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -84,7 +84,7 @@ private:
int mnIndex;
const Font& mrFont;
Size maSize;
- sal_uLong mnClosePopupEvent;
+ ImplSVEvent * mnClosePopupEvent;
::Window* mpListenWindow;
Point maMouseDownPos;
};
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 452cc8fbcb07..daf2aca19cd5 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -54,7 +54,7 @@ private:
css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess;
css::uno::Reference< css::media::XPlayer > mxPlayer;
- sal_uLong mnPlaySoundEvent;
+ ImplSVEvent * mnPlaySoundEvent;
bool mbUsableSelection;
bool mbLabelPlaying;
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index f473dae1307a..33c5479f5fe7 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -31,6 +31,8 @@
#include <boost/shared_ptr.hpp>
+struct ImplSVEvent;
+
namespace sd { namespace framework {
class ConfigurationController;
@@ -103,7 +105,7 @@ private:
so that a pending user event can be removed when the queue processor
is destroyed.
*/
- sal_uIntPtr mnUserEventId;
+ ImplSVEvent * mnUserEventId;
::com::sun::star::uno::Reference<
::com::sun::star::drawing::framework::XConfiguration> mxConfiguration;
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 20324f5e0047..6f16ce0bf0b3 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -51,6 +51,7 @@ class Rectangle;
class Window;
class SfxRequest;
class WorkWindow;
+struct ImplSVEvent;
// TODO: Remove
#define PAGE_NO_END 65535
@@ -216,7 +217,7 @@ private:
ViewShellBase* mpCurrentViewShellBase;
ViewShellBase* mpFullScreenViewShellBase;
FrameView* mpFullScreenFrameView;
- sal_Int32 mnInPlaceConfigEvent;
+ ImplSVEvent * mnInPlaceConfigEvent;
};
namespace slideshowhelp
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 3c04ed81b489..1259690dcc59 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -50,7 +50,7 @@ public:
private:
ViewShellBase& mrBase;
- sal_uLong mnUpdateTagsEvent;
+ ImplSVEvent * mnUpdateTagsEvent;
ViewTagVector maTagVector;
};
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index 04822d876655..78bfe2bbfa5a 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -29,6 +29,8 @@
#include <tools/link.hxx>
#include <vector>
+struct ImplSVEvent;
+
namespace sd { namespace presenter {
/** Each UpdateRequester handles update requests (calls to
@@ -59,7 +61,7 @@ private:
static RequesterMap maRequesterMap;
css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas;
- sal_uLong mnUserEventId;
+ ImplSVEvent * mnUserEventId;
bool mbUpdateFlag;
DECL_LINK(Callback, void*);
};
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index da82e5196cf0..05d8fe69c468 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -59,7 +59,7 @@ public:
void Restart (bool bForce);
private:
- sal_Int32 mnEventId;
+ ImplSVEvent * mnEventId;
::rtl::Reference<SlideShow> mpSlideShow;
ViewShellBase* mpViewShellBase;
::boost::shared_ptr<SlideShowRestarter> mpSelf;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index de55c65aa061..3f816c027587 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -539,7 +539,6 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
, msVerb( "Verb" )
, mnEndShowEvent(0)
, mnContextMenuEvent(0)
-, mnUpdateEvent(0)
, mxPresentation( xPresentation )
{
if( mpViewShell )
@@ -622,12 +621,6 @@ void SAL_CALL SlideshowImpl::disposing()
maUpdateTimer.Stop();
- if( mnUpdateEvent )
- {
- Application::RemoveUserEvent( mnUpdateEvent );
- mnUpdateEvent = 0;
- }
-
removeShapeEvents();
if( mxListenerProxy.is() )
@@ -1843,8 +1836,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl)
*/
IMPL_LINK_NOARG(SlideshowImpl, updateHdl)
{
- mnUpdateEvent = 0;
-
return updateSlideShow();
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 73a481e1d8ce..074b667235f7 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -400,9 +400,8 @@ private:
::std::auto_ptr<PaneHider> mpPaneHider;
- sal_uLong mnEndShowEvent;
- sal_uLong mnContextMenuEvent;
- sal_Int32 mnUpdateEvent;
+ ImplSVEvent * mnEndShowEvent;
+ ImplSVEvent * mnContextMenuEvent;
css::uno::Reference< css::presentation::XPresentation2 > mxPresentation;
::rtl::Reference< SlideShowListenerProxy > mxListenerProxy;
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 6b148395d886..e2cde15a31bc 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -617,13 +617,9 @@ void Clipboard::DragFinished (sal_Int8 nDropAction)
{
if (mnDragFinishedUserEventId == 0)
{
- if ( ! Application::PostUserEvent(
- mnDragFinishedUserEventId,
+ mnDragFinishedUserEventId = Application::PostUserEvent(
LINK(this, Clipboard, ProcessDragFinished),
- reinterpret_cast<void*>(nDropAction)))
- {
- mnDragFinishedUserEventId = 0;
- }
+ reinterpret_cast<void*>(nDropAction));
}
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index bb922e56acdb..e868070879aa 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -36,6 +36,7 @@ class Window;
struct AcceptDropEvent;
class DropTargetHelper;
struct ExecuteDropEvent;
+struct ImplSVEvent;
class Point;
class SdPage;
class Window;
@@ -137,7 +138,7 @@ private:
::boost::scoped_ptr<UndoContext> mpUndoContext;
::boost::scoped_ptr<SelectionObserver::Context> mpSelectionObserverContext;
- sal_uLong mnDragFinishedUserEventId;
+ ImplSVEvent * mnDragFinishedUserEventId;
void CreateSlideTransferable (
::Window* pWindow,
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 476ba6a744f4..e249a2494aeb 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -331,8 +331,8 @@ private:
::std::auto_ptr<LayouterLock> mpAsynchronousLayouterLock;
::std::auto_ptr<ViewShellManager::UpdateLock> mpViewShellManagerLock;
SAL_WNODEPRECATED_DECLARATIONS_POP
- sal_uLong mnPendingUpdateCall;
- sal_uLong mnPendingSetValidCall;
+ ImplSVEvent * mnPendingUpdateCall;
+ ImplSVEvent * mnPendingSetValidCall;
ToolBarRules maToolBarRules;
OUString GetToolBarResourceName (const OUString& rsBaseName) const;
generated by cgit (git 2.34.1) at 2025-01-31 03:25:41 +0000