cmcfixes71: merge with DEV300 m71

10 files changed, 636 insertions, 49 deletions

diff --git a/sd/source/ui/slideshow/makefile.mk b/sd/source/ui/slideshow/makefile.mk
index e157ba99d3bc..7055d723df55 100644
--- a/sd/source/ui/slideshow/makefile.mk
+++ b/sd/source/ui/slideshow/makefile.mk
@@ -43,6 +43,11 @@ AUTOSEG=true
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
+.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 f1cb2cf4afb9..fbcc0ffedfdf 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 8a9799321738..34dbd5c6536b 100644
--- a/sd/source/ui/slideshow/slideshow.hrc
+++ b/sd/source/ui/slideshow/slideshow.hrc
@@ -41,5 +41,24 @@
 #define CM_FIRST_SLIDE  8
 #define CM_LAST_SLIDE   9
 #define CM_SLIDES       10
+//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
diff --git a/sd/source/ui/slideshow/slideshow.src b/sd/source/ui/slideshow/slideshow.src
index ec57d3e84897..42459427f54f 100644
--- a/sd/source/ui/slideshow/slideshow.src
+++ b/sd/source/ui/slideshow/slideshow.src
@@ -74,6 +74,125 @@ Menu RID_SLIDESHOW_CONTEXTMENU
         {
             Separator = TRUE;
         };
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+        MenuItem
+        {
+            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;
+                        Text [ en-US ] = "~Thin";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_WIDTH_PEN_NORMAL;
+                        Text [ en-US ] = "~Normal";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_WIDTH_PEN_THICK;
+                        Text [ en-US ] = "~Thick";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_WIDTH_PEN_VERY_THICK;
+                        Text [ en-US ] = "~Very Thick";
+                    };
+                };
+            };
+        };
+        MenuItem
+        {
+            Separator = TRUE;
+        };
+        MenuItem
+        {
+            Identifier = CM_COLOR_PEN ;
+            Text [ en-US ] = "~Change Pen Color" ;
+        };
+        MenuItem
+        {
+            Separator = TRUE;
+        };
+        MenuItem
+        {
+            Separator = TRUE;
+        };
+        MenuItem
+        {
+            Identifier = CM_ERASE_ALLINK ;
+            Text [ en-US ] = "~Erase All Ink On Slide" ;
+        };
+        MenuItem
+        {
+            Separator = TRUE;
+        };
+        MenuItem
+        {
+            Identifier = CM_ERASE_INK_PEN;
+            Text [ en-US ] = "~Eraser Width" ;
+
+        SubMenu = Menu
+                    {
+                ItemList =
+                {
+                    MenuItem
+                    {
+                        Identifier =  CM_ERASE_INK_PEN_VERY_THIN;
+                        Text [ en-US ] = "~Very thin";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_ERASE_INK_PEN_THIN;
+                        Text [ en-US ] = "~Thin";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_ERASE_INK_PEN_NORMAL;
+                        Text [ en-US ] = "~Normal";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_ERASE_INK_PEN_THICK;
+                        Text [ en-US ] = "~Thick";
+                    };
+                    MenuItem
+                    {
+                        Identifier =  CM_ERASE_INK_PEN_VERY_THICK;
+                        Text [ en-US ] = "~Very Thick";
+                    };
+                };
+            };
+        };
+#endif
+    MenuItem
+    {
+        Separator = TRUE;
+    };
         MenuItem
         {
             Identifier = CM_SCREEN;
@@ -98,12 +217,8 @@ Menu RID_SLIDESHOW_CONTEXTMENU
         };
         MenuItem
         {
-            Separator = TRUE;
-        };
-        MenuItem
-        {
             Identifier = CM_ENDSHOW ;
             Text [ en-US ] = "~End Show" ;
-        };
+    };
     };
 };
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e59f45b71e12..8881706e62bb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -34,6 +34,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
+#include "com/sun/star/frame/XComponentLoader.hpp"
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/drawing/XMasterPageTarget.hpp>
@@ -86,6 +87,7 @@
 #include "canvas/elapsedtime.hxx"
 #include "canvas/prioritybooster.hxx"
 #include "avmedia/mediawindow.hxx"
+#include  "svtools/colrdlg.hxx"
 
 #include <boost/noncopyable.hpp>
 #include <boost/bind.hpp>
