summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slideshow/makefile.mk5
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.hrc43
-rw-r--r--sd/source/ui/slideshow/slideshow.src51
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx193
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx22
6 files changed, 232 insertions, 84 deletions
diff --git a/sd/source/ui/slideshow/makefile.mk b/sd/source/ui/slideshow/makefile.mk
index b9b3cc9ee..7055d723d 100644
--- a/sd/source/ui/slideshow/makefile.mk
+++ b/sd/source/ui/slideshow/makefile.mk
@@ -43,8 +43,9 @@ AUTOSEG=true
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.IF "$(ENABLE_PRESENTER_EXTRA_UI)"="YES"
-CDEFS+= -DENABLE_PRESENTER_EXTRA_UI
+.IF "$(ENABLE_PRESENTER_EXTRA_UI)"=="YES"
+RSCDEFS+=-DENABLE_PRESENTER_EXTRA_UI
+ADDCDEFS+=-DENABLE_PRESENTER_EXTRA_UI
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 78a6c6df4..d73eb751a 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -87,7 +87,7 @@ extern String getUiNameFromPageApiNameImpl( const ::rtl::OUString& rApiName );
namespace {
/** This local version of the work window overloads DataChanged() so that it
- can restart the slide show when a displau is added or removed.
+ can restart the slide show when a display is added or removed.
*/
class FullScreenWorkWindow : public WorkWindow
{
diff --git a/sd/source/ui/slideshow/slideshow.hrc b/sd/source/ui/slideshow/slideshow.hrc
index 326a32251..e0141d1af 100644
--- a/sd/source/ui/slideshow/slideshow.hrc
+++ b/sd/source/ui/slideshow/slideshow.hrc
@@ -27,6 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef SD_SLIDESHOW_HRC_
#define SD_SLIDESHOW_HRC_
@@ -37,23 +38,29 @@
#define CM_SCREEN_BLACK 5
#define CM_SCREEN_WHITE 6
#define CM_ENDSHOW 7
-#define CM_ERASE_INK 8
-#define CM_ERASE_ALLINK 9
-#define CM_ERASE_INK_PEN 10
-#define CM_ERASE_INK_PEN_VERY_THIN 11
-#define CM_ERASE_INK_PEN_THIN 12
-#define CM_ERASE_INK_PEN_NORMAL 13
-#define CM_ERASE_INK_PEN_THICK 14
-#define CM_ERASE_INK_PEN_VERY_THICK 15
-#define CM_COLOR_PEN 16
-#define CM_WIDTH_PEN 17
-#define CM_WIDTH_PEN_VERY_THIN 18
-#define CM_WIDTH_PEN_THIN 19
-#define CM_WIDTH_PEN_NORMAL 20
-#define CM_WIDTH_PEN_THICK 21
-#define CM_WIDTH_PEN_VERY_THICK 22
-#define CM_FIRST_SLIDE 23
-#define CM_LAST_SLIDE 24
-#define CM_SLIDES 25
+#define CM_FIRST_SLIDE 8
+#define CM_LAST_SLIDE 9
+#define CM_SLIDES 10
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+//CM for extra presenter UI
+#define CM_ERASE_ALLINK 11
+#define CM_ERASE_INK 12
+#define CM_ERASE_INK_PEN 13
+#define CM_ERASE_INK_PEN_VERY_THIN 14
+#define CM_ERASE_INK_PEN_THIN 15
+#define CM_ERASE_INK_PEN_NORMAL 16
+#define CM_ERASE_INK_PEN_THICK 17
+#define CM_ERASE_INK_PEN_VERY_THICK 18
+#define CM_COLOR_PEN 19
+#define CM_WIDTH_PEN 20
+#define CM_WIDTH_PEN_VERY_THIN 21
+#define CM_WIDTH_PEN_THIN 22
+#define CM_WIDTH_PEN_NORMAL 23
+#define CM_WIDTH_PEN_THICK 24
+#define CM_WIDTH_PEN_VERY_THICK 25
+#define CM_PEN_MODE 26
+#define CM_ERASE_MODE 27
+#define CM_POINTER_OPTION 28
+#endif //ENABLE_PRESENTER_EXTRA_UI
#endif
diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src
index a2cad1add..60bcd5c3b 100644
--- a/sd/source/ui/slideshow/slideshow.src
+++ b/sd/source/ui/slideshow/slideshow.src
@@ -74,20 +74,34 @@ Menu RID_SLIDESHOW_CONTEXTMENU
{
Separator = TRUE;
};
+#ifdef ENABLE_PRESENTER_EXTRA_UI
MenuItem
{
- Identifier = CM_WIDTH_PEN;
- Text [ en-US ] = "~Pen Width" ;
-
+ Identifier = CM_PEN_MODE;
+ Text [ en-US ] = "~Pen Mode";
+ };
+ MenuItem
+ {
+ Identifier = CM_ERASE_MODE;
+ Text [ en-US ] = "~Eraser Mode";
+ };
+ MenuItem
+ {
+ Separator = TRUE;
+ };
+ MenuItem
+ {
+ Identifier = CM_WIDTH_PEN;
+ Text [ en-US ] = "~Pen Width" ;
SubMenu = Menu
- {
+ {
ItemList =
{
MenuItem
{
Identifier = CM_WIDTH_PEN_VERY_THIN;
Text [ en-US ] = "~Very thin";
- };
+ };
MenuItem
{
Identifier = CM_WIDTH_PEN_THIN;
@@ -97,7 +111,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU
{
Identifier = CM_WIDTH_PEN_NORMAL;
Text [ en-US ] = "~Normal";
- };
+ };
MenuItem
{
Identifier = CM_WIDTH_PEN_THICK;
@@ -107,7 +121,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU
{
Identifier = CM_WIDTH_PEN_VERY_THICK;
Text [ en-US ] = "~Very Thick";
- };
+ };
};
};
};
@@ -115,8 +129,8 @@ Menu RID_SLIDESHOW_CONTEXTMENU
{
Separator = TRUE;
};
- MenuItem
- {
+ MenuItem
+ {
Identifier = CM_COLOR_PEN ;
Text [ en-US ] = "~Change Pen Color" ;
};
@@ -131,23 +145,23 @@ Menu RID_SLIDESHOW_CONTEXTMENU
MenuItem
{
Identifier = CM_ERASE_ALLINK ;
- Text [ en-US ] = "~Erase All Ink" ;
- };
- MenuItem
- {
- Identifier = CM_ERASE_INK ;
- Text [ en-US ] = "~Erase Ink Mode ON/OFF" ;
+ Text [ en-US ] = "~Erase All Ink On Slide" ;
};
+ // MenuItem
+ // {
+ // Identifier = CM_ERASE_INK ;
+ // Text [ en-US ] = "~Erase Ink Mode ON/OFF" ;
+ // };
MenuItem
{
Separator = TRUE;
};
MenuItem
{
- Identifier = CM_ERASE_INK_PEN;
- Text [ en-US ] = "~Eraser Size" ;
+ Identifier = CM_ERASE_INK_PEN;
+ Text [ en-US ] = "~Eraser Width" ;
- SubMenu = Menu
+ SubMenu = Menu
{
ItemList =
{
@@ -179,6 +193,7 @@ Menu RID_SLIDESHOW_CONTEXTMENU
};
};
};
+#endif
MenuItem
{
Separator = TRUE;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e47e4d3cc..21d0dbe85 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -468,6 +468,8 @@ bool AnimationSlideController::previousSlide()
return jumpToSlideIndex( getPreviousSlideIndex() );
}
+
+
void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow, const Reference< XDrawPagesSupplier>& xDrawPages )
{
const sal_Int32 nCurrentSlideNumber = getCurrentSlideNumber();
@@ -525,11 +527,15 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
, mbInputFreeze(false)
, mbActive(sal_False)
, maPresSettings( pDoc->getPresentationSettings() )
-, mnUserPaintColor( 0x00000000L )
+, mnUserPaintColor( 0x00000000L ) //User paint color is Black by default
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+, mbSwitchPenMode(true)
+, mbSwitchEraserMode(false)
, mdUserPaintStrokeWidth ( 4.0 )
, mbEraseAllInk(false)
-, mbEraseInk(false)
-, mnEraseInkSize(100.0)
+//, mbEraseInk(false)
+, mnEraseInkSize(100)
+#endif
, mnEntryCounter(0)
, mnLastSlideNumber(-1)
, msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") )
@@ -1093,6 +1099,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
aProperties.push_back(
beans::PropertyValue(
OUString( RTL_CONSTASCII_USTRINGPARAM("UserPaintColor") ),
+ // User paint color is black by default.
-1, Any( static_cast<sal_Int32>(0x00000000L) ),
beans::PropertyState_DIRECT_VALUE ) );
}
@@ -1418,12 +1425,14 @@ void SlideshowImpl::displayCurrentSlide()
void SlideshowImpl::endPresentation()
{
+#ifdef ENABLE_PRESENTER_EXTRA_UI
if( maPresSettings.mbMouseAsPen)
{
Reference< XMultiServiceFactory > xDocFactory(mpDoc->getUnoModel(), UNO_QUERY );
if( xDocFactory.is() )
mxShow->registerUserPaintPolygons(xDocFactory);
}
+#endif
if( !mnEndShowEvent )
mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) );
}
@@ -2128,7 +2137,12 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
#ifdef ENABLE_PRESENTER_EXTRA_UI
//adding button to contextual menu for erasing functionnalities for UserPaintOverlay
pMenu->EnableItem( CM_ERASE_ALLINK, (maPresSettings.mbMouseAsPen));
- pMenu->EnableItem( CM_COLOR_PEN, (maPresSettings.mbMouseAsPen));
+ // Adding button to contextual menu for changing pen color
+ pMenu->EnableItem( CM_COLOR_PEN, (maPresSettings.mbMouseAsPen));
+ // Adding button to display if in Pen mode
+ pMenu->EnableItem( CM_PEN_MODE, (maPresSettings.mbMouseAsPen));
+ // Adding button to displau if in Erase Mode
+ pMenu->EnableItem( CM_ERASE_MODE, (maPresSettings.mbMouseAsPen));
#endif
const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
@@ -2197,9 +2211,10 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
pBlankMenu->CheckItem( ( mpShowWindow->GetBlankColor() == Color( COL_WHITE ) ) ? CM_SCREEN_WHITE : CM_SCREEN_BLACK );
}
}
-
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+
PopupMenu* pWidthMenu = pMenu->GetPopupMenu( CM_WIDTH_PEN);
-
+
// populate color width list
if( pWidthMenu )
{
@@ -2244,7 +2259,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
}
}
-#ifdef ENABLE_PRESENTER_EXTRA_UI
+
PopupMenu* pEraseWidthMenu = pMenu->GetPopupMenu( CM_ERASE_INK_PEN);
// populate eraser width list
@@ -2286,7 +2301,11 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
pEraseWidthMenu->EnableItem( (USHORT)(CM_ERASE_INK_PEN + nEIterator), TRUE);
if( nEWidth == mnEraseInkSize)
pEraseWidthMenu->CheckItem( (USHORT)(CM_ERASE_INK_PEN + nEIterator) );
-
+ if( mbSwitchPenMode )
+ pMenu->CheckItem( (USHORT)(CM_PEN_MODE));
+ if( mbSwitchEraserMode )
+ pMenu->CheckItem( (USHORT)(CM_ERASE_MODE));
+
}
}
}
@@ -2354,7 +2373,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
}
}
break;
-
+#ifdef ENABLE_PRESENTER_EXTRA_UI
if( maPresSettings.mbMouseAsPen )
{
case CM_COLOR_PEN:
@@ -2408,48 +2427,59 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
mbWasPaused = false;
}
break;
-#ifdef ENABLE_PRESENTER_EXTRA_UI
case CM_ERASE_ALLINK:
{
setEraseAllInk(true);
mbWasPaused = false;
}
break;
+ case CM_PEN_MODE:
+ {
+ setPenMode(true);
+ mbWasPaused = false;
+ }
+ break;
+ case CM_ERASE_MODE:
+ {
+ setEraserMode(true);
+ mbWasPaused = false;
+ }
+ break;
case CM_ERASE_INK_PEN_VERY_THIN:
{
- setEraseInk(100.0);
+ setEraseInk(100);
mbWasPaused = false;
}
break;
case CM_ERASE_INK_PEN_THIN:
{
- setEraseInk(200.0);
+ setEraseInk(200);
mbWasPaused = false;
}
break;
case CM_ERASE_INK_PEN_NORMAL:
{
- setEraseInk(300.0);
+ setEraseInk(300);
mbWasPaused = false;
}
break;
case CM_ERASE_INK_PEN_THICK:
{
- setEraseInk(400.0);
+ setEraseInk(400);
mbWasPaused = false;
}
break;
case CM_ERASE_INK_PEN_VERY_THICK:
{
- setEraseInk(500.0);
+ setEraseInk(500);
mbWasPaused = false;
}
break;
-#endif
}
+#endif
case CM_ENDSHOW:
// in case the user cancels the presentation, switch to current slide
@@ -3058,16 +3088,16 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
maPresSettings.mbMouseAsPen = bMouseAsPen;
if( mxShow.is() ) try
{
+ // For Pencolor;
Any aValue;
if( maPresSettings.mbMouseAsPen )
- // todo: take color from configuration
- aValue <<= mnUserPaintColor;
-
+ // TODO: take color from configuration
+ aValue <<= mnUserPaintColor;
beans::PropertyValue aPenProp;
aPenProp.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UserPaintColor" ));
aPenProp.Value = aValue;
-
mxShow->setProperty( aPenProp );
+#ifdef ENABLE_PRESENTER_EXTRA_UI
//for StrokeWidth :
Any aValueWidth;
if( maPresSettings.mbMouseAsPen )
@@ -3078,23 +3108,26 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
aPenPropWidth.Value = aValueWidth;
mxShow->setProperty( aPenPropWidth );
-
- //for EraseAllInk :
- Any aValueEraseAllInk;
- if( maPresSettings.mbMouseAsPen )
- aValueEraseAllInk <<= mbEraseAllInk;
- beans::PropertyValue aPenPropEraseAllInk;
- aPenPropEraseAllInk.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EraseAllInk" ));
- aPenPropEraseAllInk.Value = aValueEraseAllInk;
- mxShow->setProperty( aPenPropEraseAllInk );
- //for EraseInk :
- Any aValueEraseInk;
+
+ // for Pen Mode
+ Any aValueSwitchPenMode;
if( maPresSettings.mbMouseAsPen )
- aValueEraseInk <<= mnEraseInkSize;
- beans::PropertyValue aPenPropEraseInk;
- aPenPropEraseInk.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EraseInk" ));
- aPenPropEraseInk.Value = aValueEraseInk;
- mxShow->setProperty( aPenPropEraseInk );
+ aValueSwitchPenMode <<= mbSwitchPenMode;
+ beans::PropertyValue aPenPropSwitchPenMode;
+ aPenPropSwitchPenMode.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SwitchPenMode" ));
+ aPenPropSwitchPenMode.Value = aValueSwitchPenMode;
+ mxShow->setProperty( aPenPropSwitchPenMode );
+
+ //for EraseAllInk :
+ Any aValueEraseAllInk;
+ if( maPresSettings.mbMouseAsPen )
+ aValueEraseAllInk <<= mbEraseAllInk;
+ beans::PropertyValue aPenPropEraseAllInk;
+ aPenPropEraseAllInk.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EraseAllInk" ));
+ aPenPropEraseAllInk.Value = aValueEraseAllInk;
+ mxShow->setProperty( aPenPropEraseAllInk );
+ mbEraseAllInk = false; // sets to false so not to have it applied again
+#endif
}
catch( Exception& e )
{
@@ -3108,23 +3141,64 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
}
}
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+void SAL_CALL SlideshowImpl::setUseEraser( sal_Bool bMouseAsPen ) throw (RuntimeException)
+{
+ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ maPresSettings.mbMouseAsPen = bMouseAsPen;
+ if( mxShow.is() ) try
+ {
+
+ //for EraseInk :
+ Any aValueEraseInk;
+ if( maPresSettings.mbMouseAsPen )
+ aValueEraseInk <<= mnEraseInkSize;
+ beans::PropertyValue aPenPropEraseInk;
+ aPenPropEraseInk.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EraseInk" ));
+ aPenPropEraseInk.Value = aValueEraseInk;
+ mxShow->setProperty( aPenPropEraseInk );
+
+ // for Erase Mode
+ Any aValueSwitchEraserMode;
+ if( maPresSettings.mbMouseAsPen )
+ aValueSwitchEraserMode <<= mbSwitchEraserMode;
+ beans::PropertyValue aPenPropSwitchEraserMode;
+ aPenPropSwitchEraserMode.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SwitchEraserMode" ));
+ aPenPropSwitchEraserMode.Value = aValueSwitchEraserMode;
+ mxShow->setProperty( aPenPropSwitchEraserMode );
+ }
+ catch( Exception& e )
+ {
+ static_cast<void>(e);
+ DBG_ERROR(
+ (OString("sd::SlideshowImpl::setUseEraser(), "
+ "exception caught: ") +
+ rtl::OUStringToOString(
+ comphelper::anyToString( cppu::getCaughtException() ),
+ RTL_TEXTENCODING_UTF8 )).getStr() );
+ }
+}
+
// --------------------------------------------------------------------
+
double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException)
{
::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
return mdUserPaintStrokeWidth;
}
-
-
+
// --------------------------------------------------------------------
void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException)
{
::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
mdUserPaintStrokeWidth = dStrokeWidth;
+ mbSwitchPenMode = true;
+ mbSwitchEraserMode = !mbSwitchPenMode;
if( maPresSettings.mbMouseAsPen )
setUsePen( sal_True ); // update color and width
}
+#endif
// --------------------------------------------------------------------
sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
@@ -3139,10 +3213,48 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep
{
::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
mnUserPaintColor = nColor;
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+ mbSwitchPenMode = true;
+ mbSwitchEraserMode = !mbSwitchPenMode;
+#endif
if( maPresSettings.mbMouseAsPen )
setUsePen( sal_True ); // update color
}
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+// --------------------------------------------------------------------
+
+void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException)
+{
+ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ mbSwitchPenMode = bSwitchPenMode;
+
+ if(mbSwitchPenMode == true){
+ mbSwitchEraserMode = false;
+ }else{
+ mbSwitchEraserMode = true;
+ }
+ if( maPresSettings.mbMouseAsPen )
+ setUsePen( sal_True ); // Switch to Pen Mode
+
+}
+
+void SAL_CALL SlideshowImpl::setEraserMode(bool bSwitchEraserMode ) throw (RuntimeException)
+{
+ ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+ mbSwitchEraserMode = bSwitchEraserMode;
+ if(mbSwitchEraserMode = true){
+ mbSwitchPenMode = false;
+ }else{
+ mbSwitchPenMode = true;
+ }
+
+ if( maPresSettings.mbMouseAsPen )
+ setUseEraser( sal_True ); // Switch to EraseMode
+
+}
+
+
// --------------------------------------------------------------------
void SAL_CALL SlideshowImpl::setEraseAllInk( bool bEraseAllInk ) throw (RuntimeException)
@@ -3154,13 +3266,16 @@ void SAL_CALL SlideshowImpl::setEraseAllInk( bool bEraseAllInk ) throw (RuntimeE
}
-void SAL_CALL SlideshowImpl::setEraseInk( double nEraseInkSize ) throw (RuntimeException)
+void SAL_CALL SlideshowImpl::setEraseInk( sal_Int32 nEraseInkSize ) throw (RuntimeException)
{
::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
mnEraseInkSize=nEraseInkSize;
+ mbSwitchPenMode = false;
+ mbSwitchEraserMode = true;
if( maPresSettings.mbMouseAsPen )
setUsePen( sal_True ); // update erase ink size
}
+#endif
// --------------------------------------------------------------------
// XSlideShowController Methods
// --------------------------------------------------------------------
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 627f4b027..888d18dc3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -200,12 +200,17 @@ public:
virtual void SAL_CALL setMouseVisible( ::sal_Bool _mousevisible ) throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException);
virtual void SAL_CALL setUsePen( ::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);
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);
virtual void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException);
- virtual void SAL_CALL setEraseInk( double nEraseInkSize ) throw (css::uno::RuntimeException);
+ 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);
@@ -384,10 +389,15 @@ private:
PresentationSettings maPresSettings;
sal_Int32 mnUserPaintColor;
- double mdUserPaintStrokeWidth;
+
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+ bool mbSwitchPenMode;
+ bool mbSwitchEraserMode;
+ double mdUserPaintStrokeWidth;
bool mbEraseAllInk;
- bool mbEraseInk;
- double mnEraseInkSize;
+// bool mbEraseInk;
+ sal_Int32 mnEraseInkSize;
+#endif
/// used in updateHdl to prevent recursive calls
sal_Int32 mnEntryCounter;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 10:16:37 +0000