summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc/slideshow.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:31 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:31 +0200
commit4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch)
tree2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/inc/slideshow.hxx
parent2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:18 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 2764d5adfcd646794593cda200fca9d4988d0d06 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:37 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/inc/slideshow.hxx')
-rw-r--r--sd/source/ui/inc/slideshow.hxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 4915bf6b9466..50f715755161 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -2,7 +2,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
@@ -45,7 +45,7 @@
#include <boost/shared_ptr.hpp>
namespace com { namespace sun { namespace star {
-
+
namespace drawing {
class XDrawPage;
}
@@ -65,10 +65,10 @@ class Window;
class SfxRequest;
// TODO: Remove
-#define PAGE_NO_END 65535
-#define PAGE_NO_SOFTEND (PAGE_NO_END - 1)
-#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1)
-#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen
+#define PAGE_NO_END 65535
+#define PAGE_NO_SOFTEND (PAGE_NO_END - 1)
+#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1)
+#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen
/* Definition of SlideShow class */
@@ -123,7 +123,7 @@ public:
// helper api
- bool startPreview(
+ bool startPreview(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode,
::Window* pParent = 0 );
@@ -158,10 +158,10 @@ public:
// legacy api
- // actions
- void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage()
+ // actions
+ void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage()
void jumpToPageIndex( sal_Int32 nIndex );
- void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark()
+ void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark()
/** sets or clears the pause state of the running slideshow.
!!!! This should only be called by the SdShowWindow !!!!*/
@@ -169,11 +169,11 @@ public:
// settings
- bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen()
- bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop();
- ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow()
- int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode()
- sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage()
+ bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen()
+ bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop();
+ ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow()
+ int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode()
+ sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage()
sal_Int32 getFirstPageNumber();
sal_Int32 getLastPageNumber();
bool isEndless();
@@ -186,7 +186,7 @@ public:
void paint( const Rectangle& rRect );
bool keyInput(const KeyEvent& rKEvt);
-
+
void receiveRequest(SfxRequest& rReq);
bool dependsOn( ViewShellBase* pViewShellBase );
@@ -210,7 +210,7 @@ private:
SlideShow(const SlideShow&);
SlideShow& operator=( const SlideShow& );
- SvxItemPropertySet maPropSet;
+ SvxItemPropertySet maPropSet;
rtl::Reference< SlideshowImpl > mxController;
/** This flag is used together with mxController.is() to prevent
@@ -225,7 +225,7 @@ private:
ViewShellBase* mpCurrentViewShellBase;
ViewShellBase* mpFullScreenViewShellBase;
FrameView* mpFullScreenFrameView;
- sal_Int32 mnInPlaceConfigEvent;
+ sal_Int32 mnInPlaceConfigEvent;
};
}