@@ -169,9 +171,9 @@ public:
     bool nextSlide();
     bool previousSlide();
 
-    void displayCurrentSlide(
-        const Reference< XSlideShow >& xShow,
-        const bool bSkipAllMainSequenceEffects);
+    void displayCurrentSlide( const Reference< XSlideShow >& xShow,
+                              const Reference< XDrawPagesSupplier>& xDrawPages,
+                              const bool bSkipAllMainSequenceEffects );
 
     sal_Int32 getNextSlideIndex() const;
     sal_Int32 getPreviousSlideIndex() const;
@@ -468,9 +470,9 @@ bool AnimationSlideController::previousSlide()
     return jumpToSlideIndex( getPreviousSlideIndex() );
 }
 
-void AnimationSlideController::displayCurrentSlide(
-    const Reference< XSlideShow >& xShow,
-    const bool bSkipAllMainSequenceEffects)
+void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow,
+                                                    const Reference< XDrawPagesSupplier>& xDrawPages,
+                                                    const bool bSkipAllMainSequenceEffects )
 {
     const sal_Int32 nCurrentSlideNumber = getCurrentSlideNumber();
 
@@ -519,7 +521,7 @@ void AnimationSlideController::displayCurrentSlide(
             aPropertySequence[nIndex] = aProperties[nIndex];
 
         if( getSlideAPI( nCurrentSlideNumber, xSlide, xAnimNode ) )
-            xShow->displaySlide( xSlide, xAnimNode, aPropertySequence );
+            xShow->displaySlide( xSlide, xDrawPages, xAnimNode, aPropertySequence );
     }
 }
 
@@ -554,7 +556,15 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
 , mbInputFreeze(false)
 , mbActive(sal_False)
 , maPresSettings( pDoc->getPresentationSettings() )
-, mnUserPaintColor( 0x0000FF00L )
+, 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)
+#endif
 , mnEntryCounter(0)
 , mnLastSlideNumber(-1)
 , msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") )
@@ -1121,7 +1131,8 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
                 aProperties.push_back(
                     beans::PropertyValue(
                         OUString( RTL_CONSTASCII_USTRINGPARAM("UserPaintColor") ),
-                        -1, Any( static_cast<sal_Int32>(0x0000FF00L) ),
+                        // User paint color is black by default.
+                        -1, Any( static_cast<sal_Int32>(0x00000000L) ),
                         beans::PropertyState_DIRECT_VALUE ) );
             }
 
@@ -1431,7 +1442,9 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
 
     if( mpSlideController.get() && mxShow.is() )
     {
-        mpSlideController->displayCurrentSlide( mxShow, bSkipAllMainSequenceEffects );
+        Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(),
+                                                    UNO_QUERY_THROW );
+        mpSlideController->displayCurrentSlide( mxShow, xDrawPages, bSkipAllMainSequenceEffects );
         registerShapeEvents(mpSlideController->getCurrentSlideNumber());
         update();
 
@@ -1448,6 +1461,14 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
 
 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) );
 }
