summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow/slideshowimpl.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.hxx')
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx14
1 files changed, 4 insertions, 10 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index ef8e2c2b9b28..612d91b263cf 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -195,7 +195,6 @@ public:
virtual void SAL_CALL setUsePen( ::sal_Bool _usepen ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException);
-#ifdef ENABLE_PRESENTER_EXTRA_UI
virtual void SAL_CALL setUseEraser( ::sal_Bool _usepen ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException);
@@ -203,7 +202,6 @@ public:
virtual void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException);
virtual void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException);
-#endif
virtual ::sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
@@ -393,13 +391,9 @@ private:
PresentationSettings maPresSettings;
sal_Int32 mnUserPaintColor;
-#ifdef ENABLE_PRESENTER_EXTRA_UI
- bool mbSwitchPenMode;
- bool mbSwitchEraserMode;
+ bool mbUsePen;
double mdUserPaintStrokeWidth;
- bool mbEraseAllInk;
- sal_Int32 mnEraseInkSize;
-#endif
+
/// used in updateHdl to prevent recursive calls
sal_Int32 mnEntryCounter;
@@ -417,8 +411,8 @@ private:
::std::auto_ptr<PaneHider> mpPaneHider;
- ULONG mnEndShowEvent;
- ULONG mnContextMenuEvent;
+ sal_uLong mnEndShowEvent;
+ sal_uLong mnContextMenuEvent;
sal_Int32 mnUpdateEvent;
css::uno::Reference< css::presentation::XPresentation2 > mxPresentation;