@@ -2182,6 +2203,17 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
 
     PopupMenu* pMenu = new PopupMenu( SdResId( RID_SLIDESHOW_CONTEXTMENU ) );
 
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+    //adding button to contextual menu for erasing functionnalities for UserPaintOverlay
+    pMenu->EnableItem( CM_ERASE_ALLINK, (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();
     pMenu->EnableItem( CM_NEXT_SLIDE, ( mpSlideController->getNextSlideIndex() != -1 ) );
     pMenu->EnableItem( CM_PREV_SLIDE, ( mpSlideController->getPreviousSlideIndex() != -1 ) || (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) );
@@ -2248,6 +2280,105 @@ 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 )
+    {
+        if(! maPresSettings.mbMouseAsPen)
+        {
+            pMenu->EnableItem( CM_WIDTH_PEN, FALSE );
+        }
+        else
+        {
+            sal_Int32 nIterator;
+            double nWidth;
+
+            nWidth = 4.0;
+            for( nIterator = 1; nIterator < 6; nIterator++)
+            {
+                switch(nIterator)
+                {
+                    case 1:
+                        nWidth = 4.0;
+                        break;
+                    case 2:
+                        nWidth = 100.0;
+                        break;
+                    case 3:
+                        nWidth = 150.0;
+                        break;
+                    case 4:
+                        nWidth = 200.0;
+                        break;
+                    case 5:
+                        nWidth = 400.0;
+                        break;
+                    default:
+                        break;
+                }
+
+                pWidthMenu->EnableItem( (USHORT)(CM_WIDTH_PEN + nIterator), TRUE);
+                if( nWidth ==  mdUserPaintStrokeWidth)
+                    pWidthMenu->CheckItem( (USHORT)(CM_WIDTH_PEN + nIterator) );
+
+            }
+        }
+    }
+
+
+    PopupMenu* pEraseWidthMenu = pMenu->GetPopupMenu( CM_ERASE_INK_PEN);
+
+    // populate eraser width list
+    if( pEraseWidthMenu )
+    {
+        if(! maPresSettings.mbMouseAsPen)
+        {
+            pMenu->EnableItem( CM_ERASE_INK_PEN, FALSE );
+        }
+        else
+        {
+            sal_Int32 nEIterator;
+            double nEWidth;
+
+            nEWidth = 100.0;
+            for( nEIterator = 1; nEIterator < 6; nEIterator++)
+            {
+                switch(nEIterator)
+                {
+                    case 1:
+                        nEWidth = 100.0;
+                        break;
+                    case 2:
+                        nEWidth = 200.0;
+                        break;
+                    case 3:
+                        nEWidth = 300.0;
+                        break;
+                    case 4:
+                        nEWidth = 400.0;
+                        break;
+                    case 5:
+                        nEWidth = 500.0;
+                        break;
+                    default:
+                        break;
+                }
+
+                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));
+
+            }
+        }
+    }
+#endif
 
     pMenu->SetSelectHdl( LINK( this, SlideshowImpl, ContextMenuSelectHdl ) );
     pMenu->Execute( mpShowWindow, maPopupMousePos );
@@ -2311,32 +2442,139 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
             }
         }
         break;
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+        if( maPresSettings.mbMouseAsPen )
+        {
+            case CM_COLOR_PEN:
+                {
+                    //Open a color picker based on SvColorDialog
+                    ::Color aColor( mnUserPaintColor );
+                    SvColorDialog aColorDlg( mpShowWindow);
+                    aColorDlg.SetColor( aColor );
 
-        case CM_ENDSHOW:
-            // in case the user cancels the presentation, switch to current slide
-            // in edit mode
-            if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) )
-            {
-                if( mpSlideController->getCurrentSlideNumber() != -1 )
+                    if (aColorDlg.Execute() )
+                    {
+                        aColor = aColorDlg.GetColor();
+                        mnUserPaintColor = aColor.GetColor();
+                        setPenColor(mnUserPaintColor);
+                    }
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_WIDTH_PEN_VERY_THIN:
                 {
-                    mnRestoreSlide = mpSlideController->getCurrentSlideNumber();
+                    setPenWidth(4.0);
+                    mbWasPaused = false;
                 }
-            }
-            endPresentation();
-            break;
-        default:
-            sal_Int32 nPageNumber = nMenuId - CM_SLIDES;
-            const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
-            if( (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) )
-            {
-                mpShowWindow->RestartShow( nPageNumber );
-            }
-            else if( nPageNumber != mpSlideController->getCurrentSlideNumber() )
-            {
-                displaySlideNumber( nPageNumber );
-            }
-            mbWasPaused = false;
-            break;
+                break;
+
+            case CM_WIDTH_PEN_THIN:
+                {
+                    setPenWidth(100.0);
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_WIDTH_PEN_NORMAL:
+                {
+                    setPenWidth(150.0);
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_WIDTH_PEN_THICK:
+                {
+                    setPenWidth(200.0);
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_WIDTH_PEN_VERY_THICK:
+                {
+                    setPenWidth(400.0);
+                    mbWasPaused = false;
+                }
+                break;
+            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);
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_ERASE_INK_PEN_THIN:
+                {
+                    setEraseInk(200);
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_ERASE_INK_PEN_NORMAL:
+                {
+                    setEraseInk(300);
+                    mbWasPaused = false;
+                }
+                break;
+
+            case CM_ERASE_INK_PEN_THICK:
+                {
+                    setEraseInk(400);
+                    mbWasPaused = false;
+                }
+                break;
+            case CM_ERASE_INK_PEN_VERY_THICK:
+                {
+                    setEraseInk(500);
+                    mbWasPaused = false;
+                }
+                break;
+        }
+#endif
+
+            case CM_ENDSHOW:
+                // in case the user cancels the presentation, switch to current slide
+                // in edit mode
+                if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) )
+                {
+                    if( mpSlideController->getCurrentSlideNumber() != -1 )
+                    {
+                        mnRestoreSlide = mpSlideController->getCurrentSlideNumber();
+                    }
+                }
+                endPresentation();
+                break;
+            default:
+                sal_Int32 nPageNumber = nMenuId - CM_SLIDES;
+                const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
+                if( (eMode == SHOWWINDOWMODE_END) || (eMode == SHOWWINDOWMODE_PAUSE) || (eMode == SHOWWINDOWMODE_BLANK) )
+                {
+                    mpShowWindow->RestartShow( nPageNumber );
+                }
+                else if( nPageNumber != mpSlideController->getCurrentSlideNumber() )
+                {
+                    displaySlideNumber( nPageNumber );
+                }
+                mbWasPaused = false;
+                break;
         }
     }
 
@@ -2919,16 +3157,46 @@ 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 )
+            aValueWidth <<= mdUserPaintStrokeWidth;
+
+        beans::PropertyValue aPenPropWidth;
+        aPenPropWidth.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UserPaintStrokeWidth" ));
+        aPenPropWidth.Value = aValueWidth;
+
+        mxShow->setProperty( aPenPropWidth );
+
+    // for Pen Mode
+        Any aValueSwitchPenMode;
+        if( maPresSettings.mbMouseAsPen )
+            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 )
     {
@@ -2942,6 +3210,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)
@@ -2956,10 +3282,71 @@ 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)
+{
+    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    mbEraseAllInk=bEraseAllInk;
+    mbSwitchPenMode = true;
+    mbSwitchEraserMode = false;
+    if( maPresSettings.mbMouseAsPen )
+        setUsePen( sal_True ); // update erase all ink bool
+}
+
+
+void SAL_CALL SlideshowImpl::setEraseInk( sal_Int32 nEraseInkSize ) throw (RuntimeException)
+{
+    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    mnEraseInkSize=nEraseInkSize;
+    mbSwitchPenMode = false;
+    mbSwitchEraserMode = true;
+    if( maPresSettings.mbMouseAsPen )
+        setUseEraser( 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 96b24913c45e..b98f05961816 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -202,6 +202,15 @@ 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);
+    virtual void SAL_CALL setEraseAllInk( bool bEraseAllInk ) 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);
@@ -391,6 +400,14 @@ private:
     PresentationSettings maPresSettings;
     sal_Int32       mnUserPaintColor;
 
+#ifdef ENABLE_PRESENTER_EXTRA_UI
+    bool            mbSwitchPenMode;
+    bool            mbSwitchEraserMode;
+    double          mdUserPaintStrokeWidth;
+    bool            mbEraseAllInk;
+//    bool          mbEraseInk;
+    sal_Int32       mnEraseInkSize;
+#endif
     /// used in updateHdl to prevent recursive calls
     sal_Int32       mnEntryCounter;
 
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index b90832acaa51..959f22e30cf1 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -270,10 +270,8 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap;
 } // end of anonymous namespace
 
 
-#ifdef __cplusplus
 extern "C"
 {
-#endif
 
 SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char  ** ppEnvTypeName,
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 96dd05a01267..17fad0f5fdc1 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -826,8 +826,8 @@ uno::Reference<drawing::XLayer> SdLayerManager::GetLayer (SdrLayer* pLayer)
         xLayer = new SdLayer (this, pLayer);
 
         // Remember the new xLayer for future calls.
-        xRef = uno::Reference<uno::XInterface> (xLayer, uno::UNO_QUERY);
-        mpLayers->insert (xRef);
+        uno::WeakReference<uno::XInterface> wRef(xLayer);
+        mpLayers->insert(wRef);
     }
 
     return xLayer;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 2e753fd859d1..0222f972938e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -65,6 +65,7 @@
 #include <svx/unofill.hxx>
 #include <svx/unopool.hxx>
 #include <svx/svdorect.hxx>
+#include <svx/flditem.hxx>
 #include <vos/mutex.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 
@@ -111,6 +112,12 @@
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
 
+#include <com/sun/star/office/XAnnotation.hpp>
+#include <com/sun/star/office/XAnnotationAccess.hpp>
+#include <com/sun/star/office/XAnnotationEnumeration.hpp>
+#include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+
 using ::rtl::OUString;
 
 #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx>
@@ -1602,6 +1609,42 @@ sal_Int32 ImplPDFGetBookmarkPage( const String& rBookmark, SdDrawDocument& rDoc
     return nPage;
 }
 
+void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDFExtOutDevData& rPDFExtOutDevData )
+{
+    try
+    {
+        uno::Reference< office::XAnnotationAccess > xAnnotationAccess( xPage, uno::UNO_QUERY_THROW );
+        uno::Reference< office::XAnnotationEnumeration > xAnnotationEnumeration( xAnnotationAccess->createAnnotationEnumeration() );
+
+        LanguageType eLanguage = Application::GetSettings().GetLanguage();
+        while( xAnnotationEnumeration->hasMoreElements() )
+        {
+            uno::Reference< office::XAnnotation > xAnnotation( xAnnotationEnumeration->nextElement() );
+
+            geometry::RealPoint2D aRealPoint2D( xAnnotation->getPosition() );
+            uno::Reference< text::XText > xText( xAnnotation->getTextRange() );
+//          rtl::OUString sInitials( getInitials( sAuthor ) );
+            util::DateTime aDateTime( xAnnotation->getDateTime() );
+
+            Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
+            Time aTime;
+            String aStr( SvxDateTimeField::GetFormatted( aDate, aTime, SVXDATEFORMAT_B, *(SD_MOD()->GetNumberFormatter()), eLanguage ) );
+
+            vcl::PDFNote aNote;
+            String sTitle( xAnnotation->getAuthor() );
+            sTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
+            sTitle += aStr;
+            aNote.Title = sTitle;
+            aNote.Contents = xText->getString();
+            rPDFExtOutDevData.CreateNote( Rectangle( Point( static_cast< long >( aRealPoint2D.X * 100 ),
+                static_cast< long >( aRealPoint2D.Y * 100 ) ), Size( 1000, 1000 ) ), aNote );
+        }
+    }
+    catch( uno::Exception& )
+    {
+    }
+}
+
 void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, SdDrawDocument& rDoc, vcl::PDFExtOutDevData& rPDFExtOutDevData )
 {
     const rtl::OUString sGroup   ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GroupShape" ) );
@@ -1844,7 +1887,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
         for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty )
         {
             if( rxOptions[ nProperty ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) )
-                rxOptions[ nProperty].Value >>= xRenderDevice;
+                rxOptions[ nProperty ].Value >>= xRenderDevice;
             else if ( rxOptions[ nProperty ].Name == OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportNotesPages" ) ) )
             {
                 rxOptions[ nProperty].Value >>= bExportNotesPages;
@@ -1940,6 +1983,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
                             uno::Reference< drawing::XDrawPage > xPage( uno::Reference< drawing::XDrawPage >::query( pPage->getUnoPage() ) );
                             if ( xPage.is() )
                             {
+                                if ( pPDFExtOutDevData->GetIsExportNotes() )
+                                    ImplPDFExportComments( xPage, *pPDFExtOutDevData );
                                 uno::Reference< beans::XPropertySet > xPagePropSet( xPage, uno::UNO_QUERY );
                                 if( xPagePropSet.is() )
                                 {
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 9d301368418c..1bca4450c4bf 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -377,9 +377,10 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG )
             if( !pGraphicFilter->ImportGraphic( aGraphic, aURL ) )
             {
                 sal_Int8    nTempAction = ( aIter == maDropFileVector.begin() ) ? mnAction : 0;
+                const bool bLink = ( ( nTempAction & DND_ACTION_LINK ) != 0 );
                 SdrGrafObj* pGrafObj = InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL );
 
-                if( pGrafObj )
+                if( pGrafObj && bLink )
                     pGrafObj->SetGraphicLink( aCurrentDropFile, String() );
 
                 // return action from first inserted graphic