Attachment 55487 Details for Bug 44635 – sdext/source/presenter/*: remove extraneous vertical whitespace

[patch] sdext/source/presenter/*: remove extraneous vertical whitespace

0001-sdext-source-presenter-remove-extraneous-vertical-wh.patch (text/plain), 287.14 KB, created by Rich Wareham on 2012-01-12 04:15:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Wareham

Created: 2012-01-12 04:15:22 UTC

Size: 287.14 KB

patch

obsolete

>From 996a8155fcd12b67efd7c2f8acbeffc423562ad0 Mon Sep 17 00:00:00 2001
>From: Rich Wareham <rjw57@cam.ac.uk>
>Date: Thu, 12 Jan 2012 12:05:37 +0000
>Subject: [PATCH] sdext/source/presenter/*: remove extraneous vertical
> whitespace
>
>Replace 5 lines of vertical whitespace in sdext/source/presenter/* with
>a single line so that more can be seen on the screen at once.
>
>Fixes bug 44635
>---
> sdext/source/presenter/PresenterAccessibility.cxx  |  365 --------------------
> sdext/source/presenter/PresenterAccessibility.hxx  |    9 -
> sdext/source/presenter/PresenterAnimation.cxx      |   27 --
> sdext/source/presenter/PresenterAnimation.hxx      |    1 -
> sdext/source/presenter/PresenterAnimator.cxx       |   22 --
> .../source/presenter/PresenterBitmapContainer.cxx  |   47 ---
> .../source/presenter/PresenterBitmapContainer.hxx  |    2 -
> sdext/source/presenter/PresenterButton.cxx         |   81 -----
> sdext/source/presenter/PresenterButton.hxx         |    4 -
> sdext/source/presenter/PresenterCanvasHelper.cxx   |   23 --
> sdext/source/presenter/PresenterClock.cxx          |  156 ---------
> sdext/source/presenter/PresenterClock.hxx          |    6 -
> sdext/source/presenter/PresenterComponent.cxx      |   11 -
> sdext/source/presenter/PresenterComponent.hxx      |    1 -
> .../presenter/PresenterConfigurationAccess.cxx     |   46 ---
> sdext/source/presenter/PresenterController.cxx     |  147 --------
> sdext/source/presenter/PresenterController.hxx     |    8 -
> .../presenter/PresenterCurrentSlideObserver.cxx    |    1 -
> .../presenter/PresenterFrameworkObserver.cxx       |   13 -
> .../presenter/PresenterFrameworkObserver.hxx       |    2 -
> sdext/source/presenter/PresenterGeometryHelper.cxx |   53 ---
> sdext/source/presenter/PresenterHelpView.cxx       |   91 -----
> sdext/source/presenter/PresenterHelpView.hxx       |    3 -
> sdext/source/presenter/PresenterHelper.cxx         |    5 -
> sdext/source/presenter/PresenterNotesView.cxx      |   85 -----
> sdext/source/presenter/PresenterNotesView.hxx      |    7 -
> sdext/source/presenter/PresenterPaintManager.cxx   |   16 -
> sdext/source/presenter/PresenterPane.cxx           |   37 --
> sdext/source/presenter/PresenterPane.hxx           |    5 -
> sdext/source/presenter/PresenterPaneBase.cxx       |   78 -----
> sdext/source/presenter/PresenterPaneBase.hxx       |    6 -
> .../presenter/PresenterPaneBorderManager.cxx       |   57 ---
> .../presenter/PresenterPaneBorderManager.hxx       |    8 -
> .../presenter/PresenterPaneBorderPainter.cxx       |   99 ------
> sdext/source/presenter/PresenterPaneContainer.cxx  |   53 ---
> sdext/source/presenter/PresenterPaneContainer.hxx  |    1 -
> sdext/source/presenter/PresenterPaneFactory.cxx    |   31 --
> sdext/source/presenter/PresenterPaneFactory.hxx    |    1 -
> .../source/presenter/PresenterProtocolHandler.cxx  |    9 -
> .../source/presenter/PresenterProtocolHandler.hxx  |    4 -
> sdext/source/presenter/PresenterScreen.cxx         |   91 -----
> sdext/source/presenter/PresenterScreen.hxx         |    7 -
> sdext/source/presenter/PresenterScrollBar.cxx      |  213 ------------
> sdext/source/presenter/PresenterScrollBar.hxx      |   14 -
> sdext/source/presenter/PresenterSlidePreview.cxx   |   51 ---
> sdext/source/presenter/PresenterSlidePreview.hxx   |    5 -
> sdext/source/presenter/PresenterSlideShowView.cxx  |  132 -------
> sdext/source/presenter/PresenterSlideShowView.hxx  |    9 -
> sdext/source/presenter/PresenterSlideSorter.cxx    |  229 ------------
> sdext/source/presenter/PresenterSlideSorter.hxx    |    9 -
> sdext/source/presenter/PresenterSprite.cxx         |    4 -
> sdext/source/presenter/PresenterSpritePane.cxx     |   45 ---
> sdext/source/presenter/PresenterSpritePane.hxx     |    4 -
> sdext/source/presenter/PresenterTextView.cxx       |  144 --------
> sdext/source/presenter/PresenterTextView.hxx       |    7 -
> sdext/source/presenter/PresenterTheme.cxx          |  160 ---------
> sdext/source/presenter/PresenterTimer.cxx          |   80 -----
> sdext/source/presenter/PresenterTimer.hxx          |    6 -
> sdext/source/presenter/PresenterToolBar.cxx        |  222 ------------
> sdext/source/presenter/PresenterToolBar.hxx        |   12 -
> sdext/source/presenter/PresenterUIPainter.cxx      |    1 -
> sdext/source/presenter/PresenterUIPainter.hxx      |    1 -
> sdext/source/presenter/PresenterViewFactory.cxx    |   68 ----
> sdext/source/presenter/PresenterViewFactory.hxx    |    4 -
> sdext/source/presenter/PresenterWindowManager.cxx  |  138 --------
> sdext/source/presenter/PresenterWindowManager.hxx  |    5 -
> 66 files changed, 0 insertions(+), 3282 deletions(-)
>
>diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
>index d96e8cf..dcafc7d 100644
>--- a/sdext/source/presenter/PresenterAccessibility.cxx
>+++ b/sdext/source/presenter/PresenterAccessibility.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterAccessibility.hxx"
> #include "PresenterTextView.hxx"
> #include "PresenterConfigurationAccess.hxx"
>@@ -126,7 +125,6 @@ public:
>         getAccessibleContext (void)
>         throw (cssu::RuntimeException);
> 
>-
>     //-----  XAccessibleContext  ----------------------------------------------
> 
>     virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
>@@ -163,7 +161,6 @@ public:
>         throw (cssu::RuntimeException,
>             cssa::IllegalAccessibleComponentStateException);
> 
>-
>     //-----  XAccessibleComponent  --------------------------------------------
> 
>     virtual sal_Bool SAL_CALL containsPoint (
>@@ -196,7 +193,6 @@ public:
>     virtual sal_Int32 SAL_CALL getBackground (void)
>         throw (cssu::RuntimeException);
> 
>-
>     //-----  XAccessibleEventBroadcaster --------------------------------------
> 
>     virtual void SAL_CALL addEventListener (
>@@ -221,13 +217,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (cssu::RuntimeException);
> 
>-
>     //----- XEventListener ----------------------------------------------------
> 
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (cssu::RuntimeException);
> 
>-
> protected:
>     ::rtl::OUString msName;
>     cssu::Reference<css::awt::XWindow2> mxContentWindow;
>@@ -257,9 +251,6 @@ protected:
>     void ThrowException (const sal_Char* pMessage, const ExceptionType eExceptionType) const;
> };
> 
>-
>-
>-
> //===== AccessibleStateSet ====================================================
> 
> namespace {
>@@ -296,9 +287,6 @@ private:
>     const sal_Int32 mnStateSet;
> };
> 
>-
>-
>-
> //===== AccessibleRelationSet =================================================
> 
> namespace {
>@@ -319,7 +307,6 @@ public:
>         const sal_Int16 nRelationType,
>         const Reference<XInterface>& rxObject);
> 
>-
>     //----- XAccessibleRelationSet --------------------------------------------
> 
>     virtual sal_Int32 SAL_CALL getRelationCount (void)
>@@ -338,9 +325,6 @@ private:
>     ::std::vector<AccessibleRelation> maRelations;
> };
> 
>-
>-
>-
> //===== PresenterAccessibleParagraph ==========================================
> 
> namespace {
>@@ -350,9 +334,6 @@ typedef ::cppu::ImplInheritanceHelper1 <
>     > PresenterAccessibleParagraphInterfaceBase;
> }
> 
>-
>-
>-
> class PresenterAccessible::AccessibleParagraph
>     : public PresenterAccessibleParagraphInterfaceBase
> {
>@@ -366,14 +347,12 @@ public:
> 
>     virtual ~AccessibleParagraph (void);
> 
>-
>     //----- XAccessibleContext ------------------------------------------------
> 
>     virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL
>         getAccessibleRelationSet (void)
>         throw (cssu::RuntimeException);
> 
>-
>     //----- XAccessibleText ---------------------------------------------------
> 
>     virtual sal_Int32 SAL_CALL getCaretPosition (void)
>@@ -444,7 +423,6 @@ public:
>     virtual ::sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex)
>         throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
> 
>-
> protected:
>     virtual awt::Point GetRelativeLocation (void);
>     virtual awt::Size GetSize (void);
>@@ -456,9 +434,6 @@ private:
>     const sal_Int32 mnParagraphIndex;
> };
> 
>-
>-
>-
> //===== AccessibleConsole =====================================================
> 
> class AccessibleConsole
>@@ -486,9 +461,6 @@ public:
>     }
> };
> 
>-
>-
>-
> //===== AccessiblePreview =====================================================
> 
> class AccessiblePreview
>@@ -523,9 +495,6 @@ public:
>     }
> };
> 
>-
>-
>-
> //===== AccessibleNotes =======================================================
> 
> class AccessibleNotes : public PresenterAccessible::AccessibleObject
>@@ -536,7 +505,6 @@ public:
>         const sal_Int16 nRole,
>         const ::rtl::OUString& rsName);
> 
>-
>     static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
>         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
>         const lang::Locale aLocale,
>@@ -561,9 +529,6 @@ private:
>     void HandleTextChange (void);
> };
> 
>-
>-
>-
> //===== AccessibleFocusManager ================================================
> 
> /** A singleton class that makes sure that only one accessibility object in
>@@ -586,9 +551,6 @@ private:
>     AccessibleFocusManager (void);
> };
> 
>-
>-
>-
> //===== PresenterAccessible ===================================================
> 
> PresenterAccessible::PresenterAccessible (
>@@ -614,16 +576,10 @@ PresenterAccessible::PresenterAccessible (
>         mxMainPane->setAccessible(this);
> }
> 
>-
>-
>-
> PresenterAccessible::~PresenterAccessible (void)
> {
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane (void) const
> {
>     PresenterPaneContainer::SharedPaneDescriptor pPreviewPane;
>@@ -646,9 +602,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane
>     return pPreviewPane;
> }
> 
>-
>-
>-
> void PresenterAccessible::UpdateAccessibilityHierarchy (void)
> {
>     if ( ! mpPresenterController.is())
>@@ -699,10 +652,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void)
>             : ::boost::shared_ptr<PresenterTextView>());
> }
> 
>-
>-
>-
>-
> void PresenterAccessible::UpdateAccessibilityHierarchy (
>     const Reference<awt::XWindow>& rxPreviewContentWindow,
>     const Reference<awt::XWindow>& rxPreviewBorderWindow,
>@@ -761,9 +710,6 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
>     }
> }
> 
>-
>-
>-
> void PresenterAccessible::NotifyCurrentSlideChange (
>     const sal_Int32 nCurrentSlideIndex,
>     const sal_Int32 nSlideCount)
>@@ -785,9 +731,6 @@ void PresenterAccessible::NotifyCurrentSlideChange (
>     AccessibleFocusManager::Instance()->FocusObject(mpAccessiblePreview);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::disposing (void)
> {
>     UpdateAccessibilityHierarchy(
>@@ -811,9 +754,6 @@ void SAL_CALL PresenterAccessible::disposing (void)
>     mpAccessibleConsole = NULL;
> }
> 
>-
>-
>-
> //----- XAccessible -----------------------------------------------------------
> 
> Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void)
>@@ -838,10 +778,6 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext
>     return mpAccessibleConsole->getAccessibleContext();
> }
> 
>-
>-
>-
>-
> //----- XFocusListener ----------------------------------------------------
> 
> void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent)
>@@ -857,9 +793,6 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve
>     AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent)
>     throw (cssu::RuntimeException)
> {
>@@ -872,9 +805,6 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent
>     AccessibleFocusManager::Instance()->FocusObject(NULL);
> }
> 
>-
>-
>-
> //----- XEventListener ----------------------------------------------------
> 
> void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEvent)
>@@ -884,9 +814,6 @@ void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEve
>         mxMainWindow = NULL;
> }
> 
>-
>-
>-
> //----- XInitialize -----------------------------------------------------------
> 
> void SAL_CALL PresenterAccessible::initialize (const cssu::Sequence<cssu::Any>& rArguments)
>@@ -900,9 +827,6 @@ void SAL_CALL PresenterAccessible::initialize (const cssu::Sequence<cssu::Any>&
>     }
> }
> 
>-
>-
>-
> //===== PresenterAccessible::AccessibleObject =========================================
> 
> PresenterAccessible::AccessibleObject::AccessibleObject (
>@@ -923,24 +847,15 @@ PresenterAccessible::AccessibleObject::AccessibleObject (
> {
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::LateInitialization (void)
> {
>     AccessibleFocusManager::Instance()->AddFocusableObject(this);
> }
> 
>-
>-
>-
> PresenterAccessible::AccessibleObject::~AccessibleObject (void)
> {
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::SetWindow (
>     const Reference<awt::XWindow>& rxContentWindow,
>     const Reference<awt::XWindow>& rxBorderWindow)
>@@ -966,27 +881,18 @@ void PresenterAccessible::AccessibleObject::SetWindow (
>     }
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::SetAccessibleParent (
>     const Reference<XAccessible>& rxAccessibleParent)
> {
>     mxParentAccessible = rxAccessibleParent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void)
> {
>     AccessibleFocusManager::Instance()->RemoveFocusableObject(this);
>     SetWindow(NULL, NULL);
> }
> 
>-
>-
>-
> //----- XAccessible -------------------------------------------------------
> 
> Reference<XAccessibleContext> SAL_CALL
>@@ -998,9 +904,6 @@ Reference<XAccessibleContext> SAL_CALL
>     return this;
> }
> 
>-
>-
>-
> //-----  XAccessibleContext  ----------------------------------------------
> 
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount (void)
>@@ -1013,9 +916,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun
>     return nChildCount;
> }
> 
>-
>-
>-
> Reference<XAccessible> SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int32 nIndex)
>     throw (lang::IndexOutOfBoundsException, RuntimeException)
>@@ -1028,9 +928,6 @@ Reference<XAccessible> SAL_CALL
>     return Reference<XAccessible>(maChildren[nIndex].get());
> }
> 
>-
>-
>-
> Reference<XAccessible> SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleParent (void)
>     throw (RuntimeException)
>@@ -1040,9 +937,6 @@ Reference<XAccessible> SAL_CALL
>     return mxParentAccessible;
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleIndexInParent (void)
>     throw (RuntimeException)
>@@ -1065,9 +959,6 @@ sal_Int32 SAL_CALL
>     return 0;
> }
> 
>-
>-
>-
> sal_Int16 SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleRole (void)
>     throw (RuntimeException)
>@@ -1077,9 +968,6 @@ sal_Int16 SAL_CALL
>     return mnRole;
> }
> 
>-
>-
>-
> OUString SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleDescription (void)
>     throw (RuntimeException)
>@@ -1089,9 +977,6 @@ OUString SAL_CALL
>     return msName;
> }
> 
>-
>-
>-
> OUString SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleName (void)
>     throw (cssu::RuntimeException)
>@@ -1101,9 +986,6 @@ OUString SAL_CALL
>     return msName;
> }
> 
>-
>-
>-
> Reference<XAccessibleRelationSet> SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleRelationSet (void)
>     throw (RuntimeException)
>@@ -1113,9 +995,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
>     return NULL;
> }
> 
>-
>-
>-
> Reference<XAccessibleStateSet> SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleStateSet (void)
>     throw (RuntimeException)
>@@ -1125,9 +1004,6 @@ Reference<XAccessibleStateSet> SAL_CALL
>     return Reference<XAccessibleStateSet>(new AccessibleStateSet(mnStateSet));
> }
> 
>-
>-
>-
> lang::Locale SAL_CALL
>     PresenterAccessible::AccessibleObject::getLocale (void)
>     throw (RuntimeException,
>@@ -1144,9 +1020,6 @@ lang::Locale SAL_CALL
>     return maLocale;
> }
> 
>-
>-
>-
> //-----  XAccessibleComponent  ------------------------------------------------
> 
> sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
>@@ -1167,9 +1040,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
>         return false;
> }
> 
>-
>-
>-
> Reference<XAccessible> SAL_CALL
>     PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint)
>     throw (RuntimeException)
>@@ -1180,9 +1050,6 @@ Reference<XAccessible> SAL_CALL
>     return Reference<XAccessible>();
> }
> 
>-
>-
>-
> awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void)
>     throw (RuntimeException)
> {
>@@ -1196,9 +1063,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void)
>     return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width, aSize.Height);
> }
> 
>-
>-
>-
> awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void)
>     throw (RuntimeException)
> {
>@@ -1209,9 +1073,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void)
>     return aLocation;
> }
> 
>-
>-
>-
> awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void)
>     throw (RuntimeException)
> {
>@@ -1225,9 +1086,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (
>         aRelativeLocation.Y + aParentLocationOnScreen.Y);
> }
> 
>-
>-
>-
> awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void)
>     throw (RuntimeException)
> {
>@@ -1238,9 +1096,6 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void)
>     return aSize;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void)
>     throw (RuntimeException)
> {
>@@ -1251,9 +1106,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void)
>         mxContentWindow->setFocus();
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void)
>     throw (RuntimeException)
> {
>@@ -1262,9 +1114,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void)
>     return 0x00ffffff;
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
>     throw (RuntimeException)
> {
>@@ -1273,9 +1122,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
>     return 0x00000000;
> }
> 
>-
>-
>-
> //----- XAccessibleEventBroadcaster -------------------------------------------
> 
> void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
>@@ -1298,9 +1144,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
>     const Reference<XAccessibleEventListener>& rxListener)
>     throw (RuntimeException)
>@@ -1314,9 +1157,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
>     }
> }
> 
>-
>-
>-
> //----- XWindowListener ---------------------------------------------------
> 
> void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
>@@ -1328,9 +1168,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
>     FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
>     const css::awt::WindowEvent& rEvent)
>     throw (cssu::RuntimeException)
>@@ -1340,9 +1177,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
>     FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any());
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
>     const css::lang::EventObject& rEvent)
>     throw (cssu::RuntimeException)
>@@ -1351,9 +1185,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
>     UpdateStateSet();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
>     const css::lang::EventObject& rEvent)
>     throw (cssu::RuntimeException)
>@@ -1362,9 +1193,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
>     UpdateStateSet();
> }
> 
>-
>-
>-
> //----- XEventListener --------------------------------------------------------
> 
> void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang::EventObject& rEvent)
>@@ -1381,9 +1209,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang:
>     }
> }
> 
>-
>-
>-
> //----- private ---------------------------------------------------------------
> 
> bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nType) const
>@@ -1407,9 +1232,6 @@ bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nTyp
>     }
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::UpdateStateSet (void)
> {
>     UpdateState(AccessibleStateType::FOCUSABLE, true);
>@@ -1424,9 +1246,6 @@ void PresenterAccessible::AccessibleObject::UpdateStateSet (void)
>     //    UpdateState(AccessibleStateType::ACTIVE, GetWindowState(AccessibleStateType::ACTIVE));
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::UpdateState(
>     const sal_Int16 nState,
>     const bool bValue)
>@@ -1447,9 +1266,6 @@ void PresenterAccessible::AccessibleObject::UpdateState(
>     }
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::AddChild (
>     const ::rtl::Reference<AccessibleObject>& rpChild)
> {
>@@ -1458,9 +1274,6 @@ void PresenterAccessible::AccessibleObject::AddChild (
>     FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any());
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::RemoveChild (
>     const ::rtl::Reference<AccessibleObject>& rpChild)
> {
>@@ -1469,9 +1282,6 @@ void PresenterAccessible::AccessibleObject::RemoveChild (
>     FireAccessibleEvent(AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any());
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused)
> {
>     if (mbIsFocused != bIsFocused)
>@@ -1481,9 +1291,6 @@ void PresenterAccessible::AccessibleObject::SetIsFocused (const bool bIsFocused)
>     }
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUString& rsName)
> {
>     if (msName != rsName)
>@@ -1494,9 +1301,6 @@ void PresenterAccessible::AccessibleObject::SetAccessibleName (const ::rtl::OUSt
>     }
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
>     const sal_Int16 nEventId,
>     const uno::Any& rOldValue,
>@@ -1534,8 +1338,6 @@ void PresenterAccessible::AccessibleObject::FireAccessibleEvent (
>     }
> }
> 
>-
>-
> awt::Point PresenterAccessible::AccessibleObject::GetRelativeLocation (void)
> {
>     awt::Point aLocation;
>@@ -1554,9 +1356,6 @@ awt::Point PresenterAccessible::AccessibleObject::GetRelativeLocation (void)
>     return aLocation;
> }
> 
>-
>-
>-
> awt::Size PresenterAccessible::AccessibleObject::GetSize (void)
> {
>     if (mxContentWindow.is())
>@@ -1568,9 +1367,6 @@ awt::Size PresenterAccessible::AccessibleObject::GetSize (void)
>         return awt::Size();
> }
> 
>-
>-
>-
> awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation (void)
> {
>     Reference<XAccessibleComponent> xParentComponent;
>@@ -1583,17 +1379,11 @@ awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation (voi
>         return awt::Point();
> }
> 
>-
>-
>-
> sal_Bool PresenterAccessible::AccessibleObject::IsDisposed (void) const
> {
>     return (rBHelper.bDisposed || rBHelper.bInDispose);
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::ThrowIfDisposed (void) const
>     throw (lang::DisposedException)
> {
>@@ -1601,9 +1391,6 @@ void PresenterAccessible::AccessibleObject::ThrowIfDisposed (void) const
>         ThrowException("object has already been disposed", ET_Disposed);
> }
> 
>-
>-
>-
> void PresenterAccessible::AccessibleObject::ThrowException (
>     const sal_Char* pMessage,
>     const ExceptionType eExceptionType) const
>@@ -1623,10 +1410,6 @@ void PresenterAccessible::AccessibleObject::ThrowException (
>     }
> }
> 
>-
>-
>-
>-
> //===== AccessibleStateSet ====================================================
> 
> AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet)
>@@ -1635,16 +1418,10 @@ AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet)
> {
> }
> 
>-
>-
>-
> AccessibleStateSet::~AccessibleStateSet (void)
> {
> }
> 
>-
>-
>-
> sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState)
> {
>     if (nState<0 || nState>=sal_Int16(sizeof(sal_uInt32)*8))
>@@ -1655,9 +1432,6 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState)
>     return 1<<nState;
> }
> 
>-
>-
>-
> //----- XAccessibleStateSet ---------------------------------------------------
> 
> sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void)
>@@ -1666,18 +1440,12 @@ sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void)
>     return mnStateSet==0;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL AccessibleStateSet::contains (sal_Int16 nState)
>     throw (cssu::RuntimeException)
> {
>     return (mnStateSet & GetStateMask(nState)) != 0;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int16>& rStateSet)
>     throw (cssu::RuntimeException)
> {
>@@ -1689,9 +1457,6 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int1
>     return sal_True;
> }
> 
>-
>-
>-
> cssu::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void)
>     throw (cssu::RuntimeException)
> {
>@@ -1703,9 +1468,6 @@ cssu::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void)
>     return Sequence<sal_Int16>(&aStates.front(), aStates.size());
> }
> 
>-
>-
>-
> //===== AccessibleRelationSet =================================================
> 
> AccessibleRelationSet::AccessibleRelationSet (void)
>@@ -1714,16 +1476,10 @@ AccessibleRelationSet::AccessibleRelationSet (void)
> {
> }
> 
>-
>-
>-
> AccessibleRelationSet::~AccessibleRelationSet (void)
> {
> }
> 
>-
>-
>-
> void AccessibleRelationSet::AddRelation (
>     const sal_Int16 nRelationType,
>     const Reference<XInterface>& rxObject)
>@@ -1734,9 +1490,6 @@ void AccessibleRelationSet::AddRelation (
>     maRelations.back().TargetSet[0] = rxObject;
> }
> 
>-
>-
>-
> //----- XAccessibleRelationSet ------------------------------------------------
> 
> sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void)
>@@ -1745,9 +1498,6 @@ sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void)
>     return maRelations.size();
> }
> 
>-
>-
>-
> AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex)
>     throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException)
> {
>@@ -1757,9 +1507,6 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex
>         return maRelations[nIndex];
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationType)
>     throw (cssu::RuntimeException)
> {
>@@ -1773,9 +1520,6 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy
>     return sal_False;
> }
> 
>-
>-
>-
> AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType)
>     throw (cssu::RuntimeException)
> {
>@@ -1789,9 +1533,6 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16
>     return AccessibleRelation();
> }
> 
>-
>-
>-
> //===== PresenterAccessible::AccessibleParagraph ==============================
> 
> PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
>@@ -1806,16 +1547,10 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
> {
> }
> 
>-
>-
>-
> PresenterAccessible::AccessibleParagraph::~AccessibleParagraph (void)
> {
> }
> 
>-
>-
>-
> //----- XAccessibleContext ----------------------------------------------------
> 
> Reference<XAccessibleRelationSet> SAL_CALL
>@@ -1846,11 +1581,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
>     return Reference<XAccessibleRelationSet>(pSet.get());
> }
> 
>-
>-
>-
>-
>-
> //----- XAccessibleText -------------------------------------------------------
> 
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (void)
>@@ -1865,9 +1595,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (v
>     return nPosition;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex)
>     throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException)
> {
>@@ -1882,9 +1609,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa
>         return sal_False;
> }
> 
>-
>-
>-
> sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex)
>     throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException)
> {
>@@ -1902,9 +1626,6 @@ sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal
>     }
> }
> 
>-
>-
>-
> Sequence<css::beans::PropertyValue> SAL_CALL
>     PresenterAccessible::AccessibleParagraph::getCharacterAttributes (
>         ::sal_Int32 nIndex,
>@@ -1932,9 +1653,6 @@ Sequence<css::beans::PropertyValue> SAL_CALL
>     return Sequence<css::beans::PropertyValue>();
> }
> 
>-
>-
>-
> awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBounds (
>     sal_Int32 nIndex)
>     throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException)
>@@ -1963,9 +1681,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo
>     return aCharacterBox;
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (void)
>     throw (cssu::RuntimeException)
> {
>@@ -1978,9 +1693,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (
>     return nCount;
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
>     const css::awt::Point& rPoint)
>     throw (cssu::RuntimeException)
>@@ -1994,9 +1706,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
>     return nIndex;
> }
> 
>-
>-
>-
> ::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void)
>     throw (cssu::RuntimeException)
> {
>@@ -2005,9 +1714,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
>     return getTextRange(getSelectionStart(), getSelectionEnd());
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (void)
>     throw (cssu::RuntimeException)
> {
>@@ -2016,9 +1722,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (
>     return getCaretPosition();
> }
> 
>-
>-
>-
> sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (void)
>     throw (cssu::RuntimeException)
> {
>@@ -2027,9 +1730,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (vo
>     return getCaretPosition();
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
>     sal_Int32 nStartIndex,
>     sal_Int32 nEndIndex)
>@@ -2041,9 +1741,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
>     return setCaretPosition(nStartIndex);
> }
> 
>-
>-
>-
> ::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void)
>     throw (cssu::RuntimeException)
> {
>@@ -2056,9 +1753,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
>     return sText;
> }
> 
>-
>-
>-
> ::rtl::OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange (
>     sal_Int32 nLocalStartIndex,
>     sal_Int32 nLocalEndIndex)
>@@ -2077,9 +1771,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
>     return sText;
> }
> 
>-
>-
>-
> TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
>     sal_Int32 nLocalCharacterIndex,
>     sal_Int16 nTextType)
>@@ -2096,9 +1787,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
>     return aSegment;
> }
> 
>-
>-
>-
> TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeIndex (
>     sal_Int32 nLocalCharacterIndex,
>     sal_Int16 nTextType)
>@@ -2115,9 +1803,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeInde
>     return aSegment;
> }
> 
>-
>-
>-
> TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindIndex (
>     sal_Int32 nLocalCharacterIndex,
>     sal_Int16 nTextType)
>@@ -2134,9 +1819,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde
>     return aSegment;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText (
>     sal_Int32 nStartIndex,
>     sal_Int32 nEndIndex)
>@@ -2152,9 +1834,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText (
>     return sal_False;
> }
> 
>-
>-
>-
> //----- protected -------------------------------------------------------------
> 
> awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void)
>@@ -2170,9 +1849,6 @@ awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void)
>     return aLocation;
> }
> 
>-
>-
>-
> awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void)
> {
>     if (mpParagraph)
>@@ -2181,9 +1857,6 @@ awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void)
>         return AccessibleObject::GetSize();
> }
> 
>-
>-
>-
> awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation (void)
> {
>     if (mxParentAccessible.is())
>@@ -2202,9 +1875,6 @@ awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation (
>     return awt::Point();
> }
> 
>-
>-
>-
> bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 nType) const
> {
>     switch (nType)
>@@ -2220,11 +1890,6 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n
>     }
> }
> 
>-
>-
>-
>-
>-
> //===== AccessibleNotes =======================================================
> 
> AccessibleNotes::AccessibleNotes (
>@@ -2236,9 +1901,6 @@ AccessibleNotes::AccessibleNotes (
> {
> }
> 
>-
>-
>-
> rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
>     const css::uno::Reference<css::uno::XComponentContext>& rxContext,
>     const lang::Locale aLocale,
>@@ -2269,9 +1931,6 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
>     return rtl::Reference<PresenterAccessible::AccessibleObject>(pObject.get());
> }
> 
>-
>-
>-
> void AccessibleNotes::SetTextView (
>     const ::boost::shared_ptr<PresenterTextView>& rpTextView)
> {
>@@ -2334,9 +1993,6 @@ void AccessibleNotes::SetTextView (
>     }
> }
> 
>-
>-
>-
> void AccessibleNotes::SetWindow (
>     const cssu::Reference<css::awt::XWindow>& rxContentWindow,
>     const cssu::Reference<css::awt::XWindow>& rxBorderWindow)
>@@ -2355,9 +2011,6 @@ void AccessibleNotes::SetWindow (
>     }
> }
> 
>-
>-
>-
> void AccessibleNotes::NotifyCaretChange (
>     const sal_Int32 nOldParagraphIndex,
>     const sal_Int32 nOldCharacterIndex,
>@@ -2399,17 +2052,11 @@ void AccessibleNotes::NotifyCaretChange (
>     }
> }
> 
>-
>-
>-
> void AccessibleNotes::HandleTextChange (void)
> {
>     SetTextView(mpTextView);
> }
> 
>-
>-
>-
> //===== AccessibleFocusManager ================================================
> 
> ::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance;
>@@ -2423,17 +2070,11 @@ void AccessibleNotes::HandleTextChange (void)
>     return mpInstance;
> }
> 
>-
>-
>-
> AccessibleFocusManager::AccessibleFocusManager (void)
>     : maFocusableObjects()
> {
> }
> 
>-
>-
>-
> void AccessibleFocusManager::AddFocusableObject (
>     const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
> {
>@@ -2443,9 +2084,6 @@ void AccessibleFocusManager::AddFocusableObject (
>     maFocusableObjects.push_back(rpObject);
> }
> 
>-
>-
>-
> void AccessibleFocusManager::RemoveFocusableObject (
>     const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
> {
>@@ -2460,9 +2098,6 @@ void AccessibleFocusManager::RemoveFocusableObject (
>     }
> }
> 
>-
>-
>-
> void AccessibleFocusManager::FocusObject (
>     const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject)
> {
>diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
>index 9868db5..4eb7c3d 100644
>--- a/sdext/source/presenter/PresenterAccessibility.hxx
>+++ b/sdext/source/presenter/PresenterAccessibility.hxx
>@@ -52,7 +52,6 @@ namespace css = ::com::sun::star;
> namespace cssu = ::com::sun::star::uno;
> namespace cssa = ::com::sun::star::accessibility;
> 
>-
> namespace sdext { namespace presenter {
> 
> class PresenterController;
>@@ -87,14 +86,12 @@ public:
> 
>     virtual void SAL_CALL disposing (void);
> 
>-
>     //----- XAccessible -------------------------------------------------------
> 
>     virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL
>         getAccessibleContext (void)
>         throw (cssu::RuntimeException);
> 
>-
>     //----- XFocusListener ----------------------------------------------------
> 
>     virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
>@@ -103,19 +100,16 @@ public:
>     virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
>         throw (cssu::RuntimeException);
> 
>-
>     //----- XEventListener ----------------------------------------------------
> 
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (cssu::RuntimeException);
> 
>-
>     //----- XInitialization ---------------------------------------------------
> 
>     virtual void SAL_CALL initialize (const cssu::Sequence<cssu::Any>& rArguments)
>         throw (cssu::RuntimeException);
> 
>-
>     class AccessibleObject;
>     class AccessibleParagraph;
> 
>@@ -144,9 +138,6 @@ private:
>     PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane (void) const;
> };
> 
>-
>-
>-
> } } // end of namespace ::sd::presenter
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx
>index 8f274ea..cacf98d 100644
>--- a/sdext/source/presenter/PresenterAnimation.cxx
>+++ b/sdext/source/presenter/PresenterAnimation.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterAnimation.hxx"
> 
> #include <osl/time.h>
>@@ -42,9 +41,6 @@ sal_uInt64 GetCurrentTime (void)
>         return 0;
> }
> 
>-
>-
>-
> PresenterAnimation::PresenterAnimation (
>     const sal_uInt64 nStartDelay,
>     const sal_uInt64 nTotalDuration,
>@@ -57,40 +53,25 @@ PresenterAnimation::PresenterAnimation (
> {
> }
> 
>-
>-
>-
> PresenterAnimation::~PresenterAnimation (void)
> {
> }
> 
>-
>-
>-
> sal_uInt64 PresenterAnimation::GetStartTime (void)
> {
>     return mnStartTime;
> }
> 
>-
>-
>-
> sal_uInt64 PresenterAnimation::GetEndTime (void)
> {
>     return mnStartTime + mnTotalDuration;
> }
> 
>-
>-
>-
> sal_uInt64 PresenterAnimation::GetStepDuration (void)
> {
>     return mnStepDuration;
> }
> 
>-
>-
>-
> void PresenterAnimation::AddEndCallback (const Callback& rCallback)
> {
>     if (mpEndCallbacks.get() == NULL)
>@@ -98,8 +79,6 @@ void PresenterAnimation::AddEndCallback (const Callback& rCallback)
>     mpEndCallbacks->push_back(rCallback);
> }
> 
>-
>-
> void PresenterAnimation::RunStartCallbacks (void)
> {
>     if (mpStartCallbacks.get() != NULL)
>@@ -110,9 +89,6 @@ void PresenterAnimation::RunStartCallbacks (void)
>     }
> }
> 
>-
>-
>-
> void PresenterAnimation::RunEndCallbacks (void)
> {
>     if (mpEndCallbacks.get() != NULL)
>@@ -123,9 +99,6 @@ void PresenterAnimation::RunEndCallbacks (void)
>     }
> }
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx
>index 20819b5..fdd8de6 100644
>--- a/sdext/source/presenter/PresenterAnimation.hxx
>+++ b/sdext/source/presenter/PresenterAnimation.hxx
>@@ -120,7 +120,6 @@ inline sal_uInt32 GetNanoSeconds (const sal_uInt64 nTime) { return sal_uInt32((n
> 
> typedef ::boost::shared_ptr<PresenterAnimation> SharedPresenterAnimation;
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx
>index dbb07dc..55c9fd5 100644
>--- a/sdext/source/presenter/PresenterAnimator.cxx
>+++ b/sdext/source/presenter/PresenterAnimator.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterAnimator.hxx"
> 
> #include "PresenterTimer.hxx"
>@@ -38,8 +37,6 @@
> 
> namespace sdext { namespace presenter {
> 
>-
>-
> //===== PresenterAnimator =====================================================
> 
> PresenterAnimator::PresenterAnimator (void)
>@@ -50,18 +47,11 @@ PresenterAnimator::PresenterAnimator (void)
> {
> }
> 
>-
>-
>-
> PresenterAnimator::~PresenterAnimator (void)
> {
>     PresenterTimer::CancelTask(mnCurrentTaskId);
> }
> 
>-
>-
>-
>-
> void PresenterAnimator::AddAnimation (const SharedPresenterAnimation& rpAnimation)
> {
>     ::osl::MutexGuard aGuard (m_aMutex);
>@@ -70,9 +60,6 @@ void PresenterAnimator::AddAnimation (const SharedPresenterAnimation& rpAnimatio
>     ScheduleNextRun();
> }
> 
>-
>-
>-
> void PresenterAnimator::Process (void)
> {
>     ::osl::MutexGuard aGuard (m_aMutex);
>@@ -116,9 +103,6 @@ void PresenterAnimator::Process (void)
>     ScheduleNextRun();
> }
> 
>-
>-
>-
> void PresenterAnimator::ActivateAnimations (const sal_uInt64 nCurrentTime)
> {
>     while ( ! maFutureAnimations.empty()
>@@ -131,9 +115,6 @@ void PresenterAnimator::ActivateAnimations (const sal_uInt64 nCurrentTime)
>     }
> }
> 
>-
>-
>-
> void PresenterAnimator::ScheduleNextRun (void)
> {
>     sal_uInt64 nStartTime (0);
>@@ -152,9 +133,6 @@ void PresenterAnimator::ScheduleNextRun (void)
>         ScheduleNextRun(nStartTime);
> }
> 
>-
>-
>-
> void PresenterAnimator::ScheduleNextRun (const sal_uInt64 nStartTime)
> {
>     if (mnNextTime==0 || nStartTime<mnNextTime)
>diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
>index 9661065..e4267c3 100644
>--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
>+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterBitmapContainer.hxx"
> #include "PresenterComponent.hxx"
> #include "PresenterConfigurationAccess.hxx"
>@@ -46,7 +45,6 @@ using ::rtl::OUString;
> 
> #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
> 
>-
> namespace sdext { namespace presenter {
> 
> namespace {
>@@ -94,10 +92,6 @@ PresenterBitmapContainer::PresenterBitmapContainer (
>     LoadBitmaps(xBitmapList);
> }
> 
>-
>-
>-
>-
> PresenterBitmapContainer::PresenterBitmapContainer (
>     const css::uno::Reference<css::container::XNameAccess>& rxRootNode,
>     const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
>@@ -116,9 +110,6 @@ PresenterBitmapContainer::PresenterBitmapContainer (
>     LoadBitmaps(rxRootNode);
> }
> 
>-
>-
>-
> void PresenterBitmapContainer::Initialize (
>     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext)
> {
>@@ -138,17 +129,11 @@ void PresenterBitmapContainer::Initialize (
>     }
> }
> 
>-
>-
>-
> PresenterBitmapContainer::~PresenterBitmapContainer (void)
> {
>     maIconContainer.clear();
> }
> 
>-
>-
>-
> SharedBitmapDescriptor PresenterBitmapContainer::GetBitmap (
>     const OUString& rsName) const
> {
>@@ -161,9 +146,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::GetBitmap (
>         return SharedBitmapDescriptor();
> }
> 
>-
>-
>-
> void PresenterBitmapContainer::LoadBitmaps (
>     const css::uno::Reference<css::container::XNameAccess>& rxBitmapList)
> {
>@@ -189,9 +171,6 @@ void PresenterBitmapContainer::LoadBitmaps (
>     }
> }
> 
>-
>-
>-
> SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
>     const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
>     const ::rtl::OUString& rsPath,
>@@ -226,9 +205,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
>     return pBitmap;
> }
> 
>-
>-
>-
> void PresenterBitmapContainer::ProcessBitmap (
>     const OUString& rsKey,
>     const Reference<beans::XPropertySet>& rxProperties)
>@@ -245,9 +221,6 @@ void PresenterBitmapContainer::ProcessBitmap (
>         SharedBitmapDescriptor());
> }
> 
>-
>-
>-
> SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
>     const Reference<beans::XPropertySet>& rxProperties,
>     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
>@@ -312,7 +285,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
>         catch (Exception&)
>         {}
> 
>-
>     PresenterConfigurationAccess::GetProperty(rxProperties, gsXOffsetProperty) >>= pBitmap->mnXOffset;
>     PresenterConfigurationAccess::GetProperty(rxProperties, gsYOffsetProperty) >>= pBitmap->mnYOffset;
> 
>@@ -330,9 +302,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
>     return pBitmap;
> }
> 
>-
>-
>-
> PresenterBitmapContainer::BitmapDescriptor::TexturingMode
>     PresenterBitmapContainer::StringToTexturingMode (const OUString& rsTexturingMode)
> {
>@@ -346,9 +315,6 @@ PresenterBitmapContainer::BitmapDescriptor::TexturingMode
>         return PresenterBitmapContainer::BitmapDescriptor::Once;
> }
> 
>-
>-
>-
> //===== PresenterBitmapContainer::BitmapSet ===================================
> 
> PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void)
>@@ -369,9 +335,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void)
> {
> }
> 
>-
>-
>-
> PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (
>     const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault)
>     : mnWidth(0),
>@@ -408,16 +371,12 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (
>     }
> }
> 
>-
> css::uno::Reference<css::rendering::XBitmap>
>     PresenterBitmapContainer::BitmapDescriptor::GetNormalBitmap (void) const
> {
>     return mxNormalBitmap;
> }
> 
>-
>-
>-
> css::uno::Reference<css::rendering::XBitmap>
>     PresenterBitmapContainer::BitmapDescriptor::GetBitmap (
>         const Mode eMode,
>@@ -452,9 +411,6 @@ css::uno::Reference<css::rendering::XBitmap>
>     }
> }
> 
>-
>-
>-
> void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
>     const Mode eMode,
>     const css::uno::Reference<css::rendering::XBitmap>& rxBitmap)
>@@ -490,9 +446,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
>     }
> }
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
>index 5008999..5402e40 100644
>--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
>+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
>@@ -45,7 +45,6 @@
> 
> namespace css = ::com::sun::star;
> 
>-
> namespace sdext { namespace presenter {
> 
> /** Manage a set of bitmap groups as they are used for buttons: three
>@@ -157,7 +156,6 @@ private:
>         StringToTexturingMode (const ::rtl::OUString& rsTexturingMode);
> };
> 
>-
> typedef PresenterBitmapContainer::BitmapDescriptor PresenterBitmapDescriptor;
> typedef ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> SharedBitmapDescriptor;
> 
>diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
>index 7a578d6..64649b4 100644
>--- a/sdext/source/presenter/PresenterButton.cxx
>+++ b/sdext/source/presenter/PresenterButton.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterButton.hxx"
> #include "PresenterCanvasHelper.hxx"
> #include "PresenterController.hxx"
>@@ -51,8 +50,6 @@ namespace sdext { namespace presenter {
> const static double gnHorizontalBorder (15);
> const static double gnVerticalBorder (5);
> 
>-
>-
> ::rtl::Reference<PresenterButton> PresenterButton::Create (
>     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
>     const ::rtl::Reference<PresenterController>& rpPresenterController,
>@@ -96,9 +93,6 @@ const static double gnVerticalBorder (5);
>         return NULL;
> }
> 
>-
>-
>-
> PresenterButton::PresenterButton (
>     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
>     const ::rtl::Reference<PresenterController>& rpPresenterController,
>@@ -161,16 +155,10 @@ PresenterButton::PresenterButton (
>     }
> }
> 
>-
>-
>-
> PresenterButton::~PresenterButton (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::disposing (void)
> {
>     if (mxCanvas.is())
>@@ -194,9 +182,6 @@ void SAL_CALL PresenterButton::disposing (void)
>     }
> }
> 
>-
>-
>-
> void PresenterButton::SetCenter (const css::geometry::RealPoint2D& rLocation)
> {
>     if (mxCanvas.is())
>@@ -220,9 +205,6 @@ void PresenterButton::SetCenter (const css::geometry::RealPoint2D& rLocation)
>     }
> }
> 
>-
>-
>-
> void PresenterButton::SetCanvas (
>     const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas,
>     const css::uno::Reference<css::awt::XWindow>& rxParentWindow)
>@@ -251,9 +233,6 @@ void PresenterButton::SetCanvas (
>     }
> }
> 
>-
>-
>-
> css::geometry::IntegerSize2D PresenterButton::GetSize (void)
> {
>     if (maButtonSize.Width < 0)
>@@ -261,9 +240,6 @@ css::geometry::IntegerSize2D PresenterButton::GetSize (void)
>     return maButtonSize;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent)
>@@ -273,10 +249,6 @@ void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEven
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -284,9 +256,6 @@ void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -294,9 +263,6 @@ void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -304,9 +270,6 @@ void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEven
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
>@@ -340,9 +303,6 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -354,9 +314,6 @@ void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
>     meState = PresenterBitmapDescriptor::ButtonDown;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -373,9 +330,6 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -385,9 +339,6 @@ void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent)
>     Invalidate();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -397,10 +348,6 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
>     Invalidate();
> }
> 
>-
>-
>-
>-
> //----- XMouseMotionListener --------------------------------------------------
> 
> void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -410,9 +357,6 @@ void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -420,9 +364,6 @@ void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
>@@ -432,9 +373,6 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
>         mxWindow = NULL;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void)
>@@ -451,9 +389,6 @@ css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void)
>         sal_Int32(0.5 + aTextSize.Height + 2*gnVerticalBorder));
> }
> 
>-
>-
>-
> void PresenterButton::RenderButton (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const geometry::IntegerSize2D& rSize,
>@@ -498,17 +433,11 @@ void PresenterButton::RenderButton (
>         rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
> }
> 
>-
>-
>-
> void PresenterButton::Invalidate (void)
> {
>     mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
> }
> 
>-
>-
>-
> Reference<rendering::XBitmap> PresenterButton::GetBitmap (
>     const SharedBitmapDescriptor& mpIcon,
>     const PresenterBitmapDescriptor::Mode eMode)
>@@ -522,9 +451,6 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap (
>     }
> }
> 
>-
>-
>-
> void PresenterButton::SetupButtonBitmaps (void)
> {
>     if ( ! mxCanvas.is())
>@@ -569,9 +495,6 @@ void PresenterButton::SetupButtonBitmaps (void)
>             pRightBitmap);
> }
> 
>-
>-
>-
> Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
>     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
>     const OUString& rsConfgurationName)
>@@ -592,9 +515,6 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
>         UNO_QUERY);
> }
> 
>-
>-
>-
> void PresenterButton::ThrowIfDisposed (void) const
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -607,7 +527,6 @@ void PresenterButton::ThrowIfDisposed (void) const
>     }
> }
> 
>-
> } } // end of namespace sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
>index b952a9b..e1f281e 100644
>--- a/sdext/source/presenter/PresenterButton.hxx
>+++ b/sdext/source/presenter/PresenterButton.hxx
>@@ -99,13 +99,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -120,7 +118,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw(css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -129,7 +126,6 @@ public:
>     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
>diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
>index ffc1d99..0bf9ceb 100644
>--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
>+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterCanvasHelper.hxx"
> 
> #include "PresenterController.hxx"
>@@ -136,9 +135,6 @@ void PresenterCanvasHelper::PaintRectangle (
>     }
> }
> 
>-
>-
>-
> void PresenterCanvasHelper::PaintTiledBitmap (
>     const css::uno::Reference<css::rendering::XBitmap>& rxTexture,
>     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
>@@ -164,7 +160,6 @@ void PresenterCanvasHelper::PaintTiledBitmap (
>     // set.
>     rendering::RenderState aRenderState (rDefaultRenderState);
> 
>-
>     // Tile the bitmap over the repaint box.
>     const geometry::IntegerSize2D aBitmapSize (rxTexture->getSize());
>     const sal_Int32 nLeft = (rRepaintBox.X / aBitmapSize.Width) * aBitmapSize.Width;
>@@ -192,9 +187,6 @@ void PresenterCanvasHelper::PaintTiledBitmap (
>         }
> }
> 
>-
>-
>-
> void PresenterCanvasHelper::PaintBitmap (
>     const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
>     const awt::Point& rLocation,
>@@ -217,7 +209,6 @@ void PresenterCanvasHelper::PaintBitmap (
>     rendering::ViewState aViewState (rDefaultViewState);
>     aViewState.Clip = PresenterGeometryHelper::CreatePolygon(rRepaintBox, rxCanvas->getDevice());
> 
>-
>     // Setup the rendering state so that the bitmap is painted top left in
>     // the polygon bounding box.
>     rendering::RenderState aRenderState (rDefaultRenderState);
>@@ -230,9 +221,6 @@ void PresenterCanvasHelper::PaintBitmap (
>         aRenderState);
> }
> 
>-
>-
>-
> void PresenterCanvasHelper::PaintColor (
>     const css::util::Color nColor,
>     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
>@@ -251,7 +239,6 @@ void PresenterCanvasHelper::PaintColor (
>     rendering::ViewState aViewState (rDefaultViewState);
>     aViewState.Clip = PresenterGeometryHelper::CreatePolygon(rRepaintBox, rxCanvas->getDevice());
> 
>-
>     // Setup the rendering state to use the given color.
>     rendering::RenderState aRenderState (rDefaultRenderState);
>     SetDeviceColor(aRenderState, nColor);
>@@ -262,9 +249,6 @@ void PresenterCanvasHelper::PaintColor (
>         aRenderState);
> }
> 
>-
>-
>-
> void PresenterCanvasHelper::SetDeviceColor(
>     rendering::RenderState& rRenderState,
>     const util::Color aColor)
>@@ -281,9 +265,6 @@ void PresenterCanvasHelper::SetDeviceColor(
>     }
> }
> 
>-
>-
>-
> css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox (
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
>     const ::rtl::OUString& rsText,
>@@ -302,9 +283,6 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox (
>     }
> }
> 
>-
>-
>-
> css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
>     const ::rtl::OUString& rsText,
>@@ -314,7 +292,6 @@ css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
>     return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2 - aTextBBox.Y1);
> }
> 
>-
> } } // end of namespace sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
>index e3fb6b1..f176b8b 100644
>--- a/sdext/source/presenter/PresenterClock.cxx
>+++ b/sdext/source/presenter/PresenterClock.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterClock.hxx"
> #include "PresenterComponent.hxx"
> #include "PresenterConfigurationAccess.hxx"
>@@ -59,7 +58,6 @@ using ::rtl::OUString;
> 
> namespace sdext { namespace presenter {
> 
>-
> /** Wrapper around a library timer.
> */
> class PresenterClock::Timer : public salhelper::Timer
>@@ -77,9 +75,6 @@ private:
>     ::rtl::Reference<PresenterClock> mpClock;
> };
> 
>-
>-
>-
> namespace {
>     bool GetDateTime (oslDateTime& rDateTime);
> 
>@@ -93,9 +88,6 @@ namespace {
>     };
> }
> 
>-
>-
>-
> class PresenterClock::Painter
> {
> public:
>@@ -111,9 +103,6 @@ public:
>     virtual void Resize (const awt::Size& rSize) = 0;
> };
> 
>-
>-
>-
> namespace {
>     class AnalogDefaultPainter : public PresenterClock::Painter
>     {
>@@ -162,7 +151,6 @@ namespace {
>             const rendering::RenderState& rRenderState);
>     };
> 
>-
>     class AnalogBitmapPainter : public PresenterClock::Painter
>     {
>     public:
>@@ -210,7 +198,6 @@ namespace {
>         void ScaleBitmaps (void);
>     };
> 
>-
>     class DigitalDefaultPainter : public PresenterClock::Painter
>     {
>     public:
>@@ -243,12 +230,8 @@ namespace {
>             const bool bIsShowSeconds);
>     };
> 
>-
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== PresenterClock =================================================================
> 
> ::rtl::Reference<PresenterClock> PresenterClock::Create (
>@@ -266,9 +249,6 @@ namespace {
>     return pClock;
> }
> 
>-
>-
>-
> PresenterClock::PresenterClock (
>     const Reference<XComponentContext>& rxContext,
>     const Reference<XResourceId>& rxViewId,
>@@ -328,24 +308,15 @@ PresenterClock::PresenterClock (
>     }
> }
> 
>-
>-
>-
> PresenterClock::~PresenterClock (void)
> {
> }
> 
>-
>-
>-
> void PresenterClock::LateInit (void)
> {
>     mpTimer = new Timer(this);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::disposing (void)
> {
>     if (mpTimer != NULL)
>@@ -363,9 +334,6 @@ void SAL_CALL PresenterClock::disposing (void)
>     mxViewId = NULL;
> }
> 
>-
>-
>-
> void PresenterClock::UpdateTime (void)
> {
>     // Get current time and check whether it is different from last time.
>@@ -387,9 +355,6 @@ void PresenterClock::UpdateTime (void)
>     }
> }
> 
>-
>-
>-
> //-----  lang::XEventListener -------------------------------------------------
> 
> void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
>@@ -403,9 +368,6 @@ void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
>     }
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent)
>@@ -415,9 +377,6 @@ void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent)
>     Paint(rEvent.UpdateRect);
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterClock::windowResized (const awt::WindowEvent& rEvent)
>@@ -427,9 +386,6 @@ void SAL_CALL PresenterClock::windowResized (const awt::WindowEvent& rEvent)
>     mbIsResizePending = true;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -437,9 +393,6 @@ void SAL_CALL PresenterClock::windowMoved (const awt::WindowEvent& rEvent)
>     mbIsResizePending = true;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -447,18 +400,12 @@ void SAL_CALL PresenterClock::windowShown (const lang::EventObject& rEvent)
>     mbIsResizePending = true;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -470,36 +417,24 @@ void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XResourceId -----------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterClock::getResourceId (void)
>@@ -508,18 +443,12 @@ Reference<XResourceId> SAL_CALL PresenterClock::getResourceId (void)
>     return mxViewId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterClock::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return false;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterClock::Resize (void)
>@@ -538,9 +467,6 @@ void PresenterClock::Resize (void)
>     }
> }
> 
>-
>-
>-
> void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
> {
>     if ( ! mxCanvas.is() && mxPane.is())
>@@ -594,9 +520,6 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> void PresenterClock::Clear (const Reference<rendering::XPolyPolygon2D>& rxUpdatePolygon)
> {
>     rendering::RenderState aRenderState = maRenderState;
>@@ -613,9 +536,6 @@ void PresenterClock::Clear (const Reference<rendering::XPolyPolygon2D>& rxUpdate
>             aRenderState);
> }
> 
>-
>-
>-
> void PresenterClock::SetMode (const sal_Int32 nMode)
> {
>     mnMode = nMode % 3;
>@@ -651,9 +571,6 @@ void PresenterClock::SetMode (const sal_Int32 nMode)
>     Resize();
> }
> 
>-
>-
>-
> void PresenterClock::ThrowIfDisposed (void)
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -666,9 +583,6 @@ void PresenterClock::ThrowIfDisposed (void)
>     }
> }
> 
>-
>-
>-
> //===== Timer =================================================================
> 
> PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock)
>@@ -679,18 +593,12 @@ PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock)
>     start();
> }
> 
>-
>-
>-
> PresenterClock::Timer::~Timer (void)
> {
>     if (mpClock.is())
>         Stop();
> }
> 
>-
>-
>-
> void PresenterClock::Timer::Stop (void)
> {
>     mpClock = NULL;
>@@ -698,17 +606,12 @@ void PresenterClock::Timer::Stop (void)
>     release();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterClock::Timer::onShot (void)
> {
>     if (mpClock.get() != NULL)
>         mpClock->UpdateTime();
> }
> 
>-
>-
> namespace {
> 
> //=============================================================================
>@@ -724,9 +627,6 @@ bool GetDateTime (oslDateTime& rDateTime)
>     return false;
> }
> 
>-
>-
>-
> //===== AnalogDefaultPainter ==================================================
> 
> const double AnalogDefaultPainter::mnRelativeHourHandLength = 0.65;
>@@ -747,9 +647,6 @@ AnalogDefaultPainter::AnalogDefaultPainter (void)
> {
> }
> 
>-
>-
>-
> void AnalogDefaultPainter::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState,
>@@ -846,9 +743,6 @@ void AnalogDefaultPainter::Paint (
>     rxCanvas->drawBitmap(mxBitmap,rViewState,aRenderState);
> }
> 
>-
>-
>-
> void AnalogDefaultPainter::PaintAngledLine (
>     const double nAngle,
>     const double nInnerRadius,
>@@ -891,9 +785,6 @@ void AnalogDefaultPainter::PaintAngledLine (
>         aStrokeAttributes);
> }
> 
>-
>-
>-
> void AnalogDefaultPainter::Resize (const awt::Size& rWindowSize)
> {
>     maSize = rWindowSize;
>@@ -902,9 +793,6 @@ void AnalogDefaultPainter::Resize (const awt::Size& rWindowSize)
>     mxBitmap = NULL;
> }
> 
>-
>-
>-
> //===== AnalogBitmapPainter ===================================================
> 
> AnalogBitmapPainter::AnalogBitmapPainter (
>@@ -922,9 +810,6 @@ AnalogBitmapPainter::AnalogBitmapPainter (
> {
> }
> 
>-
>-
>-
> void AnalogBitmapPainter::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState,
>@@ -996,9 +881,6 @@ void AnalogBitmapPainter::Paint (
>     }
> }
> 
>-
>-
>-
> void AnalogBitmapPainter::Resize (const awt::Size& rWindowSize)
> {
>     maCenter = geometry::RealPoint2D(rWindowSize.Width/2.0, rWindowSize.Height/2.0);
>@@ -1008,9 +890,6 @@ void AnalogBitmapPainter::Resize (const awt::Size& rWindowSize)
>     maMinuteHand.mxScaledBitmap = NULL;
> }
> 
>-
>-
>-
> void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& rxCanvas)
> {
>     if (mbThemeLoadingFailed)
>@@ -1045,9 +924,6 @@ void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& r
>     ScaleBitmaps();
> }
> 
>-
>-
>-
> Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme (
>     PresenterConfigurationAccess& rConfiguration)
> {
>@@ -1084,9 +960,6 @@ Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme (
>     return xTheme;
> }
> 
>-
>-
>-
> bool AnalogBitmapPainter::ThemeNameComparator (
>     const OUString& rsKey,
>     const Reference<container::XNameAccess>& rxCandidate,
>@@ -1104,10 +977,6 @@ bool AnalogBitmapPainter::ThemeNameComparator (
>     return false;
> }
> 
>-
>-
>-
>-
> void AnalogBitmapPainter::LoadBitmaps (
>     PresenterConfigurationAccess& rConfiguration,
>     const Reference<container::XNameAccess>& rxClockTheme,
>@@ -1141,7 +1010,6 @@ void AnalogBitmapPainter::LoadBitmaps (
>     if ( ! xBitmapLoader.is())
>         return;
> 
>-
>     // Iterate over all entries in the bitmap list and load the bitmaps.
>     Reference<container::XNameAccess> xBitmaps (
>         rxClockTheme->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmaps"))),
>@@ -1161,9 +1029,6 @@ void AnalogBitmapPainter::LoadBitmaps (
>             xBitmapLoader));
> }
> 
>-
>-
>-
> void AnalogBitmapPainter::LoadBitmap (
>     const OUString& rsKey,
>     const ::std::vector<Any>& rValues,
>@@ -1198,9 +1063,6 @@ void AnalogBitmapPainter::LoadBitmap (
>     }
> }
> 
>-
>-
>-
> void AnalogBitmapPainter::ScaleBitmaps (void)
> {
>     if (mbThemeLoadingFailed)
>@@ -1229,9 +1091,6 @@ void AnalogBitmapPainter::ScaleBitmaps (void)
>     }
> }
> 
>-
>-
>-
> //===== DigitalDefaultPainter =================================================
> 
> DigitalDefaultPainter::DigitalDefaultPainter (
>@@ -1246,16 +1105,10 @@ DigitalDefaultPainter::DigitalDefaultPainter (
> {
> }
> 
>-
>-
>-
> DigitalDefaultPainter::~DigitalDefaultPainter (void)
> {
> }
> 
>-
>-
>-
> void DigitalDefaultPainter::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState,
>@@ -1326,7 +1179,6 @@ void DigitalDefaultPainter::Paint (
>         return;
>     geometry::RealRectangle2D aBox (xLayout->queryTextBounds());
> 
>-
>     rendering::RenderState aRenderState(
>         geometry::AffineMatrix2D(1,0,0, 0,1,0),
>         NULL,
>@@ -1347,9 +1199,6 @@ void DigitalDefaultPainter::Paint (
>         rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
> }
> 
>-
>-
>-
> void DigitalDefaultPainter::Resize (const awt::Size& rSize)
> {
>     if (maWindowSize.Width != rSize.Width || maWindowSize.Height != rSize.Height)
>@@ -1360,9 +1209,6 @@ void DigitalDefaultPainter::Resize (const awt::Size& rSize)
>     }
> }
> 
>-
>-
>-
> void DigitalDefaultPainter::CreateFont (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const bool bIsShowSeconds)
>@@ -1434,10 +1280,8 @@ void DigitalDefaultPainter::CreateFont (
>     }
> }
> 
>-
> } // end of anonymous namespace
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx
>index 3526633..fcf6d1a 100644
>--- a/sdext/source/presenter/PresenterClock.hxx
>+++ b/sdext/source/presenter/PresenterClock.hxx
>@@ -61,7 +61,6 @@ namespace {
> 
> namespace sdext { namespace presenter {
> 
>-
> /** A clock that displays the current time.  This class is work in
>     progress.  Future extensions may include
>     other times like time since presentation started or remaining time.
>@@ -90,20 +89,17 @@ public:
>     */
>     class Painter;
> 
>-
>     // lang::XEventListener
> 
>     virtual void SAL_CALL
>         disposing (const css::lang::EventObject& rEventObject)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -118,7 +114,6 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -133,7 +128,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
>index bef0bfa..b73d617 100644
>--- a/sdext/source/presenter/PresenterComponent.cxx
>+++ b/sdext/source/presenter/PresenterComponent.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterComponent.hxx"
> #include "cppuhelper/factory.hxx"
> #include "cppuhelper/implementationentry.hxx"
>@@ -43,8 +42,6 @@ using namespace cppu;
> using namespace osl;
> using ::rtl::OUString;
> 
>-
>-
> namespace sdext { namespace presenter {
> 
> static OUString gsBasePath;
>@@ -55,9 +52,6 @@ static OUString gsBasePath;
>     return GetBasePath(rxComponentContext, gsExtensionIdentifier);
> }
> 
>-
>-
>-
> ::rtl::OUString PresenterComponent::GetBasePath (
>     const Reference<XComponentContext>& rxComponentContext,
>     const OUString& rsExtensionIdentifier)
>@@ -86,8 +80,6 @@ static OUString gsBasePath;
>     return gsBasePath;
> }
> 
>-
>-
> rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
> 
> static struct ImplementationEntry gServiceEntries[] =
>@@ -107,9 +99,6 @@ static struct ImplementationEntry gServiceEntries[] =
>     { 0, 0, 0, 0, 0, 0 }
> };
> 
>-
>-
>-
> extern "C"
> {
>     SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
>diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx
>index 4334d53..99568b9 100644
>--- a/sdext/source/presenter/PresenterComponent.hxx
>+++ b/sdext/source/presenter/PresenterComponent.hxx
>@@ -50,7 +50,6 @@ public:
>         const ::rtl::OUString& rsExtensionIdentifier);
> };
> 
>-
> } }
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
>index 6fddb62f..2a32d82 100644
>--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
>+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterConfigurationAccess.hxx"
> 
> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
>@@ -98,24 +97,15 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
>     }
> }
> 
>-
>-
>-
> PresenterConfigurationAccess::~PresenterConfigurationAccess (void)
> {
> }
> 
>-
>-
>-
> bool PresenterConfigurationAccess::IsValid (void) const
> {
>     return mxRoot.is();
> }
> 
>-
>-
>-
> Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToNode)
> {
>     return GetConfigurationNode(
>@@ -123,9 +113,6 @@ Any PresenterConfigurationAccess::GetConfigurationNode (const OUString& sPathToN
>         sPathToNode);
> }
> 
>-
>-
>-
> bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNode)
> {
>     if ( ! IsValid())
>@@ -145,9 +132,6 @@ bool PresenterConfigurationAccess::GoToChild (const ::rtl::OUString& rsPathToNod
>     return false;
> }
> 
>-
>-
>-
> bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate)
> {
>     if ( ! IsValid())
>@@ -161,9 +145,6 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate)
>     return false;
> }
> 
>-
>-
>-
> bool PresenterConfigurationAccess::SetProperty (
>     const ::rtl::OUString& rsPropertyName,
>     const Any& rValue)
>@@ -178,9 +159,6 @@ bool PresenterConfigurationAccess::SetProperty (
>         return false;
> }
> 
>-
>-
>-
> Any PresenterConfigurationAccess::GetConfigurationNode (
>     const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
>     const OUString& sPathToNode)
>@@ -205,9 +183,6 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
>     return Any();
> }
> 
>-
>-
>-
> Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties (
>     const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
>     const ::rtl::OUString& rsPathToNode)
>@@ -215,9 +190,6 @@ Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties (
>     return Reference<beans::XPropertySet>(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY);
> }
> 
>-
>-
>-
> void PresenterConfigurationAccess::CommitChanges (void)
> {
>     Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY);
>@@ -225,9 +197,6 @@ void PresenterConfigurationAccess::CommitChanges (void)
>         xConfiguration->commitChanges();
> }
> 
>-
>-
>-
> void PresenterConfigurationAccess::ForAll (
>     const Reference<container::XNameAccess>& rxContainer,
>     const ::std::vector<OUString>& rArguments,
>@@ -264,9 +233,6 @@ void PresenterConfigurationAccess::ForAll (
>     }
> }
> 
>-
>-
>-
> void PresenterConfigurationAccess::ForAll (
>     const Reference<container::XNameAccess>& rxContainer,
>     const PropertySetProcessor& rProcessor)
>@@ -284,9 +250,6 @@ void PresenterConfigurationAccess::ForAll (
>     }
> }
> 
>-
>-
>-
> Any PresenterConfigurationAccess::Find (
>     const Reference<container::XNameAccess>& rxContainer,
>     const Predicate& rPredicate)
>@@ -307,9 +270,6 @@ Any PresenterConfigurationAccess::Find (
>     return Any();
> }
> 
>-
>-
>-
> bool PresenterConfigurationAccess::IsStringPropertyEqual (
>     const ::rtl::OUString& rsValue,
>     const ::rtl::OUString& rsPropertyName,
>@@ -322,9 +282,6 @@ bool PresenterConfigurationAccess::IsStringPropertyEqual (
>         return false;
> }
> 
>-
>-
>-
> Any PresenterConfigurationAccess::GetProperty (
>     const Reference<beans::XPropertySet>& rxProperties,
>     const OUString& rsKey)
>@@ -346,9 +303,6 @@ Any PresenterConfigurationAccess::GetProperty (
>     return Any();
> }
> 
>-
>-
>-
> } } // end of namespace sdext::tools
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
>index 7d3352c..9629aab 100644
>--- a/sdext/source/presenter/PresenterController.cxx
>+++ b/sdext/source/presenter/PresenterController.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterController.hxx"
> 
> #include "PresenterAccessibility.hxx"
>@@ -80,10 +79,8 @@ namespace {
>     const sal_Int32 ConfigurationUpdateEndEventType = 2;
> }
> 
>-
> #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
> 
>-
> namespace sdext { namespace presenter {
> 
> PresenterController::InstanceContainer PresenterController::maInstances;
>@@ -98,9 +95,6 @@ PresenterController::InstanceContainer PresenterController::maInstances;
>         return ::rtl::Reference<PresenterController>();
> }
> 
>-
>-
>-
> PresenterController::PresenterController (
>     const css::uno::WeakReference<css::lang::XEventListener> &rxScreen,
>     const Reference<XComponentContext>& rxContext,
>@@ -211,16 +205,10 @@ PresenterController::PresenterController (
>     }
> }
> 
>-
>-
>-
> PresenterController::~PresenterController (void)
> {
> }
> 
>-
>-
>-
> void PresenterController::disposing (void)
> {
>     maInstances.erase(mxController->getFrame());
>@@ -284,9 +272,6 @@ void PresenterController::disposing (void)
>     }
> }
> 
>-
>-
>-
> void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset)
> {
>     GetSlides(nOffset);
>@@ -304,9 +289,6 @@ void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset)
>     }
> }
> 
>-
>-
>-
> void PresenterController::GetSlides (const sal_Int32 nOffset)
> {
>     if ( ! mxSlideShowController.is())
>@@ -356,9 +338,6 @@ void PresenterController::GetSlides (const sal_Int32 nOffset)
>     }
> }
> 
>-
>-
>-
> void PresenterController::UpdatePaneTitles (void)
> {
>     if ( ! mxSlideShowController.is())
>@@ -455,9 +434,6 @@ void PresenterController::UpdatePaneTitles (void)
>     }
> }
> 
>-
>-
>-
> void PresenterController::UpdateViews (void)
> {
>     // Tell all views about the slides they should display.
>@@ -470,9 +446,6 @@ void PresenterController::UpdateViews (void)
>     }
> }
> 
>-
>-
>-
> SharedBitmapDescriptor
>     PresenterController::GetViewBackground (const ::rtl::OUString& rsViewURL) const
> {
>@@ -484,9 +457,6 @@ SharedBitmapDescriptor
>     return SharedBitmapDescriptor();
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor
>     PresenterController::GetViewFont (const ::rtl::OUString& rsViewURL) const
> {
>@@ -498,81 +468,52 @@ PresenterTheme::SharedFontDescriptor
>     return PresenterTheme::SharedFontDescriptor();
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme (void) const
> {
>     return mpTheme;
> }
> 
>-
>-
>-
> ::rtl::Reference<PresenterWindowManager> PresenterController::GetWindowManager (void) const
> {
>     return mpWindowManager;
> }
> 
>-
>-
>-
> Reference<presentation::XSlideShowController>
>     PresenterController::GetSlideShowController(void) const
> {
>     return mxSlideShowController;
> }
> 
>-
>-
>-
> rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer (void) const
> {
>     return mpPaneContainer;
> }
> 
>-
>-
>-
> ::rtl::Reference<PresenterPaneBorderPainter> PresenterController::GetPaneBorderPainter (void) const
> {
>     return mpPaneBorderPainter;
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterAnimator> PresenterController::GetAnimator (void) const
> {
>     return mpAnimator;
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper (void) const
> {
>     return mpCanvasHelper;
> }
> 
>-
>-
>-
> Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper (void) const
> {
>     return mxPresenterHelper;
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager (void) const
> {
>     return mpPaintManager;
> }
> 
>-
>-
> void PresenterController::ShowView (const OUString& rsViewURL)
> {
>     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
>@@ -592,9 +533,6 @@ void PresenterController::ShowView (const OUString& rsViewURL)
>     }
> }
> 
>-
>-
>-
> void PresenterController::HideView (const OUString& rsViewURL)
> {
>     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
>@@ -609,9 +547,6 @@ void PresenterController::HideView (const OUString& rsViewURL)
>     }
> }
> 
>-
>-
>-
> void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const
> {
>     if ( ! mxUrlTransformer.is())
>@@ -628,9 +563,6 @@ void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const
>     xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>());
> }
> 
>-
>-
>-
> Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::URL& rURL) const
> {
>     if ( ! mxController.is())
>@@ -646,9 +578,6 @@ Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::U
>         frame::FrameSearchFlag::SELF);
> }
> 
>-
>-
>-
> util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL) const
> {
>     util::URL aURL;
>@@ -662,26 +591,17 @@ util::URL PresenterController::CreateURLFromString (const ::rtl::OUString& rsURL
>     return aURL;
> }
> 
>-
>-
>-
> Reference<drawing::framework::XConfigurationController>
>     PresenterController::GetConfigurationController (void) const
> {
>     return mxConfigurationController;
> }
> 
>-
>-
>-
> Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide (void) const
> {
>     return mxCurrentSlide;
> }
> 
>-
>-
>-
> void PresenterController::SetAccessibilityActiveState (const bool bIsActive)
> {
>     if ( mbIsAccessibilityActive != bIsActive)
>@@ -691,17 +611,11 @@ void PresenterController::SetAccessibilityActiveState (const bool bIsActive)
>     }
> }
> 
>-
>-
>-
> bool PresenterController::IsAccessibilityActive (void) const
> {
>     return mbIsAccessibilityActive;
> }
> 
>-
>-
>-
> void PresenterController::HandleMouseClick (const awt::MouseEvent& rEvent)
> {
>     if (mxSlideShowController.is())
>@@ -726,9 +640,6 @@ void PresenterController::HandleMouseClick (const awt::MouseEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> void PresenterController::RequestViews (
>     const bool bIsSlideSorterActive,
>     const bool bIsNotesViewActive,
>@@ -769,9 +680,6 @@ void PresenterController::RequestViews (
>     }
> }
> 
>-
>-
>-
> //----- XConfigurationChangeListener ------------------------------------------
> 
> void SAL_CALL PresenterController::notifyConfigurationChange (
>@@ -855,9 +763,6 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
>     }
> }
> 
>-
>-
>-
> //----- XEventListener --------------------------------------------------------
> 
> void SAL_CALL PresenterController::disposing (
>@@ -874,9 +779,6 @@ void SAL_CALL PresenterController::disposing (
>         mxMainWindow = NULL;
> }
> 
>-
>-
>-
> //----- XFrameActionListener --------------------------------------------------
> 
> void SAL_CALL PresenterController::frameAction (
>@@ -890,9 +792,6 @@ void SAL_CALL PresenterController::frameAction (
>     }
> }
> 
>-
>-
>-
> //----- XKeyListener ----------------------------------------------------------
> 
> void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent)
>@@ -911,9 +810,6 @@ void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -1070,9 +966,6 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> void PresenterController::HandleNumericKeyPress (
>     const sal_Int32 nKey,
>     const sal_Int32 nModifiers)
>@@ -1113,9 +1006,6 @@ void PresenterController::HandleNumericKeyPress (
>     }
> }
> 
>-
>-
>-
> //----- XFocusListener --------------------------------------------------------
> 
> void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEvent)
>@@ -1124,18 +1014,12 @@ void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEve
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -1146,36 +1030,24 @@ void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEv
>         mxMainWindow->setFocus();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XMouseMotionListener --------------------------------------------------
> 
> void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -1184,18 +1056,12 @@ void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEven
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane)
>@@ -1241,9 +1107,6 @@ void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane)
>     UpdateCurrentSlide(0);
> }
> 
>-
>-
>-
> void PresenterController::LoadTheme (const Reference<XPane>& rxPane)
> {
>     // Create (load) the current theme.
>@@ -1251,9 +1114,6 @@ void PresenterController::LoadTheme (const Reference<XPane>& rxPane)
>         mpTheme.reset(new PresenterTheme(mxComponentContext, OUString(), rxPane->getCanvas()));
> }
> 
>-
>-
>-
> double PresenterController::GetSlideAspectRatio (void) const
> {
>     double nSlideAspectRatio (28.0/21.0);
>@@ -1287,9 +1147,6 @@ double PresenterController::GetSlideAspectRatio (void) const
>     return nSlideAspectRatio;
> }
> 
>-
>-
>-
> void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlideNumber)
> {
>     mnPendingSlideNumber = nPendingSlideNumber;
>@@ -1318,9 +1175,6 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid
>             0));
> }
> 
>-
>-
>-
> void PresenterController::ThrowIfDisposed (void) const
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -1346,7 +1200,6 @@ void PresenterController::SwitchMonitors (void)
>     pScreen->SwitchMonitors();
> }
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
>index c9f1f16..196adb6 100644
>--- a/sdext/source/presenter/PresenterController.hxx
>+++ b/sdext/source/presenter/PresenterController.hxx
>@@ -84,7 +84,6 @@ namespace {
>     > PresenterControllerInterfaceBase;
> }
> 
>-
> /** The controller of the presenter screen is responsible for telling the
>     individual views which slides to show.  Additionally it provides access
>     to frequently used values of the current theme.
>@@ -156,21 +155,18 @@ public:
>         const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XEventListener
> 
>     virtual void SAL_CALL disposing (
>         const com::sun::star::lang::EventObject& rEvent)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XFrameActionListener
> 
>     virtual void SAL_CALL frameAction (
>         const css::frame::FrameActionEvent& rEvent)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XKeyListener
> 
>     virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
>@@ -178,7 +174,6 @@ public:
>     virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XFocusListener
> 
>     virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
>@@ -186,7 +181,6 @@ public:
>     virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -201,7 +195,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -264,7 +257,6 @@ private:
>     void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException);
> };
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
>index 1226fe7..8405d28 100644
>--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
>+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterCurrentSlideObserver.hxx"
> 
> using namespace ::com::sun::star;
>diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
>index babaadf..589e86b 100644
>--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
>+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterFrameworkObserver.hxx"
> #include <com/sun/star/lang/IllegalArgumentException.hpp>
> #include <boost/bind.hpp>
>@@ -74,16 +73,10 @@ PresenterFrameworkObserver::PresenterFrameworkObserver (
>     }
> }
> 
>-
>-
>-
> PresenterFrameworkObserver::~PresenterFrameworkObserver (void)
> {
> }
> 
>-
>-
>-
> void PresenterFrameworkObserver::RunOnUpdateEnd (
>     const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
>     const Action& rAction)
>@@ -119,9 +112,6 @@ void PresenterFrameworkObserver::Shutdown (void)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -136,9 +126,6 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
>     const ConfigurationChangeEvent& rEvent)
>     throw (RuntimeException)
>diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
>index f0062b8..34af9ab 100644
>--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
>+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
>@@ -40,7 +40,6 @@ namespace css = ::com::sun::star;
> 
> namespace sdext { namespace presenter {
> 
>-
> typedef ::cppu::WeakComponentImplHelper1 <
>     ::com::sun::star::drawing::framework::XConfigurationChangeListener
>     > PresenterFrameworkObserverInterfaceBase;
>@@ -99,7 +98,6 @@ private:
>     static bool True (void);
> };
> 
>-
> } }  // end of namespace ::sdext::presenter
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx
>index 02c2887..af75dee 100644
>--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
>+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterGeometryHelper.hxx"
> 
> #include <math.h>
>@@ -57,11 +56,8 @@ sal_Int32 Height (const sal_Int32 nTop, const sal_Int32 nBottom)
>     return nBottom - nTop + 1;
> }
> 
>-
> } // end of anonymous namespace
> 
>-
>-
> namespace sdext { namespace presenter {
> 
> sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
>@@ -69,25 +65,16 @@ sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
>     return sal::static_int_cast<sal_Int32>(floor(nValue));
> }
> 
>-
>-
>-
> sal_Int32 PresenterGeometryHelper::Ceil (const double nValue)
> {
>     return sal::static_int_cast<sal_Int32>(ceil(nValue));
> }
> 
>-
>-
>-
> sal_Int32 PresenterGeometryHelper::Round (const double nValue)
> {
>     return sal::static_int_cast<sal_Int32>(floor(0.5 + nValue));
> }
> 
>-
>-
>-
> awt::Rectangle PresenterGeometryHelper::ConvertRectangle (
>     const geometry::RealRectangle2D& rBox)
> {
>@@ -98,9 +85,6 @@ awt::Rectangle PresenterGeometryHelper::ConvertRectangle (
>     return awt::Rectangle (nLeft,nTop,nRight-nLeft,nBottom-nTop);
> }
> 
>-
>-
>-
> awt::Rectangle PresenterGeometryHelper::ConvertRectangleWithConstantSize (
>     const geometry::RealRectangle2D& rBox)
> {
>@@ -111,9 +95,6 @@ awt::Rectangle PresenterGeometryHelper::ConvertRectangleWithConstantSize (
>         Round(rBox.Y2 - rBox.Y1));
> }
> 
>-
>-
>-
> geometry::RealRectangle2D PresenterGeometryHelper::ConvertRectangle (
>     const css::awt::Rectangle& rBox)
> {
>@@ -124,9 +105,6 @@ geometry::RealRectangle2D PresenterGeometryHelper::ConvertRectangle (
>         rBox.Y + rBox.Height);
> }
> 
>-
>-
>-
> awt::Rectangle PresenterGeometryHelper::TranslateRectangle (
>     const css::awt::Rectangle& rBox,
>     const sal_Int32 nXOffset,
>@@ -135,9 +113,6 @@ awt::Rectangle PresenterGeometryHelper::TranslateRectangle (
>     return awt::Rectangle(rBox.X + nXOffset, rBox.Y + nYOffset, rBox.Width, rBox.Height);
> }
> 
>-
>-
>-
> awt::Rectangle PresenterGeometryHelper::Intersection (
>     const css::awt::Rectangle& rBox1,
>     const css::awt::Rectangle& rBox2)
>@@ -152,9 +127,6 @@ awt::Rectangle PresenterGeometryHelper::Intersection (
>         return awt::Rectangle(nLeft,nTop, Width(nLeft,nRight), Height(nTop,nBottom));
> }
> 
>-
>-
>-
> geometry::RealRectangle2D PresenterGeometryHelper::Intersection (
>     const geometry::RealRectangle2D& rBox1,
>     const geometry::RealRectangle2D& rBox2)
>@@ -169,9 +141,6 @@ geometry::RealRectangle2D PresenterGeometryHelper::Intersection (
>         return geometry::RealRectangle2D(nLeft,nTop, nRight, nBottom);
> }
> 
>-
>-
>-
> bool PresenterGeometryHelper::IsInside (
>     const css::geometry::RealRectangle2D& rBox,
>     const css::geometry::RealPoint2D& rPoint)
>@@ -182,9 +151,6 @@ bool PresenterGeometryHelper::IsInside (
>         && rBox.Y2 >= rPoint.Y;
> }
> 
>-
>-
>-
> bool PresenterGeometryHelper::IsInside (
>     const css::awt::Rectangle& rBox1,
>     const css::awt::Rectangle& rBox2)
>@@ -195,9 +161,6 @@ bool PresenterGeometryHelper::IsInside (
>         && rBox1.Y+rBox1.Height <= rBox2.Y+rBox2.Height;
> }
> 
>-
>-
>-
> awt::Rectangle PresenterGeometryHelper::Union (
>     const css::awt::Rectangle& rBox1,
>     const css::awt::Rectangle& rBox2)
>@@ -217,9 +180,6 @@ awt::Rectangle PresenterGeometryHelper::Union (
>         return awt::Rectangle(nLeft,nTop, Width(nLeft,nRight), Height(nTop,nBottom));
> }
> 
>-
>-
>-
> geometry::RealRectangle2D PresenterGeometryHelper::Union (
>     const geometry::RealRectangle2D& rBox1,
>     const geometry::RealRectangle2D& rBox2)
>@@ -234,9 +194,6 @@ geometry::RealRectangle2D PresenterGeometryHelper::Union (
>         return geometry::RealRectangle2D(nLeft,nTop, nRight, nBottom);
> }
> 
>-
>-
>-
> bool PresenterGeometryHelper::AreRectanglesDisjoint (
>     const css::awt::Rectangle& rBox1,
>     const css::awt::Rectangle& rBox2)
>@@ -247,9 +204,6 @@ bool PresenterGeometryHelper::AreRectanglesDisjoint (
>         || rBox1.Y >= rBox2.Y+rBox2.Height;
> }
> 
>-
>-
>-
> Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
>     const awt::Rectangle& rBox,
>     const Reference<rendering::XGraphicDevice>& rxDevice)
>@@ -272,9 +226,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
>     return xRectangle;
> }
> 
>-
>-
>-
> Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
>     const geometry::RealRectangle2D& rBox,
>     const Reference<rendering::XGraphicDevice>& rxDevice)
>@@ -297,9 +248,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
>     return xRectangle;
> }
> 
>-
>-
>-
> Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
>     const ::std::vector<css::awt::Rectangle>& rBoxes,
>     const Reference<rendering::XGraphicDevice>& rxDevice)
>@@ -329,7 +277,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
>     return xRectangle;
> }
> 
>-
> } }
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
>index 253f39a..c7ca5c4 100644
>--- a/sdext/source/presenter/PresenterHelpView.cxx
>+++ b/sdext/source/presenter/PresenterHelpView.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterHelpView.hxx"
> #include "PresenterButton.hxx"
> #include "PresenterCanvasHelper.hxx"
>@@ -52,7 +51,6 @@ using ::std::vector;
> 
> #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
> 
>-
> namespace sdext { namespace presenter {
> 
> namespace {
>@@ -130,7 +128,6 @@ class PresenterHelpView::TextContainer : public vector<boost::shared_ptr<Block>
> {
> };
> 
>-
> PresenterHelpView::PresenterHelpView (
>     const Reference<uno::XComponentContext>& rxContext,
>     const Reference<XResourceId>& rxViewId,
>@@ -196,16 +193,10 @@ PresenterHelpView::PresenterHelpView (
>     }
> }
> 
>-
>-
>-
> PresenterHelpView::~PresenterHelpView (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterHelpView::disposing (void)
> {
>     mxViewId = NULL;
>@@ -226,9 +217,6 @@ void SAL_CALL PresenterHelpView::disposing (void)
>     }
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObject)
>@@ -245,9 +233,6 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec
>     }
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
>@@ -258,9 +243,6 @@ void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
>     Resize();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent)
>     throw (uno::RuntimeException)
> {
>@@ -268,9 +250,6 @@ void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent)
>     throw (uno::RuntimeException)
> {
>@@ -279,9 +258,6 @@ void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent)
>     Resize();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent)
>     throw (uno::RuntimeException)
> {
>@@ -289,9 +265,6 @@ void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent)
>@@ -300,9 +273,6 @@ void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent
>     Paint(rEvent.UpdateRect);
> }
> 
>-
>-
>-
> void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
> {
>     ProvideCanvas();
>@@ -380,9 +350,6 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> void PresenterHelpView::ReadHelpStrings (void)
> {
>     mpTextContainer.reset(new TextContainer());
>@@ -398,9 +365,6 @@ void PresenterHelpView::ReadHelpStrings (void)
>         ::boost::bind(&PresenterHelpView::ProcessString, this, _2));
> }
> 
>-
>-
>-
> void PresenterHelpView::ProcessString (
>     const Reference<beans::XPropertySet>& rsProperties)
> {
>@@ -418,9 +382,6 @@ void PresenterHelpView::ProcessString (
>             new Block(sLeftText, sRightText, mpFont->mxFont, mnMaximalWidth)));
> }
> 
>-
>-
>-
> void PresenterHelpView::CheckFontSize (void)
> {
>     if (mpFont.get() == NULL)
>@@ -491,9 +452,6 @@ void PresenterHelpView::CheckFontSize (void)
>     }
> }
> 
>-
>-
>-
> //----- XResourceId -----------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void)
>@@ -503,18 +461,12 @@ Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void)
>     return mxViewId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return false;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterHelpView::ProvideCanvas (void)
>@@ -533,9 +485,6 @@ void PresenterHelpView::ProvideCanvas (void)
>     }
> }
> 
>-
>-
>-
> void PresenterHelpView::Resize (void)
> {
>     if (mpCloseButton.get() != NULL && mxWindow.is())
>@@ -555,9 +504,6 @@ void PresenterHelpView::Resize (void)
>     }
> }
> 
>-
>-
>-
> void PresenterHelpView::ThrowIfDisposed (void)
>     throw (lang::DisposedException)
> {
>@@ -570,9 +516,6 @@ void PresenterHelpView::ThrowIfDisposed (void)
>     }
> }
> 
>-
>-
>-
> //===== LineDescritor =========================================================
> 
> namespace {
>@@ -584,9 +527,6 @@ LineDescriptor::LineDescriptor (void)
> {
> }
> 
>-
>-
>-
> void LineDescriptor::AddPart (
>     const OUString& rsLine,
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont)
>@@ -596,17 +536,11 @@ void LineDescriptor::AddPart (
>     CalculateSize(rxFont);
> }
> 
>-
>-
>-
> bool LineDescriptor::IsEmpty (void) const
> {
>     return msLine.isEmpty();
> }
> 
>-
>-
>-
> void LineDescriptor::CalculateSize (
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont)
> {
>@@ -622,9 +556,6 @@ void LineDescriptor::CalculateSize (
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== LineDescriptorList ====================================================
> 
> namespace {
>@@ -638,9 +569,6 @@ LineDescriptorList::LineDescriptorList (
>     Update(rxFont, nMaximalWidth);
> }
> 
>-
>-
>-
> double LineDescriptorList::Paint(
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const geometry::RealRectangle2D& rBBox,
>@@ -678,9 +606,6 @@ double LineDescriptorList::Paint(
>     return nY - rBBox.Y1;
> }
> 
>-
>-
>-
> double LineDescriptorList::GetHeight (void) const
> {
>     double nHeight (0);
>@@ -692,9 +617,6 @@ double LineDescriptorList::GetHeight (void) const
>     return nHeight;
> }
> 
>-
>-
>-
> void LineDescriptorList::Update (
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
>     const sal_Int32 nMaximalWidth)
>@@ -704,9 +626,6 @@ void LineDescriptorList::Update (
>     FormatText(aTextParts, rxFont, nMaximalWidth);
> }
> 
>-
>-
>-
> void LineDescriptorList::SplitText (
>     const OUString& rsText,
>     vector<OUString>& rTextParts)
>@@ -745,9 +664,6 @@ void LineDescriptorList::SplitText (
>         rTextParts.push_back(rsText.copy(nStart, nLength-nStart));
> }
> 
>-
>-
>-
> void LineDescriptorList::FormatText (
>     const vector<OUString>& rTextParts,
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
>@@ -785,12 +701,8 @@ void LineDescriptorList::FormatText (
>     }
> }
> 
>-
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== Block =================================================================
> 
> namespace {
>@@ -805,8 +717,6 @@ Block::Block (
> {
> }
> 
>-
>-
> void Block::Update (
>     const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
>     const sal_Int32 nMaximalWidth)
>@@ -819,5 +729,4 @@ void Block::Update (
> 
> } } // end of namespace ::sdext::presenter
> 
>-
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
>index 2d5e0ef..101d9c9 100644
>--- a/sdext/source/presenter/PresenterHelpView.hxx
>+++ b/sdext/source/presenter/PresenterHelpView.hxx
>@@ -75,7 +75,6 @@ public:
>         disposing (const css::lang::EventObject& rEventObject)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -90,13 +89,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
>index 792ca98..42395cc 100644
>--- a/sdext/source/presenter/PresenterHelper.cxx
>+++ b/sdext/source/presenter/PresenterHelper.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterHelper.hxx"
> 
> #include <com/sun/star/graphic/XGraphicProvider.hpp>
>@@ -65,7 +64,6 @@ const OUString PresenterHelper::msDefaultPaneStyle (
> const OUString PresenterHelper::msDefaultViewStyle (
>     RTL_CONSTASCII_USTRINGPARAM("DefaultViewStyle"));
> 
>-
> Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController (
>     const Reference<frame::XController>& rxController)
> {
>@@ -86,9 +84,6 @@ Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowContr
>     return xSlideShowController;
> }
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
>index 09de8aa..ccdadf1 100644
>--- a/sdext/source/presenter/PresenterNotesView.cxx
>+++ b/sdext/source/presenter/PresenterNotesView.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterNotesView.hxx"
> #include "PresenterButton.hxx"
> #include "PresenterCanvasHelper.hxx"
>@@ -150,16 +149,10 @@ PresenterNotesView::PresenterNotesView (
>     }
> }
> 
>-
>-
>-
> PresenterNotesView::~PresenterNotesView (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterNotesView::disposing (void)
> {
>     if (mxParentWindow.is())
>@@ -205,9 +198,6 @@ void SAL_CALL PresenterNotesView::disposing (void)
>     mxViewId = NULL;
> }
> 
>-
>-
>-
> void PresenterNotesView::CreateToolBar (
>     const css::uno::Reference<css::uno::XComponentContext>& rxContext,
>     const ::rtl::Reference<PresenterController>& rpPresenterController)
>@@ -245,9 +235,6 @@ void PresenterNotesView::CreateToolBar (
>         A2S("PresenterScreenSettings/ToolBars/NotesToolBar"));
> }
> 
>-
>-
>-
> void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage)
> {
>     static const ::rtl::OUString sNotesShapeName (
>@@ -309,9 +296,6 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
>     }
> }
> 
>-
>-
>-
> //-----  lang::XEventListener -------------------------------------------------
> 
> void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObject)
>@@ -321,9 +305,6 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje
>         mxParentWindow = NULL;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent)
>@@ -333,36 +314,24 @@ void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent)
>     Layout();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterNotesView::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterNotesView::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent)
>@@ -377,9 +346,6 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent)
>     Paint(rEvent.UpdateRect);
> }
> 
>-
>-
>-
> //----- XResourceId -----------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId (void)
>@@ -388,18 +354,12 @@ Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId (void)
>     return mxViewId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return false;
> }
> 
>-
>-
>-
> //----- XDrawView -------------------------------------------------------------
> 
> void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
>@@ -420,18 +380,12 @@ void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDraw
>     SetSlide(mxCurrentNotesPage);
> }
> 
>-
>-
>-
> Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage (void)
>     throw (RuntimeException)
> {
>     return NULL;
> }
> 
>-
>-
>-
> //----- XKeyListener ----------------------------------------------------------
> 
> void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent)
>@@ -476,18 +430,12 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterNotesView::Layout (void)
>@@ -570,9 +518,6 @@ void PresenterNotesView::Layout (void)
>     }
> }
> 
>-
>-
>-
> void PresenterNotesView::Paint (const awt::Rectangle& rUpdateBox)
> {
>     if ( ! mxParentWindow.is())
>@@ -597,9 +542,6 @@ void PresenterNotesView::Paint (const awt::Rectangle& rUpdateBox)
>     }
> }
> 
>-
>-
>-
> void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox)
> {
>     awt::Rectangle aWindowBox (mxParentWindow->getPosSize());
>@@ -635,9 +577,6 @@ void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox)
>         aRenderState);
> }
> 
>-
>-
>-
> void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox)
> {
>     const awt::Rectangle aBox (PresenterGeometryHelper::Intersection(rUpdateBox,
>@@ -671,9 +610,6 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox)
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> void PresenterNotesView::Invalidate (void)
> {
>     mpPresenterController->GetPaintManager()->Invalidate(
>@@ -681,9 +617,6 @@ void PresenterNotesView::Invalidate (void)
>         PresenterGeometryHelper::ConvertRectangle(maTextBoundingBox));
> }
> 
>-
>-
>-
> void PresenterNotesView::Scroll (const double rnDistance)
> {
>     try
>@@ -698,9 +631,6 @@ void PresenterNotesView::Scroll (const double rnDistance)
>     {}
> }
> 
>-
>-
>-
> void PresenterNotesView::SetTop (const double nTop)
> {
>     try
>@@ -715,9 +645,6 @@ void PresenterNotesView::SetTop (const double nTop)
>     {}
> }
> 
>-
>-
>-
> void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange)
> {
>     const sal_Int32 nNewSize (mpFont->mnSize + nSizeChange);
>@@ -754,17 +681,11 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange)
>     }
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView (void) const
> {
>     return mpTextView;
> }
> 
>-
>-
>-
> void PresenterNotesView::UpdateScrollBar (void)
> {
>     if (mpScrollBar.get() != NULL)
>@@ -786,9 +707,6 @@ void PresenterNotesView::UpdateScrollBar (void)
>     }
> }
> 
>-
>-
>-
> void PresenterNotesView::ThrowIfDisposed (void)
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -800,9 +718,6 @@ void PresenterNotesView::ThrowIfDisposed (void)
>     }
> }
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
>index 282f864..b051a1b 100644
>--- a/sdext/source/presenter/PresenterNotesView.hxx
>+++ b/sdext/source/presenter/PresenterNotesView.hxx
>@@ -66,7 +66,6 @@ class PresenterButton;
> class PresenterScrollBar;
> class PresenterTextView;
> 
>-
> /** A drawing framework view of the notes of a slide.  At the moment this is
>     a simple text view that does not show the original formatting of the
>     notes text.
>@@ -99,14 +98,12 @@ public:
> 
>     ::boost::shared_ptr<PresenterTextView> GetTextView (void) const;
> 
>-
>     // lang::XEventListener
> 
>     virtual void SAL_CALL
>         disposing (const css::lang::EventObject& rEventObject)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -121,13 +118,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>@@ -136,7 +131,6 @@ public:
>     virtual sal_Bool SAL_CALL isAnchorOnly (void)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XDrawView
> 
>     virtual void SAL_CALL setCurrentPage (
>@@ -146,7 +140,6 @@ public:
>     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XKeyListener
> 
>     virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
>diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx
>index 7f83c4d..5c56071 100644
>--- a/sdext/source/presenter/PresenterPaintManager.cxx
>+++ b/sdext/source/presenter/PresenterPaintManager.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterPaintManager.hxx"
> 
> #include "PresenterPaneContainer.hxx"
>@@ -50,9 +49,6 @@ PresenterPaintManager::PresenterPaintManager (
> {
> }
> 
>-
>-
>-
> ::boost::function<void(const css::awt::Rectangle& rRepaintBox)>
>     PresenterPaintManager::GetInvalidator (
>         const css::uno::Reference<css::awt::XWindow>& rxWindow,
>@@ -69,9 +65,6 @@ PresenterPaintManager::PresenterPaintManager (
>         bSynchronous);
> }
> 
>-
>-
>-
> void PresenterPaintManager::Invalidate (
>     const css::uno::Reference<css::awt::XWindow>& rxWindow,
>     const bool bSynchronous)
>@@ -90,9 +83,6 @@ void PresenterPaintManager::Invalidate (
>     Invalidate(rxWindow, nInvalidateMode);
> }
> 
>-
>-
>-
> void PresenterPaintManager::Invalidate (
>     const css::uno::Reference<css::awt::XWindow>& rxWindow,
>     const sal_Int16 nInvalidateFlags)
>@@ -116,9 +106,6 @@ void PresenterPaintManager::Invalidate (
>     }
> }
> 
>-
>-
>-
> void PresenterPaintManager::Invalidate (
>     const css::uno::Reference<css::awt::XWindow>& rxWindow,
>     const css::awt::Rectangle& rRepaintBox,
>@@ -138,9 +125,6 @@ void PresenterPaintManager::Invalidate (
>     Invalidate(rxWindow, rRepaintBox, nInvalidateMode);
> }
> 
>-
>-
>-
> void PresenterPaintManager::Invalidate (
>     const css::uno::Reference<css::awt::XWindow>& rxWindow,
>     const css::awt::Rectangle& rRepaintBox,
>diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
>index 8266ae2..ca1deab 100644
>--- a/sdext/source/presenter/PresenterPane.cxx
>+++ b/sdext/source/presenter/PresenterPane.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterPane.hxx"
> #include "PresenterController.hxx"
> #include "PresenterPaintManager.hxx"
>@@ -60,16 +59,10 @@ PresenterPane::PresenterPane (
>         UNO_QUERY_THROW);
> }
> 
>-
>-
>-
> PresenterPane::~PresenterPane (void)
> {
> }
> 
>-
>-
>-
> //----- XPane -----------------------------------------------------------------
> 
> Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow (void)
>@@ -79,9 +72,6 @@ Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow (void)
>     return mxContentWindow;
> }
> 
>-
>-
>-
> Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas (void)
>     throw (RuntimeException)
> {
>@@ -89,9 +79,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas (void)
>     return mxContentCanvas;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent)
>@@ -109,10 +96,6 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent)
>     Invalidate(maBoundingBox);
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -127,9 +110,6 @@ void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent)
>     Invalidate(maBoundingBox);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -148,9 +128,6 @@ void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent)
>     Invalidate(maBoundingBox);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -161,9 +138,6 @@ void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent)
>         mxContentWindow->setVisible(sal_False);
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent)
>@@ -175,12 +149,8 @@ void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent)
>     PaintBorder(rEvent.UpdateRect);
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
>-
> void PresenterPane::CreateCanvases (
>     const Reference<awt::XWindow>& rxParentWindow,
>     const Reference<rendering::XSpriteCanvas>& rxParentCanvas)
>@@ -208,9 +178,6 @@ void PresenterPane::CreateCanvases (
>     PaintBorder(mxBorderWindow->getPosSize());
> }
> 
>-
>-
>-
> void PresenterPane::Invalidate (const css::awt::Rectangle& rRepaintBox)
> {
>     // Invalidate the parent window to be able to invalidate an area outside
>@@ -218,9 +185,6 @@ void PresenterPane::Invalidate (const css::awt::Rectangle& rRepaintBox)
>     mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow, rRepaintBox);
> }
> 
>-
>-
>-
> void PresenterPane::UpdateBoundingBox (void)
> {
>     if (mxBorderWindow.is() && IsVisible())
>@@ -229,7 +193,6 @@ void PresenterPane::UpdateBoundingBox (void)
>         maBoundingBox = awt::Rectangle();
> }
> 
>-
> } } // end of namespace ::sd::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
>index 303bb0c..6088760 100644
>--- a/sdext/source/presenter/PresenterPane.hxx
>+++ b/sdext/source/presenter/PresenterPane.hxx
>@@ -45,7 +45,6 @@
> 
> namespace css = ::com::sun::star;
> 
>-
> namespace sdext { namespace presenter {
> 
> /** Pane used by the presenter screen.  Pane objects are stored in the
>@@ -68,7 +67,6 @@ public:
>         const css::uno::Reference<css::uno::XComponentContext>& rxContext)
>         SAL_THROW((css::uno::Exception));
> 
>-
>     // XPane
> 
>     css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
>@@ -77,7 +75,6 @@ public:
>     css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -92,13 +89,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
> private:
>     /** Store the bounding box so that when the window is resized or moved
>         we still know the old position and size.
>diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
>index fa88907..a912230 100644
>--- a/sdext/source/presenter/PresenterPaneBase.cxx
>+++ b/sdext/source/presenter/PresenterPaneBase.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterPaneBase.hxx"
> #include "PresenterCanvasHelper.hxx"
> #include "PresenterController.hxx"
>@@ -74,16 +73,10 @@ PresenterPaneBase::PresenterPaneBase (
>         mxPresenterHelper = mpPresenterController->GetPresenterHelper();
> }
> 
>-
>-
>-
> PresenterPaneBase::~PresenterPaneBase (void)
> {
> }
> 
>-
>-
>-
> void PresenterPaneBase::disposing (void)
> {
>     if (mxBorderWindow.is())
>@@ -123,9 +116,6 @@ void PresenterPaneBase::disposing (void)
>     mxComponentContext = NULL;
> }
> 
>-
>-
>-
> void PresenterPaneBase::SetTitle (const OUString& rsTitle)
> {
>     msTitle = rsTitle;
>@@ -136,26 +126,17 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle)
>     mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow);
> }
> 
>-
>-
>-
> ::rtl::OUString PresenterPaneBase::GetTitle (void) const
> {
>     return msTitle;
> }
> 
>-
>-
>-
> Reference<drawing::framework::XPaneBorderPainter>
>     PresenterPaneBase::GetPaneBorderPainter (void) const
> {
>     return mxBorderPainter;
> }
> 
>-
>-
>-
> void PresenterPaneBase::SetCalloutAnchor (const css::awt::Point& rCalloutAnchor)
> {
>     mbHasCallout = true;
>@@ -185,17 +166,11 @@ void PresenterPaneBase::SetCalloutAnchor (const css::awt::Point& rCalloutAnchor)
>     mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow);
> }
> 
>-
>-
>-
> awt::Point PresenterPaneBase::GetCalloutAnchor (void) const
> {
>     return maCalloutAnchor;
> }
> 
>-
>-
>-
> //----- XInitialization -------------------------------------------------------
> 
> void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
>@@ -293,9 +268,6 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
>     }
> }
> 
>-
>-
>-
> //----- XResourceId -----------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId (void)
>@@ -305,18 +277,12 @@ Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId (void)
>     return mxPaneId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return true;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent& rEvent)
>@@ -326,10 +292,6 @@ void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -337,9 +299,6 @@ void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -347,9 +306,6 @@ void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -357,9 +313,6 @@ void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent)
>@@ -371,12 +324,8 @@ void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent)
>     }
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
>-
> void PresenterPaneBase::CreateWindows (
>     const Reference<awt::XWindow>& rxParentWindow,
>     const bool bIsWindowVisibleOnCreation)
>@@ -399,34 +348,22 @@ void PresenterPaneBase::CreateWindows (
>     }
> }
> 
>-
>-
>-
> Reference<awt::XWindow> PresenterPaneBase::GetBorderWindow (void) const
> {
>     return mxBorderWindow;
> }
> 
>-
>-
>-
> void PresenterPaneBase::ToTop (void)
> {
>     if (mxPresenterHelper.is())
>         mxPresenterHelper->toTop(mxContentWindow);
> }
> 
>-
>-
>-
> void PresenterPaneBase::SetBackground (const SharedBitmapDescriptor& rpBackground)
> {
>     mpViewBackground = rpBackground;
> }
> 
>-
>-
>-
> void PresenterPaneBase::PaintBorderBackground (
>     const awt::Rectangle& rBorderBox,
>     const awt::Rectangle& rUpdateBox)
>@@ -455,9 +392,6 @@ void PresenterPaneBase::PaintBorderBackground (
>     */
> }
> 
>-
>-
>-
> void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
> {
>     OSL_ASSERT(mxPaneId.is());
>@@ -487,9 +421,6 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
>     }
> }
> 
>-
>-
>-
> void PresenterPaneBase::LayoutContextWindow (void)
> {
>     OSL_ASSERT(mxPaneId.is());
>@@ -511,9 +442,6 @@ void PresenterPaneBase::LayoutContextWindow (void)
>     }
> }
> 
>-
>-
>-
> bool PresenterPaneBase::IsVisible (void) const
> {
>     Reference<awt::XWindow2> xWindow2 (mxBorderPainter, UNO_QUERY);
>@@ -523,9 +451,6 @@ bool PresenterPaneBase::IsVisible (void) const
>     return false;
> }
> 
>-
>-
>-
> void PresenterPaneBase::ThrowIfDisposed (void)
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -538,9 +463,6 @@ void PresenterPaneBase::ThrowIfDisposed (void)
>     }
> }
> 
>-
>-
>-
> } } // end of namespace ::sd::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
>index 3b36623..3ce3214 100644
>--- a/sdext/source/presenter/PresenterPaneBase.hxx
>+++ b/sdext/source/presenter/PresenterPaneBase.hxx
>@@ -50,7 +50,6 @@
> namespace css = ::com::sun::star;
> namespace cssu = ::com::sun::star::uno;
> 
>-
> namespace sdext { namespace presenter {
> 
> class PresenterController;
>@@ -65,7 +64,6 @@ namespace {
>     > PresenterPaneBaseInterfaceBase;
> }
> 
>-
> /** Base class of the panes used by the presenter screen.  Pane objects are
>     stored in the PresenterPaneContainer.  Sizes and positions are
>     controlled by the PresenterWindowManager.  Interactive positioning and
>@@ -98,7 +96,6 @@ public:
>     virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
>         throw (css::uno::Exception, css::uno::RuntimeException);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>@@ -107,7 +104,6 @@ public:
>     virtual sal_Bool SAL_CALL isAnchorOnly (void)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -122,13 +118,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
> 
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
> protected:
>     ::rtl::Reference<PresenterController> mpPresenterController;
>     css::uno::Reference<css::awt::XWindow> mxParentWindow;
>diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
>index 7177cec..02cf346 100644
>--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
>+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> // The body of this file is only used when PresenterWindowManager defines
> // the preprocessor symbol ENABLE_PANE_RESIZING, which by default is not the
> // case.
>@@ -55,15 +54,11 @@ namespace sdext { namespace presenter {
> 
> //===== Service ===============================================================
> 
>-
> OUString PresenterPaneBorderManager::getImplementationName_static (void)
> {
>     return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPaneBorderManager"));
> }
> 
>-
>-
>-
> Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void)
> {
>     static const ::rtl::OUString sServiceName(
>@@ -71,9 +66,6 @@ Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (
>     return Sequence<rtl::OUString>(&sServiceName, 1);
> }
> 
>-
>-
>-
> Reference<XInterface> PresenterPaneBorderManager::Create (const Reference<uno::XComponentContext>& rxContext)
>     SAL_THROW((css::uno::Exception))
> {
>@@ -81,9 +73,6 @@ Reference<XInterface> PresenterPaneBorderManager::Create (const Reference<uno::X
>         new PresenterPaneBorderManager(rxContext, NULL)));
> }
> 
>-
>-
>-
> //===== PresenterPaneBorderManager ============================================
> 
> PresenterPaneBorderManager::PresenterPaneBorderManager (
>@@ -118,16 +107,10 @@ PresenterPaneBorderManager::PresenterPaneBorderManager (
>     }
> }
> 
>-
>-
>-
> PresenterPaneBorderManager::~PresenterPaneBorderManager (void)
> {
> }
> 
>-
>-
>-
> void PresenterPaneBorderManager::disposing (void)
> {
>     WindowList::const_iterator iDescriptor;
>@@ -139,9 +122,6 @@ void PresenterPaneBorderManager::disposing (void)
>     maWindowList.clear();
> }
> 
>-
>-
>-
> namespace {
> const static sal_Int32 mnOutside = 0;
> const static sal_Int32 mnLeft = 0x01;
>@@ -242,9 +222,6 @@ PresenterPaneBorderManager::BorderElement
>     }
> }
> 
>-
>-
>-
> //----- XInitialization -------------------------------------------------------
> 
> void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArguments)
>@@ -285,9 +262,6 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArgu
>     }
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterPaneBorderManager::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -318,9 +292,6 @@ void SAL_CALL PresenterPaneBorderManager::mousePressed (const css::awt::MouseEve
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBorderManager::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -334,18 +305,12 @@ void SAL_CALL PresenterPaneBorderManager::mouseReleased (const css::awt::MouseEv
>     mxInnerDragWindow = NULL;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBorderManager::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBorderManager::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -359,9 +324,6 @@ void SAL_CALL PresenterPaneBorderManager::mouseExited (const css::awt::MouseEven
>     mxInnerDragWindow = NULL;
> }
> 
>-
>-
>-
> //----- XMouseMotionListener --------------------------------------------------
> 
> void SAL_CALL PresenterPaneBorderManager::mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -425,9 +387,6 @@ void SAL_CALL PresenterPaneBorderManager::mouseMoved (const css::awt::MouseEvent
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBorderManager::mouseDragged (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -520,9 +479,6 @@ void SAL_CALL PresenterPaneBorderManager::mouseDragged (const css::awt::MouseEve
>     }
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterPaneBorderManager::disposing (const lang::EventObject& rEvent)
>@@ -537,30 +493,20 @@ void SAL_CALL PresenterPaneBorderManager::disposing (const lang::EventObject& rE
>         }
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
>-
> void PresenterPaneBorderManager::CaptureMouse (const Reference<awt::XWindow>& rxWindow)
> {
>     if (mxPresenterHelper.is())
>         mxPresenterHelper->captureMouse(rxWindow);
> }
> 
>-
>-
>-
> void PresenterPaneBorderManager::ReleaseMouse (const Reference<awt::XWindow>& rxWindow)
> {
>     if (mxPresenterHelper.is())
>         mxPresenterHelper->releaseMouse(rxWindow);
> }
> 
>-
>-
>-
> void PresenterPaneBorderManager::ThrowIfDisposed (void)
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -573,9 +519,6 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void)
>     }
> }
> 
>-
>-
>-
> } } // end of namespace ::sd::presenter
> 
> #endif // ENABLE_PANE_RESIZING
>diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx
>index db7002c..fb9fd62 100644
>--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
>+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
>@@ -55,7 +55,6 @@
> 
> namespace css = ::com::sun::star;
> 
>-
> namespace sdext { namespace presenter {
> 
> class PresenterController;
>@@ -68,7 +67,6 @@ namespace {
>     > PresenterPaneBorderManagerInterfaceBase;
> }
> 
>-
> /** Manage the interactive moving and resizing of panes.
> */
> class PresenterPaneBorderManager
>@@ -84,20 +82,17 @@ public:
> 
>     virtual void SAL_CALL disposing (void);
> 
>-
>     static ::rtl::OUString getImplementationName_static (void);
>     static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void);
>     static css::uno::Reference<css::uno::XInterface> Create(
>         const css::uno::Reference<css::uno::XComponentContext>& rxContext)
>         SAL_THROW((css::uno::Exception));
> 
>-
>     // XInitialization
> 
>     virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
>         throw (css::uno::Exception, css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -112,7 +107,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -121,12 +115,10 @@ public:
>     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
> private:
>     enum BorderElement { Top, TopLeft, TopRight, Left, Right, BottomLeft, BottomRight, Bottom,
>                          Content, Outside };
>diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
>index aca09fb..4ddcf74 100644
>--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
>+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterPaneBorderPainter.hxx"
> #include "PresenterCanvasHelper.hxx"
> #include "PresenterConfigurationAccess.hxx"
>@@ -114,8 +113,6 @@ namespace {
>     };
> }
> 
>-
>-
> class  PresenterPaneBorderPainter::Renderer
> {
> public:
>@@ -168,9 +165,6 @@ private:
>         const SharedBitmapDescriptor& rpBackgroundBitmap);
> };
> 
>-
>-
>-
> // ===== PresenterPaneBorderPainter ===========================================
> 
> PresenterPaneBorderPainter::PresenterPaneBorderPainter (
>@@ -182,16 +176,10 @@ PresenterPaneBorderPainter::PresenterPaneBorderPainter (
> {
> }
> 
>-
>-
>-
> PresenterPaneBorderPainter::~PresenterPaneBorderPainter (void)
> {
> }
> 
>-
>-
>-
> //----- XPaneBorderPainter ----------------------------------------------------
> 
> awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder (
>@@ -207,9 +195,6 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder (
>     return AddBorder(rsPaneBorderStyleName, rRectangle, eBorderType);
> }
> 
>-
>-
>-
> awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder (
>     const rtl::OUString& rsPaneBorderStyleName,
>     const css::awt::Rectangle& rRectangle,
>@@ -223,9 +208,6 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder (
>     return RemoveBorder(rsPaneBorderStyleName, rRectangle, eBorderType);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBorderPainter::paintBorder (
>     const rtl::OUString& rsPaneBorderStyleName,
>     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
>@@ -261,9 +243,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder (
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout (
>     const rtl::OUString& rsPaneBorderStyleName,
>     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
>@@ -301,9 +280,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout (
>     }
> }
> 
>-
>-
>-
> awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
>     const rtl::OUString& rsPaneBorderStyleName)
>     throw(css::uno::RuntimeException)
>@@ -327,9 +303,6 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
>     return awt::Point(0,0);
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanvas>& rxCanvas)
>@@ -365,9 +338,6 @@ bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanva
>     return bModified;
> }
> 
>-
>-
>-
> bool PresenterPaneBorderPainter::ProvideTheme (void)
> {
>     if (mpTheme.get() == NULL)
>@@ -383,9 +353,6 @@ bool PresenterPaneBorderPainter::ProvideTheme (void)
>     }
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme)
> {
>     mpTheme = rpTheme;
>@@ -393,9 +360,6 @@ void PresenterPaneBorderPainter::SetTheme (const ::boost::shared_ptr<PresenterTh
>         mpRenderer.reset(new Renderer(mxContext, mpTheme));
> }
> 
>-
>-
>-
> awt::Rectangle PresenterPaneBorderPainter::AddBorder (
>     const ::rtl::OUString& rsPaneURL,
>     const awt::Rectangle& rInnerBox,
>@@ -410,9 +374,6 @@ awt::Rectangle PresenterPaneBorderPainter::AddBorder (
>     return rInnerBox;
> }
> 
>-
>-
>-
> awt::Rectangle PresenterPaneBorderPainter::RemoveBorder (
>     const ::rtl::OUString& rsPaneURL,
>     const css::awt::Rectangle& rOuterBox,
>@@ -427,9 +388,6 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder (
>     return rOuterBox;
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::ThrowIfDisposed (void) const
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -442,12 +400,8 @@ void PresenterPaneBorderPainter::ThrowIfDisposed (void) const
>     }
> }
> 
>-
>-
>-
> //===== PresenterPaneBorderPainter::Renderer =====================================
> 
>-
> PresenterPaneBorderPainter::Renderer::Renderer (
>     const Reference<XComponentContext>& rxContext,
>     const ::boost::shared_ptr<PresenterTheme>& rpTheme)
>@@ -473,16 +427,10 @@ PresenterPaneBorderPainter::Renderer::Renderer (
>     }
> }
> 
>-
>-
>-
> PresenterPaneBorderPainter::Renderer::~Renderer (void)
> {
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::Renderer::SetCanvas (const Reference<rendering::XCanvas>& rxCanvas)
> {
>     if (mxCanvas != rxCanvas)
>@@ -491,9 +439,6 @@ void PresenterPaneBorderPainter::Renderer::SetCanvas (const Reference<rendering:
>     }
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::Renderer::PaintBorder (
>     const OUString& rsTitle,
>     const awt::Rectangle& rBBox,
>@@ -571,9 +516,6 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::Renderer::PaintTitle (
>     const OUString& rsTitle,
>     const ::boost::shared_ptr<RendererPaneStyle>& rpStyle,
>@@ -674,8 +616,6 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
>     }
> }
> 
>-
>-
> ::boost::shared_ptr<RendererPaneStyle>
>     PresenterPaneBorderPainter::Renderer::GetRendererPaneStyle (const OUString& rsResourceURL)
> {
>@@ -703,9 +643,6 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
>         return ::boost::shared_ptr<RendererPaneStyle>();
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::Renderer::SetCalloutAnchor (
>     const awt::Point& rCalloutAnchor)
> {
>@@ -713,9 +650,6 @@ void PresenterPaneBorderPainter::Renderer::SetCalloutAnchor (
>     maCalloutAnchor = rCalloutAnchor;
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::Renderer::PaintBitmap(
>     const awt::Rectangle& rBox,
>     const awt::Rectangle& rUpdateBox,
>@@ -825,9 +759,6 @@ void PresenterPaneBorderPainter::Renderer::PaintBitmap(
>             aRenderState);
> }
> 
>-
>-
>-
> void PresenterPaneBorderPainter::Renderer::SetupClipping (
>     const awt::Rectangle& rUpdateBox,
>     const awt::Rectangle& rOuterBox,
>@@ -862,8 +793,6 @@ void PresenterPaneBorderPainter::Renderer::SetupClipping (
>     maViewState.Clip = mxViewStateClip;
> }
> 
>-
>-
> namespace {
> 
> //===== BorderSize ============================================================
>@@ -876,9 +805,6 @@ BorderSize::BorderSize (void)
> {
> }
> 
>-
>-
>-
> BorderSize::BorderSize (const BorderSize& rBorderSize)
>     : mnLeft(rBorderSize.mnLeft),
>       mnTop(rBorderSize.mnTop),
>@@ -887,9 +813,6 @@ BorderSize::BorderSize (const BorderSize& rBorderSize)
> {
> }
> 
>-
>-
>-
> BorderSize& BorderSize::operator= (const BorderSize& rBorderSize)
> {
>     if (&rBorderSize != this)
>@@ -902,9 +825,6 @@ BorderSize& BorderSize::operator= (const BorderSize& rBorderSize)
>     return *this;
> }
> 
>-
>-
>-
> //===== RendererPaneStyle  ============================================================
> 
> RendererPaneStyle::RendererPaneStyle (
>@@ -988,10 +908,6 @@ RendererPaneStyle::RendererPaneStyle (
>     }
> }
> 
>-
>-
>-
>-
> awt::Rectangle RendererPaneStyle::AddBorder (
>     const awt::Rectangle& rBox,
>     const drawing::framework::BorderType eBorderType) const
>@@ -1018,9 +934,6 @@ awt::Rectangle RendererPaneStyle::AddBorder (
>         rBox.Height + pBorderSize->mnTop + pBorderSize->mnBottom);
> }
> 
>-
>-
>-
> awt::Rectangle RendererPaneStyle::RemoveBorder (
>     const awt::Rectangle& rBox,
>     const css::drawing::framework::BorderType eBorderType) const
>@@ -1047,9 +960,6 @@ awt::Rectangle RendererPaneStyle::RemoveBorder (
>         rBox.Height - pBorderSize->mnTop - pBorderSize->mnBottom);
> }
> 
>-
>-
>-
> const Reference<rendering::XCanvasFont> RendererPaneStyle::GetFont (
>     const Reference<rendering::XCanvas>& rxCanvas) const
> {
>@@ -1058,9 +968,6 @@ const Reference<rendering::XCanvasFont> RendererPaneStyle::GetFont (
>     return mpFont->mxFont;
> }
> 
>-
>-
>-
> void RendererPaneStyle::UpdateBorderSizes (void)
> {
>     maTotalBorderSize.mnLeft = maInnerBorderSize.mnLeft + maOuterBorderSize.mnLeft;
>@@ -1069,9 +976,6 @@ void RendererPaneStyle::UpdateBorderSizes (void)
>     maTotalBorderSize.mnBottom = maInnerBorderSize.mnBottom + maOuterBorderSize.mnBottom;
> }
> 
>-
>-
>-
> SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
>     const ::boost::shared_ptr<PresenterTheme>& rpTheme,
>     const OUString& rsStyleName,
>@@ -1084,11 +988,8 @@ SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
>         return mpEmpty;
> }
> 
>-
>-
> } // end of anonymous namespace
> 
>-
> } } // end of namespace ::sd::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
>index 1abb612..3e26b15 100644
>--- a/sdext/source/presenter/PresenterPaneContainer.cxx
>+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterPaneContainer.hxx"
> #include "PresenterPaneBase.hxx"
> #include <com/sun/star/awt/XGraphics.hpp>
>@@ -59,16 +58,10 @@ PresenterPaneContainer::PresenterPaneContainer (
>     }
> }
> 
>-
>-
>-
> PresenterPaneContainer::~PresenterPaneContainer (void)
> {
> }
> 
>-
>-
>-
> void PresenterPaneContainer::PreparePane (
>     const Reference<XResourceId>& rxPaneId,
>     const OUString& rsViewURL,
>@@ -119,9 +112,6 @@ void PresenterPaneContainer::PreparePane (
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneContainer::disposing (void)
> {
>     PaneList::iterator iPane (maPanes.begin());
>@@ -131,9 +121,6 @@ void SAL_CALL PresenterPaneContainer::disposing (void)
>             RemovePane((*iPane)->mxPaneId);
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor
>     PresenterPaneContainer::StorePane (const rtl::Reference<PresenterPaneBase>& rxPane)
> {
>@@ -172,9 +159,6 @@ PresenterPaneContainer::SharedPaneDescriptor
>     return pDescriptor;
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor
>     PresenterPaneContainer::StoreBorderWindow(
>         const Reference<XResourceId>& rxPaneId,
>@@ -196,9 +180,6 @@ PresenterPaneContainer::SharedPaneDescriptor
>         return SharedPaneDescriptor();
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor
>     PresenterPaneContainer::StoreView (
>         const Reference<XView>& rxView,
>@@ -242,9 +223,6 @@ PresenterPaneContainer::SharedPaneDescriptor
>     return pDescriptor;
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor
>     PresenterPaneContainer::RemovePane (const Reference<XResourceId>& rxPaneId)
> {
>@@ -262,10 +240,6 @@ PresenterPaneContainer::SharedPaneDescriptor
>     return pDescriptor;
> }
> 
>-
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor
>     PresenterPaneContainer::RemoveView (const Reference<XView>& rxView)
> {
>@@ -293,9 +267,6 @@ PresenterPaneContainer::SharedPaneDescriptor
>     return pDescriptor;
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindBorderWindow (
>     const Reference<awt::XWindow>& rxBorderWindow)
> {
>@@ -309,9 +280,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindBorderW
>     return SharedPaneDescriptor();
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindContentWindow (
>     const Reference<awt::XWindow>& rxContentWindow)
> {
>@@ -325,9 +293,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindContent
>     return SharedPaneDescriptor();
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindPaneURL (
>     const OUString& rsPaneURL)
> {
>@@ -341,9 +306,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindPaneURL
>     return SharedPaneDescriptor();
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindPaneId (
>     const Reference<XResourceId>& rxPaneId)
> {
>@@ -361,9 +323,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindPaneId
>     return SharedPaneDescriptor();
> }
> 
>-
>-
>-
> PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL (
>     const OUString& rsViewURL)
> {
>@@ -377,9 +336,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL
>     return SharedPaneDescriptor();
> }
> 
>-
>-
>-
> ::rtl::OUString PresenterPaneContainer::GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL)
> {
>     SharedPaneDescriptor pDescriptor (FindViewURL(rsViewURL));
>@@ -389,9 +345,6 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL
>     return OUString();
> }
> 
>-
>-
>-
> void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor)
> {
>     if (rpDescriptor.get() != NULL)
>@@ -414,9 +367,6 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor)
>     }
> }
> 
>-
>-
>-
> //----- XEventListener --------------------------------------------------------
> 
> void SAL_CALL PresenterPaneContainer::disposing (
>@@ -431,9 +381,6 @@ void SAL_CALL PresenterPaneContainer::disposing (
>     }
> }
> 
>-
>-
>-
> //===== PresenterPaneContainer::PaneDescriptor ================================
> 
> void PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsActive)
>diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
>index 3c837ff..a064c5a 100644
>--- a/sdext/source/presenter/PresenterPaneContainer.hxx
>+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
>@@ -180,7 +180,6 @@ public:
> 
>     void ToTop (const SharedPaneDescriptor& rpDescriptor);
> 
>-
>     // XEventListener
> 
>     virtual void SAL_CALL disposing (
>diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
>index 326df4a..ebdae6f 100644
>--- a/sdext/source/presenter/PresenterPaneFactory.cxx
>+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterPaneFactory.hxx"
> #include "PresenterController.hxx"
> #include "PresenterPane.hxx"
>@@ -66,8 +65,6 @@ const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL(
> const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL(
>     RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Overlay"));
> 
>-
>-
> //===== PresenterPaneFactory ==================================================
> 
> Reference<drawing::framework::XResourceFactory> PresenterPaneFactory::Create (
>@@ -82,9 +79,6 @@ Reference<drawing::framework::XResourceFactory> PresenterPaneFactory::Create (
>         static_cast<XWeak*>(pFactory.get()), UNO_QUERY);
> }
> 
>-
>-
>-
> PresenterPaneFactory::PresenterPaneFactory (
>     const Reference<uno::XComponentContext>& rxContext,
>     const ::rtl::Reference<PresenterController>& rpPresenterController)
>@@ -96,9 +90,6 @@ PresenterPaneFactory::PresenterPaneFactory (
> {
> }
> 
>-
>-
>-
> void PresenterPaneFactory::Register (const Reference<frame::XController>& rxController)
> {
>     Reference<XConfigurationController> xCC;
>@@ -130,16 +121,10 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont
>     }
> }
> 
>-
>-
>-
> PresenterPaneFactory::~PresenterPaneFactory (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneFactory::disposing (void)
>     throw (RuntimeException)
> {
>@@ -163,9 +148,6 @@ void SAL_CALL PresenterPaneFactory::disposing (void)
>     }
> }
> 
>-
>-
>-
> //----- XPaneFactory ----------------------------------------------------------
> 
> Reference<XResource> SAL_CALL PresenterPaneFactory::createResource (
>@@ -209,9 +191,6 @@ Reference<XResource> SAL_CALL PresenterPaneFactory::createResource (
>     return xResource;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>& rxResource)
>     throw (RuntimeException)
> {
>@@ -247,9 +226,6 @@ void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>&
>     }
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> Reference<XResource> PresenterPaneFactory::CreatePane (
>@@ -287,9 +263,6 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
>     return NULL;
> }
> 
>-
>-
>-
> Reference<XResource> PresenterPaneFactory::CreatePane (
>     const Reference<XResourceId>& rxPaneId,
>     const OUString& rsTitle,
>@@ -358,9 +331,6 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
>     return Reference<XResource>(static_cast<XWeak*>(xPane.get()), UNO_QUERY_THROW);
> }
> 
>-
>-
>-
> void PresenterPaneFactory::ThrowIfDisposed (void) const
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -373,7 +343,6 @@ void PresenterPaneFactory::ThrowIfDisposed (void) const
>     }
> }
> 
>-
> } } // end of namespace sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
>index 136d47e..9bf4a84 100644
>--- a/sdext/source/presenter/PresenterPaneFactory.hxx
>+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
>@@ -54,7 +54,6 @@ namespace {
>     > PresenterPaneFactoryInterfaceBase;
> }
> 
>-
> /** The PresenerPaneFactory provides a fixed set of panes.
> 
>     In order to make the presener screen more easily extendable in the
>diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
>index 80aad8a..15c99aa 100644
>--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
>+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterProtocolHandler.hxx"
> #include "PresenterConfigurationAccess.hxx"
> #include "PresenterController.hxx"
>@@ -179,7 +178,6 @@ namespace {
> 
> } // end of anonymous namespace
> 
>-
> namespace {
>     typedef ::cppu::WeakComponentImplHelper2 <
>         css::frame::XDispatch,
>@@ -206,7 +204,6 @@ public:
>         const OUString& rsURLPath,
>         const ::rtl::Reference<PresenterController>& rpPresenterController);
> 
>-
>     // XDispatch
>     virtual void SAL_CALL dispatch(
>         const css::util::URL& aURL,
>@@ -223,13 +220,11 @@ public:
>         const css::util::URL& rURL)
>         throw(css::uno::RuntimeException);
> 
>-
>     // document::XEventListener
> 
>     virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent)
>         throw(css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
> 
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>@@ -271,7 +266,6 @@ Reference<XInterface> PresenterProtocolHandler::Create (
>     return Reference<XInterface>(static_cast<XWeak*>(new PresenterProtocolHandler(rxContext)));
> }
> 
>-
> //===== PresenterProtocolHandler =========================================================
> 
> PresenterProtocolHandler::PresenterProtocolHandler (const Reference<XComponentContext>& rxContext)
>@@ -342,7 +336,6 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD
>     return Sequence<Reference<frame::XDispatch> >();
> }
> 
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterProtocolHandler::ThrowIfDisposed (void) const
>@@ -533,7 +526,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::Ev
>     mbIsListeningToWindowManager = false;
> }
> 
>-
> //===== GotoPreviousSlideCommand ==============================================
> 
> GotoPreviousSlideCommand::GotoPreviousSlideCommand (
>@@ -768,7 +760,6 @@ Any NotesFontSizeCommand::GetState (void) const
>     return Any();
> }
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
>index 2c7918e..5b1c8ac 100644
>--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
>+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
>@@ -43,7 +43,6 @@ namespace css = ::com::sun::star;
> 
> namespace sdext { namespace presenter {
> 
>-
> namespace {
>     typedef ::cppu::WeakComponentImplHelper2 <
>         css::lang::XInitialization,
>@@ -69,14 +68,12 @@ public:
>         const css::uno::Reference<css::uno::XComponentContext>& rxContext)
>         SAL_THROW((css::uno::Exception));
> 
>-
>     // XInitialization
> 
>     virtual void SAL_CALL initialize(
>         const css::uno::Sequence<css::uno::Any>& aArguments)
>         throw (css::uno::Exception, css::uno::RuntimeException);
> 
>-
>     // XDispatchProvider
> 
>     virtual css::uno::Reference<css::frame::XDispatch > SAL_CALL
>@@ -91,7 +88,6 @@ public:
>             const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors)
>         throw(css::uno::RuntimeException);
> 
>-
> private:
>     class Dispatch;
>     ::rtl::Reference<PresenterController> mpPresenterController;
>diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
>index ccda5f8..a9c6e78 100644
>--- a/sdext/source/presenter/PresenterScreen.cxx
>+++ b/sdext/source/presenter/PresenterScreen.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterScreen.hxx"
> #include "PresenterConfigurationAccess.hxx"
> #include "PresenterController.hxx"
>@@ -101,7 +100,6 @@ namespace {
>     };
> }
> 
>-
> //----- Service ---------------------------------------------------------------
> 
> OUString PresenterScreenJob::getImplementationName_static (void)
>@@ -109,9 +107,6 @@ OUString PresenterScreenJob::getImplementationName_static (void)
>     return A2S("com.sun.star.comp.Draw.framework.PresenterScreenJob");
> }
> 
>-
>-
>-
> Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void)
> {
>     static const ::rtl::OUString sServiceName(
>@@ -119,18 +114,12 @@ Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void)
>     return Sequence<rtl::OUString>(&sServiceName, 1);
> }
> 
>-
>-
>-
> Reference<XInterface> PresenterScreenJob::Create (const Reference<uno::XComponentContext>& rxContext)
>     SAL_THROW((css::uno::Exception))
> {
>     return Reference<XInterface>(static_cast<XWeak*>(new PresenterScreenJob(rxContext)));
> }
> 
>-
>-
>-
> //===== PresenterScreenJob ====================================================
> 
> PresenterScreenJob::PresenterScreenJob (const Reference<XComponentContext>& rxContext)
>@@ -139,24 +128,15 @@ PresenterScreenJob::PresenterScreenJob (const Reference<XComponentContext>& rxCo
> {
> }
> 
>-
>-
>-
> PresenterScreenJob::~PresenterScreenJob (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScreenJob::disposing (void)
> {
>     mxComponentContext = NULL;
> }
> 
>-
>-
>-
> //----- XJob -----------------------------------------------------------
> 
> Any SAL_CALL PresenterScreenJob::execute(
>@@ -202,9 +182,6 @@ Any SAL_CALL PresenterScreenJob::execute(
>     return Any();
> }
> 
>-
>-
>-
> //===== PresenterScreenListener ===============================================
> 
> namespace {
>@@ -219,9 +196,6 @@ PresenterScreenListener::PresenterScreenListener (
> {
> }
> 
>-
>-
>-
> void PresenterScreenListener::Initialize (void)
> {
>     Reference< document::XEventListener > xDocListener(
>@@ -231,16 +205,10 @@ void PresenterScreenListener::Initialize (void)
>         xDocBroadcaster->addEventListener(xDocListener);
> }
> 
>-
>-
>-
> PresenterScreenListener::~PresenterScreenListener (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScreenListener::disposing (void)
> {
>     Reference< document::XEventBroadcaster > xDocBroadcaster( mxModel, UNO_QUERY );
>@@ -256,9 +224,6 @@ void SAL_CALL PresenterScreenListener::disposing (void)
>     }
> }
> 
>-
>-
>-
> // document::XEventListener
> 
> void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException)
>@@ -280,9 +245,6 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb
>     }
> }
> 
>-
>-
>-
> // XEventListener
> 
> void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent)
>@@ -297,9 +259,6 @@ void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject&
>     }
> }
> 
>-
>-
>-
> void PresenterScreenListener::ThrowIfDisposed (void) const throw (
>     ::com::sun::star::lang::DisposedException)
> {
>@@ -314,9 +273,6 @@ void PresenterScreenListener::ThrowIfDisposed (void) const throw (
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== PresenterScreen =======================================================
> 
> PresenterScreen::PresenterScreen (
>@@ -339,16 +295,10 @@ PresenterScreen::PresenterScreen (
> {
> }
> 
>-
>-
>-
> PresenterScreen::~PresenterScreen (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScreen::disposing (void)
> {
>     Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
>@@ -368,9 +318,6 @@ void SAL_CALL PresenterScreen::disposing (void)
>     mxModel = NULL;
> }
> 
>-
>-
>-
> //----- XEventListener --------------------------------------------------------
> 
> void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
>@@ -380,9 +327,6 @@ void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
>     RequestShutdownPresenterScreen();
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterScreen::InitializePresenterScreen (void)
>@@ -583,7 +527,6 @@ sal_Int32 PresenterScreen::GetScreenNumber (
>     return nScreenNumber;
> }
> 
>-
> sal_Int32 PresenterScreen::GetPresenterScreenFromScreen( sal_Int32 nPresentationScreen ) const
> {
>     // Setup the resource id of the full screen background pane so that
>@@ -609,7 +552,6 @@ sal_Int32 PresenterScreen::GetPresenterScreenFromScreen( sal_Int32 nPresentation
>     return nPresenterScreenNumber;
> }
> 
>-
> Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
>     const Reference<presentation::XPresentation2>& rxPresentation) const
> {
>@@ -628,9 +570,6 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
>                 + OUString::valueOf(nPresenterScreenNumber));
> }
> 
>-
>-
>-
> void PresenterScreen::RequestShutdownPresenterScreen (void)
> {
>     // Restore the configuration that was active before the presenter screen
>@@ -657,9 +596,6 @@ void PresenterScreen::RequestShutdownPresenterScreen (void)
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::ShutdownPresenterScreen (void)
> {
>     Reference<lang::XComponent> xViewFactoryComponent (mxViewFactory, UNO_QUERY);
>@@ -680,9 +616,6 @@ void PresenterScreen::ShutdownPresenterScreen (void)
>     mpPaneContainer = new PresenterPaneContainer(Reference<XComponentContext>(mxContextWeak));
> }
> 
>-
>-
>-
> void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxContext)
> {
>     try
>@@ -699,9 +632,6 @@ void PresenterScreen::SetupPaneFactory (const Reference<XComponentContext>& rxCo
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxContext)
> {
>     try
>@@ -718,9 +648,6 @@ void PresenterScreen::SetupViewFactory (const Reference<XComponentContext>& rxCo
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::SetupConfiguration (
>     const Reference<XComponentContext>& rxContext,
>     const Reference<XResourceId>& rxAnchorId)
>@@ -743,9 +670,6 @@ void PresenterScreen::SetupConfiguration (
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::ProcessLayout (
>     PresenterConfigurationAccess& rConfiguration,
>     const OUString& rsLayoutName,
>@@ -800,9 +724,6 @@ void PresenterScreen::ProcessLayout (
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::ProcessViewDescriptions (
>     PresenterConfigurationAccess& rConfiguration)
> {
>@@ -829,9 +750,6 @@ void PresenterScreen::ProcessViewDescriptions (
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::ProcessComponent (
>     const OUString& rsKey,
>     const ::std::vector<Any>& rValues,
>@@ -878,9 +796,6 @@ void PresenterScreen::ProcessComponent (
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::ProcessViewDescription (
>     const OUString& rsKey,
>     const ::std::vector<Any>& rValues)
>@@ -908,9 +823,6 @@ void PresenterScreen::ProcessViewDescription (
>     }
> }
> 
>-
>-
>-
> void PresenterScreen::SetupView(
>     const Reference<XComponentContext>& rxContext,
>     const Reference<XResourceId>& rxAnchorId,
>@@ -948,9 +860,6 @@ void PresenterScreen::SetupView(
>     }
> }
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
>index d9bfac7..40f99a2 100644
>--- a/sdext/source/presenter/PresenterScreen.hxx
>+++ b/sdext/source/presenter/PresenterScreen.hxx
>@@ -63,9 +63,6 @@ namespace {
>         > PresenterScreenInterfaceBase;
> }
> 
>-
>-
>-
> /** The PresenterScreenJob service is instantiated every time a document is
>     created or loaded.  In its execute() method it then filters out all
>     non-Impress documents and creates and registers a new PresenterScreen
>@@ -100,9 +97,6 @@ private:
>     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
> };
> 
>-
>-
>-
> /** This is the bootstrap class of the presenter screen.  It is registered
>     as drawing framework startup service.  That means that every drawing
>     framework instance creates an instance of this class.
>@@ -170,7 +164,6 @@ private:
>     typedef ::std::map<rtl::OUString,ViewDescriptor> ViewDescriptorContainer;
>     ViewDescriptorContainer maViewDescriptors;
> 
>-
>     void ShutdownPresenterScreen (void);
> 
>     /** Create and initialize the factory for presenter view specific panes.
>diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
>index b87f9d9..d7ebbad 100644
>--- a/sdext/source/presenter/PresenterScrollBar.cxx
>+++ b/sdext/source/presenter/PresenterScrollBar.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterScrollBar.hxx"
> #include "PresenterBitmapContainer.hxx"
> #include "PresenterCanvasHelper.hxx"
>@@ -78,9 +77,6 @@ private:
>     PresenterScrollBar::Area meMouseArea;
> };
> 
>-
>-
>-
> //===== PresenterScrollBar ====================================================
> 
> boost::weak_ptr<PresenterBitmapContainer> PresenterScrollBar::mpSharedBitmaps;
>@@ -156,16 +152,10 @@ PresenterScrollBar::PresenterScrollBar (
>     }
> }
> 
>-
>-
>-
> PresenterScrollBar::~PresenterScrollBar (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::disposing (void)
> {
>     mpMousePressRepeater->Dispose();
>@@ -186,18 +176,12 @@ void SAL_CALL PresenterScrollBar::disposing (void)
>     mpBitmaps.reset();
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetVisible (const bool bIsVisible)
> {
>     if (mxWindow.is())
>         mxWindow->setVisible(bIsVisible);
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetPosSize (const css::geometry::RealRectangle2D& rBox)
> {
>     if (mxWindow.is())
>@@ -212,9 +196,6 @@ void PresenterScrollBar::SetPosSize (const css::geometry::RealRectangle2D& rBox)
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetThumbPosition (
>     double nPosition,
>     const bool bAsynchronousUpdate)
>@@ -222,9 +203,6 @@ void PresenterScrollBar::SetThumbPosition (
>     SetThumbPosition(nPosition, bAsynchronousUpdate, true, true);
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetThumbPosition (
>     double nPosition,
>     const bool bAsynchronousUpdate,
>@@ -245,17 +223,11 @@ void PresenterScrollBar::SetThumbPosition (
>     }
> }
> 
>-
>-
>-
> double PresenterScrollBar::GetThumbPosition (void) const
> {
>     return mnThumbPosition;
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetTotalSize (const double nTotalSize)
> {
>     if (mnTotalSize != nTotalSize)
>@@ -266,9 +238,6 @@ void PresenterScrollBar::SetTotalSize (const double nTotalSize)
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetThumbSize (const double nThumbSize)
> {
>     OSL_ASSERT(nThumbSize>=0);
>@@ -280,33 +249,21 @@ void PresenterScrollBar::SetThumbSize (const double nThumbSize)
>     }
> }
> 
>-
>-
>-
> double PresenterScrollBar::GetThumbSize (void) const
> {
>     return mnThumbSize;
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetLineHeight (const double nLineHeight)
> {
>     mnLineHeight = nLineHeight;
> }
> 
>-
>-
>-
> double PresenterScrollBar::GetLineHeight (void) const
> {
>     return mnLineHeight;
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rxCanvas)
> {
>     if (mxCanvas != rxCanvas)
>@@ -344,24 +301,16 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::SetBackground (const SharedBitmapDescriptor& rpBackgroundBitmap)
> {
>     mpBackgroundBitmap = rpBackgroundBitmap;
> }
> 
>-
>-
> void PresenterScrollBar::CheckValues (void)
> {
>     mnThumbPosition = ValidateThumbPosition(mnThumbPosition);
> }
> 
>-
>-
>-
> double PresenterScrollBar::ValidateThumbPosition (double nPosition)
> {
>     if (nPosition + mnThumbSize > mnTotalSize)
>@@ -371,9 +320,6 @@ double PresenterScrollBar::ValidateThumbPosition (double nPosition)
>     return nPosition;
> }
> 
>-
>-
>-
> void PresenterScrollBar::Paint (
>     const awt::Rectangle& rUpdateBox,
>     const bool bNoClip)
>@@ -406,11 +352,6 @@ void PresenterScrollBar::Paint (
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent)
>@@ -419,37 +360,24 @@ void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rE
>     (void)rEvent;
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::windowShown (const css::lang::EventObject& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEvent)
>@@ -469,9 +397,6 @@ void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEven
>     }
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -484,9 +409,6 @@ void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEve
>     mpMousePressRepeater->Start(meButtonDownArea);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -498,18 +420,12 @@ void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEv
>         mxPresenterHelper->releaseMouse(mxWindow);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -526,10 +442,6 @@ void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEven
>     mpMousePressRepeater->Stop();
> }
> 
>-
>-
>-
>-
> //----- XMouseMotionListener --------------------------------------------------
> 
> void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -548,9 +460,6 @@ void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent
>     mpMousePressRepeater->SetMouseArea(eArea);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -570,9 +479,6 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve
>     }
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEvent)
>@@ -582,9 +488,6 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven
>         mxWindow = NULL;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const
>@@ -594,9 +497,6 @@ geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) co
>     return maBox[eArea];
> }
> 
>-
>-
>-
> void PresenterScrollBar::Repaint (
>     const geometry::RealRectangle2D aBox,
>     const bool bAsynchronousUpdate)
>@@ -608,9 +508,6 @@ void PresenterScrollBar::Repaint (
>             bAsynchronousUpdate);
> }
> 
>-
>-
>-
> void PresenterScrollBar::PaintBackground(
>     const css::awt::Rectangle& rUpdateBox)
> {
>@@ -626,9 +523,6 @@ void PresenterScrollBar::PaintBackground(
>         awt::Rectangle());
> }
> 
>-
>-
>-
> void PresenterScrollBar::PaintBitmap(
>     const css::awt::Rectangle& rUpdateBox,
>     const Area eArea,
>@@ -672,9 +566,6 @@ void PresenterScrollBar::PaintBitmap(
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::NotifyThumbPositionChange (void)
> {
>     if ( ! mbIsNotificationActive)
>@@ -693,9 +584,6 @@ void PresenterScrollBar::NotifyThumbPositionChange (void)
>     }
> }
> 
>-
>-
>-
> PresenterScrollBar::Area PresenterScrollBar::GetArea (const double nX, const double nY) const
> {
>     const geometry::RealPoint2D aPoint(nX, nY);
>@@ -717,9 +605,6 @@ PresenterScrollBar::Area PresenterScrollBar::GetArea (const double nX, const dou
>     return None;
> }
> 
>-
>-
>-
> void PresenterScrollBar::UpdateWidthOrHeight (
>     sal_Int32& rSize,
>     const SharedBitmapDescriptor& rpDescriptor)
>@@ -737,9 +622,6 @@ void PresenterScrollBar::UpdateWidthOrHeight (
>     }
> }
> 
>-
>-
>-
> css::uno::Reference<css::rendering::XBitmap> PresenterScrollBar::GetBitmap (
>     const Area eArea,
>     const SharedBitmapDescriptor& rpBitmaps) const
>@@ -750,9 +632,6 @@ css::uno::Reference<css::rendering::XBitmap> PresenterScrollBar::GetBitmap (
>         return rpBitmaps->GetBitmap(GetBitmapMode(eArea));
> }
> 
>-
>-
>-
> PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMode (
>     const Area eArea) const
> {
>@@ -764,9 +643,6 @@ PresenterBitmapContainer::BitmapDescriptor::Mode PresenterScrollBar::GetBitmapMo
>         return PresenterBitmapContainer::BitmapDescriptor::Normal;
> }
> 
>-
>-
>-
> bool PresenterScrollBar::IsDisabled (const Area eArea) const
> {
>     OSL_ASSERT(eArea>=0 && eArea<__AreaCount__);
>@@ -774,9 +650,6 @@ bool PresenterScrollBar::IsDisabled (const Area eArea) const
>     return ! maEnabledState[eArea];
> }
> 
>-
>-
>-
> //===== PresenterVerticalScrollBar ============================================
> 
> PresenterVerticalScrollBar::PresenterVerticalScrollBar (
>@@ -789,16 +662,10 @@ PresenterVerticalScrollBar::PresenterVerticalScrollBar (
> {
> }
> 
>-
>-
>-
> PresenterVerticalScrollBar::~PresenterVerticalScrollBar (void)
> {
> }
> 
>-
>-
>-
> double PresenterVerticalScrollBar::GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const
> {
>     (void)nX;
>@@ -820,9 +687,6 @@ double PresenterVerticalScrollBar::GetDragDistance (const sal_Int32 nX, const sa
>     }
> }
> 
>-
>-
>-
> void PresenterVerticalScrollBar::UpdateDragAnchor (const double nDragDistance)
> {
>     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
>@@ -831,44 +695,29 @@ void PresenterVerticalScrollBar::UpdateDragAnchor (const double nDragDistance)
>     maDragAnchor.Y += nDragDistance * nPagerHeight /  mnTotalSize;
> }
> 
>-
>-
>-
> sal_Int32 PresenterVerticalScrollBar::GetSize (void) const
> {
>     return mnScrollBarWidth;
> }
> 
>-
>-
>-
> geometry::RealPoint2D PresenterVerticalScrollBar::GetPoint (
>     const double nMajor, const double nMinor) const
> {
>     return geometry::RealPoint2D(nMinor, nMajor);
> }
> 
>-
>-
>-
> double PresenterVerticalScrollBar::GetMajor (const double nX, const double nY) const
> {
>     (void)nX;
>     return nY;
> }
> 
>-
>-
>-
> double PresenterVerticalScrollBar::GetMinor (const double nX, const double nY) const
> {
>     (void)nY;
>     return nX;
> }
> 
>-
>-
>-
> void PresenterVerticalScrollBar::UpdateBorders (void)
> {
>     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
>@@ -935,9 +784,6 @@ void PresenterVerticalScrollBar::UpdateBorders (void)
>         maBox[Pager]);
> }
> 
>-
>-
>-
> void PresenterVerticalScrollBar::UpdateBitmaps (void)
> {
>     if (mpBitmaps.get() != NULL)
>@@ -965,9 +811,6 @@ void PresenterVerticalScrollBar::UpdateBitmaps (void)
>     }
> }
> 
>-
>-
>-
> void PresenterVerticalScrollBar::PaintComposite(
>     const css::awt::Rectangle& rUpdateBox,
>     const Area eArea,
>@@ -995,9 +838,6 @@ void PresenterVerticalScrollBar::PaintComposite(
>         GetBitmap(eArea, rpEndBitmaps));
> }
> 
>-
>-
>-
> //===== PresenterHorizontalScrollBar ============================================
> 
> PresenterHorizontalScrollBar::PresenterHorizontalScrollBar (
>@@ -1010,16 +850,10 @@ PresenterHorizontalScrollBar::PresenterHorizontalScrollBar (
> {
> }
> 
>-
>-
>-
> PresenterHorizontalScrollBar::~PresenterHorizontalScrollBar (void)
> {
> }
> 
>-
>-
>-
> double PresenterHorizontalScrollBar::GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const
> {
>     (void)nY;
>@@ -1041,9 +875,6 @@ double PresenterHorizontalScrollBar::GetDragDistance (const sal_Int32 nX, const
>     }
> }
> 
>-
>-
>-
> void PresenterHorizontalScrollBar::UpdateDragAnchor (const double nDragDistance)
> {
>     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
>@@ -1052,45 +883,29 @@ void PresenterHorizontalScrollBar::UpdateDragAnchor (const double nDragDistance)
>     maDragAnchor.X += nDragDistance * nPagerWidth /  mnTotalSize;
> }
> 
>-
>-
>-
> sal_Int32 PresenterHorizontalScrollBar::GetSize (void) const
> {
>     return mnScrollBarHeight;
> }
> 
>-
>-
>-
>-
> geometry::RealPoint2D PresenterHorizontalScrollBar::GetPoint (
>     const double nMajor, const double nMinor) const
> {
>     return geometry::RealPoint2D(nMajor, nMinor);
> }
> 
>-
>-
>-
> double PresenterHorizontalScrollBar::GetMajor (const double nX, const double nY) const
> {
>     (void)nY;
>     return nX;
> }
> 
>-
>-
>-
> double PresenterHorizontalScrollBar::GetMinor (const double nX, const double nY) const
> {
>     (void)nX;
>     return nY;
> }
> 
>-
>-
>-
> void PresenterHorizontalScrollBar::UpdateBorders (void)
> {
>     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
>@@ -1158,9 +973,6 @@ void PresenterHorizontalScrollBar::UpdateBorders (void)
>         maBox[Pager]);
> }
> 
>-
>-
>-
> void PresenterHorizontalScrollBar::UpdateBitmaps (void)
> {
>     if (mpBitmaps.get() != NULL)
>@@ -1188,8 +1000,6 @@ void PresenterHorizontalScrollBar::UpdateBitmaps (void)
>     }
> }
> 
>-
>-
> void PresenterHorizontalScrollBar::PaintComposite(
>     const css::awt::Rectangle& rUpdateBox,
>     const Area eArea,
>@@ -1213,9 +1023,6 @@ void PresenterHorizontalScrollBar::PaintComposite(
>         GetBitmap(eArea, rpEndBitmaps));
> }
> 
>-
>-
>-
> //===== PresenterScrollBar::MousePressRepeater ================================
> 
> PresenterScrollBar::MousePressRepeater::MousePressRepeater (
>@@ -1226,18 +1033,12 @@ PresenterScrollBar::MousePressRepeater::MousePressRepeater (
> {
> }
> 
>-
>-
>-
> void PresenterScrollBar::MousePressRepeater::Dispose (void)
> {
>     Stop();
>     mpScrollBar = NULL;
> }
> 
>-
>-
>-
> void PresenterScrollBar::MousePressRepeater::Start (const PresenterScrollBar::Area& reArea)
> {
>     meMouseArea = reArea;
>@@ -1259,9 +1060,6 @@ void PresenterScrollBar::MousePressRepeater::Start (const PresenterScrollBar::Ar
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::MousePressRepeater::Stop (void)
> {
>     if (mnMousePressRepeaterTaskId != PresenterTimer::NotAValidTaskId)
>@@ -1272,9 +1070,6 @@ void PresenterScrollBar::MousePressRepeater::Stop (void)
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::MousePressRepeater::SetMouseArea(const PresenterScrollBar::Area& reArea)
> {
>     if (meMouseArea != reArea)
>@@ -1286,9 +1081,6 @@ void PresenterScrollBar::MousePressRepeater::SetMouseArea(const PresenterScrollB
>     }
> }
> 
>-
>-
>-
> void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrentTime)
> {
>     (void)rCurrentTime;
>@@ -1302,9 +1094,6 @@ void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrent
>     Execute();
> }
> 
>-
>-
>-
> void PresenterScrollBar::MousePressRepeater::Execute (void)
> {
>     const double nThumbPosition (mpScrollBar->GetThumbPosition());
>@@ -1331,8 +1120,6 @@ void PresenterScrollBar::MousePressRepeater::Execute (void)
>     }
> }
> 
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
>index 6fdaeda..2f21445 100644
>--- a/sdext/source/presenter/PresenterScrollBar.hxx
>+++ b/sdext/source/presenter/PresenterScrollBar.hxx
>@@ -135,13 +135,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -156,7 +154,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw(css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -165,12 +162,10 @@ public:
>     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None,
>                 __AreaCount__ = None };
> 
>@@ -258,9 +253,6 @@ private:
>     Area GetArea (const double nX, const double nY) const;
> };
> 
>-
>-
>-
> /** A vertical scroll bar.
> */
> class PresenterVerticalScrollBar : public PresenterScrollBar
>@@ -293,9 +285,6 @@ private:
>     sal_Int32 mnScrollBarWidth;
> };
> 
>-
>-
>-
> /** A horizontal scroll bar.
> */
> class PresenterHorizontalScrollBar : public PresenterScrollBar
>@@ -328,9 +317,6 @@ private:
>     sal_Int32 mnScrollBarHeight;
> };
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
>index 2e10de1..2ac1440 100644
>--- a/sdext/source/presenter/PresenterSlidePreview.cxx
>+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterSlidePreview.hxx"
> #include "PresenterCanvasHelper.hxx"
> #include "PresenterGeometryHelper.hxx"
>@@ -111,16 +110,10 @@ PresenterSlidePreview::PresenterSlidePreview (
>     Resize();
> }
> 
>-
>-
>-
> PresenterSlidePreview::~PresenterSlidePreview (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlidePreview::disposing (void)
> {
>     if (mxWindow.is())
>@@ -136,9 +129,6 @@ void SAL_CALL PresenterSlidePreview::disposing (void)
>         xComponent->dispose();
> }
> 
>-
>-
>-
> //----- XResourceId -----------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId (void)
>@@ -147,18 +137,12 @@ Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId (void)
>     return mxViewId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return false;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEvent)
>@@ -170,19 +154,12 @@ void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEve
>     Resize();
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterSlidePreview::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -192,18 +169,12 @@ void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEven
>     Resize();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent)
>@@ -220,9 +191,6 @@ void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent)
>             rEvent.UpdateRect.Height));
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent)
>@@ -236,9 +204,6 @@ void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent)
>     }
> }
> 
>-
>-
>-
> //----- XDrawView -------------------------------------------------------------
> 
> void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
>@@ -249,9 +214,6 @@ void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XD
>     SetSlide(rxSlide);
> }
> 
>-
>-
>-
> Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage (void)
>     throw (RuntimeException)
> {
>@@ -259,9 +221,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage (vo
>     return NULL;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPage)
>@@ -291,9 +250,6 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag
>     mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
> }
> 
>-
>-
>-
> void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox)
> {
>     (void)rBoundingBox;
>@@ -382,9 +338,6 @@ void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox)
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> void PresenterSlidePreview::Resize (void)
> {
>     if (mxPreviewRenderer.is() && mxPreview.is())
>@@ -406,9 +359,6 @@ void PresenterSlidePreview::Resize (void)
>     SetSlide(mxCurrentSlide);
> }
> 
>-
>-
>-
> void PresenterSlidePreview::ThrowIfDisposed (void)
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -421,7 +371,6 @@ void PresenterSlidePreview::ThrowIfDisposed (void)
>     }
> }
> 
>-
> } } // end of namespace ::sd::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
>index 57b9f97..ae140f0 100644
>--- a/sdext/source/presenter/PresenterSlidePreview.hxx
>+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
>@@ -60,7 +60,6 @@ namespace {
>     > PresenterSlidePreviewInterfaceBase;
> }
> 
>-
> /** Static preview of a slide.  Typically used for the preview of the next
>     slide.
>     This implementation shows a preview of the slide given to the
>@@ -81,7 +80,6 @@ public:
>     virtual ~PresenterSlidePreview (void);
>     virtual void SAL_CALL disposing (void);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>@@ -104,18 +102,15 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XDrawView
> 
>     virtual void SAL_CALL setCurrentPage (
>diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
>index 689a119..7c7b8e6 100644
>--- a/sdext/source/presenter/PresenterSlideShowView.cxx
>+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterSlideShowView.hxx"
> 
> #include "PresenterCanvasHelper.hxx"
>@@ -101,8 +100,6 @@ PresenterSlideShowView::PresenterSlideShowView (
>     }
> }
> 
>-
>-
> void PresenterSlideShowView::LateInit (void)
> {
>     mxSlideShow = Reference<presentation::XSlideShow> (
>@@ -197,16 +194,10 @@ void PresenterSlideShowView::LateInit (void)
>         >>= msClickToExitPresentationTitle;
> }
> 
>-
>-
>-
> PresenterSlideShowView::~PresenterSlideShowView (void)
> {
> }
> 
>-
>-
>-
> void PresenterSlideShowView::disposing (void)
> {
>     // Tell all listeners that we are disposed.
>@@ -279,9 +270,6 @@ void PresenterSlideShowView::disposing (void)
>     mxCurrentSlide = NULL;
> }
> 
>-
>-
>-
> //----- XDrawView -------------------------------------------------------------
> 
> void SAL_CALL PresenterSlideShowView::setCurrentPage (
>@@ -327,18 +315,12 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
>     }
> }
> 
>-
>-
>-
> css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage (void)
>     throw (css::uno::RuntimeException)
> {
>     return mxCurrentSlide;
> }
> 
>-
>-
>-
> //----- CachablePresenterView -------------------------------------------------
> 
> void PresenterSlideShowView::ReleaseView (void)
>@@ -350,9 +332,6 @@ void PresenterSlideShowView::ReleaseView (void)
>     }
> }
> 
>-
>-
>-
> //----- XSlideShowView --------------------------------------------------------
> 
> Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas (void)
>@@ -363,9 +342,6 @@ Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas (
>     return Reference<rendering::XSpriteCanvas>(mxViewCanvas, UNO_QUERY);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::clear (void)
>     throw (RuntimeException)
> {
>@@ -394,9 +370,6 @@ void SAL_CALL PresenterSlideShowView::clear (void)
>     }
> }
> 
>-
>-
>-
> geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (void)
>     throw (RuntimeException)
> {
>@@ -424,9 +397,6 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (voi
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::addTransformationChangedListener(
>     const Reference<util::XModifyListener>& rxListener)
>     throw (RuntimeException)
>@@ -437,9 +407,6 @@ void SAL_CALL PresenterSlideShowView::addTransformationChangedListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener(
>     const Reference<util::XModifyListener>& rxListener)
>     throw (RuntimeException)
>@@ -450,9 +417,6 @@ void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::addPaintListener(
>     const Reference<awt::XPaintListener>& rxListener)
>     throw (RuntimeException)
>@@ -463,9 +427,6 @@ void SAL_CALL PresenterSlideShowView::addPaintListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::removePaintListener(
>     const Reference<awt::XPaintListener>& rxListener)
>     throw (RuntimeException)
>@@ -476,9 +437,6 @@ void SAL_CALL PresenterSlideShowView::removePaintListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::addMouseListener(
>     const Reference<awt::XMouseListener>& rxListener)
>     throw (RuntimeException)
>@@ -489,9 +447,6 @@ void SAL_CALL PresenterSlideShowView::addMouseListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::removeMouseListener(
>     const Reference<awt::XMouseListener>& rxListener)
>     throw (RuntimeException)
>@@ -502,9 +457,6 @@ void SAL_CALL PresenterSlideShowView::removeMouseListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::addMouseMotionListener(
>     const Reference<awt::XMouseMotionListener>& rxListener)
>     throw (RuntimeException)
>@@ -515,9 +467,6 @@ void SAL_CALL PresenterSlideShowView::addMouseMotionListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::removeMouseMotionListener(
>     const Reference<awt::XMouseMotionListener>& rxListener)
>     throw (RuntimeException)
>@@ -528,9 +477,6 @@ void SAL_CALL PresenterSlideShowView::removeMouseMotionListener(
>         rxListener);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape)
>     throw (RuntimeException)
> {
>@@ -557,8 +503,6 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape)
>     }
> }
> 
>-
>-
> awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea(  ) throw (RuntimeException)
> {
>     if( mxViewWindow.is() && mxTopPane.is() )
>@@ -571,8 +515,6 @@ awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea(  ) throw (Runtime
>     return aRectangle;
> }
> 
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent)
>@@ -584,9 +526,6 @@ void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent
>         mxSlideShow = NULL;
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent)
>@@ -608,9 +547,6 @@ void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent
>         PaintInnerWindow(rEvent);
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEvent)
>@@ -633,9 +569,6 @@ void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEven
>             mpPresenterController->HandleMouseClick(rEvent);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -649,9 +582,6 @@ void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEve
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -665,9 +595,6 @@ void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEven
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -681,9 +608,6 @@ void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent
>     }
> }
> 
>-
>-
>-
> //----- XMouseMotionListener --------------------------------------------------
> 
> void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEvent)
>@@ -699,9 +623,6 @@ void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEven
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -715,9 +636,6 @@ void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent)
>     }
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEvent)
>@@ -731,10 +649,6 @@ void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEv
>     Resize();
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -743,9 +657,6 @@ void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEven
>         mbIsForcedPaintPending = true;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -753,18 +664,12 @@ void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject& rEve
>     Resize();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XView -----------------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void)
>@@ -773,18 +678,12 @@ Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void)
>     return mxViewId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return false;
> }
> 
>-
>-
>-
> //----- CachablePresenterView -------------------------------------------------
> 
> void PresenterSlideShowView::ActivatePresenterView (void)
>@@ -796,9 +695,6 @@ void PresenterSlideShowView::ActivatePresenterView (void)
>     }
> }
> 
>-
>-
>-
> void PresenterSlideShowView::DeactivatePresenterView (void)
> {
>     if (mxSlideShow.is() && mbIsViewAdded)
>@@ -808,9 +704,6 @@ void PresenterSlideShowView::DeactivatePresenterView (void)
>     }
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterSlideShowView::PaintOuterWindow (const awt::Rectangle& rRepaintBox)
>@@ -873,9 +766,6 @@ void PresenterSlideShowView::PaintOuterWindow (const awt::Rectangle& rRepaintBox
>     }
> }
> 
>-
>-
>-
> void PresenterSlideShowView::PaintEndSlide (const awt::Rectangle& rRepaintBox)
> {
>     if ( ! mxCanvas.is())
>@@ -931,9 +821,6 @@ void PresenterSlideShowView::PaintEndSlide (const awt::Rectangle& rRepaintBox)
>         mxSpriteCanvas->updateScreen(sal_True);
> }
> 
>-
>-
>-
> void PresenterSlideShowView::PaintInnerWindow (const awt::PaintEvent& rEvent)
> {
>     // Forward window paint to listeners.
>@@ -956,9 +843,6 @@ void PresenterSlideShowView::PaintInnerWindow (const awt::PaintEvent& rEvent)
>         mxSpriteCanvas->updateScreen(sal_True);
> }
> 
>-
>-
>-
> Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow (
>     const Reference<awt::XWindow>& rxParentWindow) const
> {
>@@ -1001,9 +885,6 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow (
>     return xViewWindow;
> }
> 
>-
>-
>-
> Reference<rendering::XCanvas> PresenterSlideShowView::CreateViewCanvas (
>     const Reference<awt::XWindow>& rxViewWindow) const
> {
>@@ -1016,9 +897,6 @@ Reference<rendering::XCanvas> PresenterSlideShowView::CreateViewCanvas (
>         rxViewWindow);
> }
> 
>-
>-
>-
> void PresenterSlideShowView::Resize (void)
> {
>     if ( ! mxWindow.is() || ! mxViewWindow.is())
>@@ -1075,9 +953,6 @@ void PresenterSlideShowView::Resize (void)
>         mbIsForcedPaintPending = true;
> }
> 
>-
>-
>-
> void PresenterSlideShowView::ForceRepaint (void)
> {
>     if (mxSlideShow.is() && mbIsViewAdded)
>@@ -1087,9 +962,6 @@ void PresenterSlideShowView::ForceRepaint (void)
>     }
> }
> 
>-
>-
>-
> void PresenterSlideShowView::CreateBackgroundPolygons (void)
> {
>     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
>@@ -1137,9 +1009,6 @@ void PresenterSlideShowView::CreateBackgroundPolygons (void)
>     }
> }
> 
>-
>-
>-
> void PresenterSlideShowView::ThrowIfDisposed (void)
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -1151,7 +1020,6 @@ void PresenterSlideShowView::ThrowIfDisposed (void)
>     }
> }
> 
>-
> } } // end of namespace ::sd::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
>index bb91fb5..8a1b034 100644
>--- a/sdext/source/presenter/PresenterSlideShowView.hxx
>+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
>@@ -85,12 +85,10 @@ public:
>     void LateInit (void);
>     virtual void SAL_CALL disposing (void);
> 
>-
>     // CachablePresenterView
> 
>     virtual void ReleaseView (void);
> 
>-
>     // XSlideShowView
> 
>     virtual css::uno::Reference<
>@@ -153,12 +151,10 @@ public:
>     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
>@@ -172,7 +168,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
>@@ -181,7 +176,6 @@ public:
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -196,7 +190,6 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XView
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL
>@@ -206,7 +199,6 @@ public:
>     virtual sal_Bool SAL_CALL isAnchorOnly (void)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XDrawView
> 
>     virtual void SAL_CALL setCurrentPage (
>@@ -216,7 +208,6 @@ public:
>     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void)
>         throw (css::uno::RuntimeException);
> 
>-
>     // CachablePresenterView
> 
>     virtual void ActivatePresenterView (void);
>diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
>index e874002..30e19e6 100644
>--- a/sdext/source/presenter/PresenterSlideSorter.cxx
>+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterSlideSorter.hxx"
> #include "PresenterButton.hxx"
> #include "PresenterCanvasHelper.hxx"
>@@ -90,8 +89,6 @@ namespace {
>     sal_Int32 floor (const double nValue) { return sal::static_int_cast<sal_Int32>(nValue); }
> }
> 
>-
>-
> //===== PresenterSlideSorter::Layout ==========================================
> 
> class PresenterSlideSorter::Layout
>@@ -153,9 +150,6 @@ private:
>     sal_Int32 GetColumn (const sal_Int32 nSlideIndex) const;
> };
> 
>-
>-
>-
> //==== PresenterSlideSorter::MouseOverManager =================================
> 
> class PresenterSlideSorter::MouseOverManager
>@@ -209,9 +203,6 @@ private:
>         const geometry::IntegerSize2D& rSize) const;
> };
> 
>-
>-
>-
> //==== PresenterSlideSorter::CurrentSlideFrameRenderer ========================
> 
> class PresenterSlideSorter::CurrentSlideFrameRenderer
>@@ -262,9 +253,6 @@ private:
>         const double nHeight);
> };
> 
>-
>-
>-
> //===== PresenterSlideSorter ==================================================
> 
> PresenterSlideSorter::PresenterSlideSorter (
>@@ -409,16 +397,10 @@ PresenterSlideSorter::PresenterSlideSorter (
>     }
> }
> 
>-
>-
>-
> PresenterSlideSorter::~PresenterSlideSorter (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::disposing (void)
> {
>     mxComponentContext = NULL;
>@@ -481,17 +463,11 @@ void SAL_CALL PresenterSlideSorter::disposing (void)
>     }
> }
> 
>-
>-
>-
> void PresenterSlideSorter::SetActiveState (const bool bIsActive)
> {
>     (void)bIsActive;
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject)
>@@ -519,9 +495,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
>     }
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent)
>@@ -533,9 +506,6 @@ void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEven
>     mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent)
>     throw (uno::RuntimeException)
> {
>@@ -543,9 +513,6 @@ void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent)
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent)
>     throw (uno::RuntimeException)
> {
>@@ -555,9 +522,6 @@ void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent
>     mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEvent)
>     throw (uno::RuntimeException)
> {
>@@ -565,9 +529,6 @@ void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEven
>     ThrowIfDisposed();
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEvent)
>@@ -586,9 +547,6 @@ void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEv
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -598,9 +556,6 @@ void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rE
>     mnSlideIndexMousePressed = mpLayout->GetSlideIndexForPosition(aPosition);
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -626,18 +581,12 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -647,9 +596,6 @@ void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEv
>         mpMouseOverManager->SetSlide(mnSlideIndexMousePressed, awt::Rectangle(0,0,0,0));
> }
> 
>-
>-
>-
> //----- XMouseMotionListener --------------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -676,18 +622,12 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XResourceId -----------------------------------------------------------
> 
> Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void)
>@@ -697,18 +637,12 @@ Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void)
>     return mxViewId;
> }
> 
>-
>-
>-
> sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly (void)
>     throw (RuntimeException)
> {
>     return false;
> }
> 
>-
>-
>-
> //----- XPropertyChangeListener -----------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::propertyChange (
>@@ -718,9 +652,6 @@ void SAL_CALL PresenterSlideSorter::propertyChange (
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XSlidePreviewCacheListener --------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
>@@ -733,9 +664,6 @@ void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
>     mpPresenterController->GetPaintManager()->Invalidate(mxWindow, aBBox, true);
> }
> 
>-
>-
>-
> //----- XDrawView -------------------------------------------------------------
> 
> void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
>@@ -770,9 +698,6 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr
>     }
> }
> 
>-
>-
>-
> Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (void)
>     throw (RuntimeException)
> {
>@@ -780,9 +705,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (voi
>     return NULL;
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> void PresenterSlideSorter::UpdateLayout (void)
>@@ -847,9 +769,6 @@ void PresenterSlideSorter::UpdateLayout (void)
>     mxPreviewFrame = NULL;
> }
> 
>-
>-
>-
> geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
>     const geometry::RealRectangle2D& rUpperBox)
> {
>@@ -915,9 +834,6 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
>     return rUpperBox;
> }
> 
>-
>-
>-
> void PresenterSlideSorter::PlaceCloseButton (
>     const PresenterPaneContainer::SharedPaneDescriptor& rpPane,
>     const awt::Rectangle& rCenterBox,
>@@ -948,9 +864,6 @@ void PresenterSlideSorter::PlaceCloseButton (
>         rCenterBox.Height - mpCloseButton->GetSize().Height/ 2));
> }
> 
>-
>-
>-
> void PresenterSlideSorter::ClearBackground (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const awt::Rectangle& rUpdateBox)
>@@ -966,9 +879,6 @@ void PresenterSlideSorter::ClearBackground (
>         awt::Rectangle());
> }
> 
>-
>-
>-
> double PresenterSlideSorter::GetSlideAspectRatio (void) const
> {
>     double nSlideAspectRatio (28.0/21.0);
>@@ -997,9 +907,6 @@ double PresenterSlideSorter::GetSlideAspectRatio (void) const
>     return nSlideAspectRatio;
> }
> 
>-
>-
>-
> Reference<rendering::XBitmap> PresenterSlideSorter::GetPreview (const sal_Int32 nSlideIndex)
> {
>     if (nSlideIndex < 0 || nSlideIndex>=mpLayout->mnSlideCount)
>@@ -1010,9 +917,6 @@ Reference<rendering::XBitmap> PresenterSlideSorter::GetPreview (const sal_Int32
>         return NULL;
> }
> 
>-
>-
>-
> void PresenterSlideSorter::PaintPreview (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const css::awt::Rectangle& rUpdateBox,
>@@ -1048,7 +952,6 @@ void PresenterSlideSorter::PaintPreview (
> 
>     const rendering::ViewState aViewState (geometry::AffineMatrix2D(1,0,0, 0,1,0), xClip);
> 
>-
>     rendering::RenderState aRenderState (
>         geometry::AffineMatrix2D(
>             1, 0, aTopLeft.X,
>@@ -1057,7 +960,6 @@ void PresenterSlideSorter::PaintPreview (
>         Sequence<double>(4),
>         rendering::CompositeOperation::SOURCE);
> 
>-
>     // Emphasize the current slide.
>     if (nSlideIndex == mnCurrentSlideIndex)
>     {
>@@ -1107,9 +1009,6 @@ void PresenterSlideSorter::PaintPreview (
>     mpMouseOverManager->Paint(nSlideIndex, mxCanvas, xClip);
> }
> 
>-
>-
>-
> void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
> {
>     const bool bCanvasChanged ( ! mxCanvas.is());
>@@ -1165,9 +1064,6 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
>         xSpriteCanvas->updateScreen(sal_False);
> }
> 
>-
>-
>-
> void PresenterSlideSorter::SetHorizontalOffset (const double nXOffset)
> {
>     if (mpLayout->SetHorizontalOffset(nXOffset))
>@@ -1180,9 +1076,6 @@ void PresenterSlideSorter::SetHorizontalOffset (const double nXOffset)
>     }
> }
> 
>-
>-
>-
> void PresenterSlideSorter::SetVerticalOffset (const double nYOffset)
> {
>     if (mpLayout->SetVerticalOffset(nYOffset))
>@@ -1195,17 +1088,11 @@ void PresenterSlideSorter::SetVerticalOffset (const double nYOffset)
>     }
> }
> 
>-
>-
>-
> void PresenterSlideSorter::GotoSlide (const sal_Int32 nSlideIndex)
> {
>     mxSlideShowController->gotoSlideIndex(nSlideIndex);
> }
> 
>-
>-
>-
> bool PresenterSlideSorter::ProvideCanvas (void)
> {
>     if ( ! mxCanvas.is())
>@@ -1229,9 +1116,6 @@ bool PresenterSlideSorter::ProvideCanvas (void)
>     return mxCanvas.is();
> }
> 
>-
>-
>-
> void PresenterSlideSorter::ThrowIfDisposed (void)
>     throw (lang::DisposedException)
> {
>@@ -1244,9 +1128,6 @@ void PresenterSlideSorter::ThrowIfDisposed (void)
>     }
> }
> 
>-
>-
>-
> //===== PresenterSlideSorter::Layout ==========================================
> 
> PresenterSlideSorter::Layout::Layout (
>@@ -1275,9 +1156,6 @@ PresenterSlideSorter::Layout::Layout (
> {
> }
> 
>-
>-
>-
> void PresenterSlideSorter::Layout::Update (
>     const geometry::RealRectangle2D& rBoundingBox,
>     const double nSlideAspectRatio)
>@@ -1384,9 +1262,6 @@ void PresenterSlideSorter::Layout::Update (
>     }
> }
> 
>-
>-
>-
> void PresenterSlideSorter::Layout::SetupVisibleArea (void)
> {
>     geometry::RealPoint2D aPoint (GetLocalPosition(
>@@ -1415,9 +1290,6 @@ void PresenterSlideSorter::Layout::SetupVisibleArea (void)
>     }
> }
> 
>-
>-
>-
> bool PresenterSlideSorter::Layout::IsScrollBarNeeded (const sal_Int32 nSlideCount)
> {
>     geometry::RealPoint2D aBottomRight;
>@@ -1431,9 +1303,6 @@ bool PresenterSlideSorter::Layout::IsScrollBarNeeded (const sal_Int32 nSlideCoun
>         || aBottomRight.Y > maBoundingBox.Y2-maBoundingBox.Y1;
> }
> 
>-
>-
>-
> geometry::RealPoint2D PresenterSlideSorter::Layout::GetLocalPosition(
>     const geometry::RealPoint2D& rWindowPoint) const
> {
>@@ -1442,9 +1311,6 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetLocalPosition(
>         rWindowPoint.Y - maBoundingBox.Y1 + mnVerticalOffset);
> }
> 
>-
>-
>-
> geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition(
>     const geometry::RealPoint2D& rLocalPoint) const
> {
>@@ -1453,9 +1319,6 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition(
>         rLocalPoint.Y - mnVerticalOffset + maBoundingBox.Y1);
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetColumn (
>     const css::geometry::RealPoint2D& rLocalPoint,
>     const bool bReturnInvalidValue) const
>@@ -1471,9 +1334,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetColumn (
>         return -1;
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetRow (
>     const css::geometry::RealPoint2D& rLocalPoint,
>     const bool bReturnInvalidValue) const
>@@ -1489,9 +1349,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetRow (
>         return -1;
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetSlideIndexForPosition (
>     const css::geometry::RealPoint2D& rWindowPoint) const
> {
>@@ -1514,9 +1371,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetSlideIndexForPosition (
>     }
> }
> 
>-
>-
>-
> geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint (
>     const sal_Int32 nSlideIndex,
>     const sal_Int32 nRelativeHorizontalPosition,
>@@ -1547,9 +1401,6 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint (
>     return aPosition;
> }
> 
>-
>-
>-
> awt::Rectangle PresenterSlideSorter::Layout::GetBoundingBox (const sal_Int32 nSlideIndex) const
> {
>     const geometry::RealPoint2D aWindowPosition(GetWindowPosition(GetPoint(nSlideIndex, -1, -1)));
>@@ -1561,9 +1412,6 @@ awt::Rectangle PresenterSlideSorter::Layout::GetBoundingBox (const sal_Int32 nSl
>             aWindowPosition.Y + maPreviewSize.Height));
> }
> 
>-
>-
>-
> void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function<void(sal_Int32)>& rAction)
> {
>     for (sal_Int32 nRow=mnFirstVisibleRow; nRow<=mnLastVisibleRow; ++nRow)
>@@ -1578,17 +1426,11 @@ void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function<
>     }
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetFirstVisibleSlideIndex (void) const
> {
>     return GetIndex(mnFirstVisibleRow, mnFirstVisibleColumn);
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex (void) const
> {
>     return ::std::min(
>@@ -1596,9 +1438,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex (void) const
>         mnSlideCount);
> }
> 
>-
>-
>-
> bool PresenterSlideSorter::Layout::SetHorizontalOffset (const double nOffset)
> {
>     if (mnHorizontalOffset != nOffset)
>@@ -1612,9 +1451,6 @@ bool PresenterSlideSorter::Layout::SetHorizontalOffset (const double nOffset)
>         return false;
> }
> 
>-
>-
>-
> bool PresenterSlideSorter::Layout::SetVerticalOffset (const double nOffset)
> {
>     if (mnVerticalOffset != nOffset)
>@@ -1628,18 +1464,12 @@ bool PresenterSlideSorter::Layout::SetVerticalOffset (const double nOffset)
>         return false;
> }
> 
>-
>-
>-
> PresenterSlideSorter::Layout::Orientation
>     PresenterSlideSorter::Layout::GetOrientation (void) const
> {
>     return meOrientation;
> }
> 
>-
>-
>-
> void PresenterSlideSorter::Layout::UpdateScrollBars (void)
> {
>     sal_Int32 nTotalColumnCount (0);
>@@ -1676,14 +1506,9 @@ void PresenterSlideSorter::Layout::UpdateScrollBars (void)
>         mpVerticalScrollBar->SetLineHeight(maPreviewSize.Height);
>     }
> 
>-
>-
>     // No place yet for the vertical scroll bar.
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetIndex (
>     const sal_Int32 nRow,
>     const sal_Int32 nColumn) const
>@@ -1694,9 +1519,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetIndex (
>         return nRow * mnColumnCount + nColumn;
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetRow (const sal_Int32 nSlideIndex) const
> {
>     if (meOrientation == Horizontal)
>@@ -1705,9 +1527,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetRow (const sal_Int32 nSlideIndex) con
>         return nSlideIndex / mnColumnCount;
> }
> 
>-
>-
>-
> sal_Int32 PresenterSlideSorter::Layout::GetColumn (const sal_Int32 nSlideIndex) const
> {
>     if (meOrientation == Horizontal)
>@@ -1716,9 +1535,6 @@ sal_Int32 PresenterSlideSorter::Layout::GetColumn (const sal_Int32 nSlideIndex)
>         return nSlideIndex % mnColumnCount;
> }
> 
>-
>-
>-
> //===== PresenterSlideSorter::MouseOverManager ================================
> 
> PresenterSlideSorter::MouseOverManager::MouseOverManager (
>@@ -1751,16 +1567,10 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager (
>     }
> }
> 
>-
>-
>-
> PresenterSlideSorter::MouseOverManager::~MouseOverManager (void)
> {
> }
> 
>-
>-
>-
> void PresenterSlideSorter::MouseOverManager::Paint (
>     const sal_Int32 nSlideIndex,
>     const Reference<rendering::XCanvas>& rxCanvas,
>@@ -1796,9 +1606,6 @@ void PresenterSlideSorter::MouseOverManager::Paint (
>     }
> }
> 
>-
>-
>-
> void PresenterSlideSorter::MouseOverManager::SetCanvas (
>     const Reference<rendering::XCanvas>& rxCanvas)
> {
>@@ -1807,9 +1614,6 @@ void PresenterSlideSorter::MouseOverManager::SetCanvas (
>         mpFont->PrepareFont(Reference<rendering::XCanvas>(mxCanvas, UNO_QUERY));
> }
> 
>-
>-
>-
> void PresenterSlideSorter::MouseOverManager::SetSlide (
>     const sal_Int32 nSlideIndex,
>     const awt::Rectangle& rBox)
>@@ -1846,9 +1650,6 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
>     Invalidate();
> }
> 
>-
>-
>-
> Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitmap (
>     const OUString& rsText,
>     const sal_Int32 nMaximalWidth) const
>@@ -1918,9 +1719,6 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm
>     return xBitmap;
> }
> 
>-
>-
>-
> OUString PresenterSlideSorter::MouseOverManager::GetFittingText (
>     const OUString& rsText,
>     const double nMaximalWidth) const
>@@ -1978,9 +1776,6 @@ OUString PresenterSlideSorter::MouseOverManager::GetFittingText (
>         return rsText;
> }
> 
>-
>-
>-
> geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSize (
>     const OUString& rsText) const
> {
>@@ -2002,9 +1797,6 @@ geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSi
>     return geometry::IntegerSize2D(nWidth, nHeight);
> }
> 
>-
>-
>-
> void PresenterSlideSorter::MouseOverManager::PaintButtonBackground (
>     const Reference<rendering::XBitmapCanvas>& rxCanvas,
>     const geometry::IntegerSize2D& rSize) const
>@@ -2031,18 +1823,12 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground (
>         xRightLabelBitmap);
> }
> 
>-
>-
>-
> void PresenterSlideSorter::MouseOverManager::Invalidate (void)
> {
>     if (mpPaintManager.get() != NULL)
>         mpPaintManager->Invalidate(mxInvalidateTarget, maSlideBoundingBox, true);
> }
> 
>-
>-
>-
> //===== PresenterSlideSorter::CurrentSlideFrameRenderer =======================
> 
> PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
>@@ -2120,16 +1906,10 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
>     }
> }
> 
>-
>-
>-
> PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer (void)
> {
> }
> 
>-
>-
>-
> void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
>     const awt::Rectangle& rSlideBoundingBox,
>     const Reference<rendering::XCanvas>& rxCanvas,
>@@ -2223,9 +2003,6 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
>     }
> }
> 
>-
>-
>-
> awt::Rectangle PresenterSlideSorter::CurrentSlideFrameRenderer::GetBoundingBox (
>     const awt::Rectangle& rSlideBoundingBox)
> {
>@@ -2236,9 +2013,6 @@ awt::Rectangle PresenterSlideSorter::CurrentSlideFrameRenderer::GetBoundingBox (
>         rSlideBoundingBox.Height + mnTopFrameSize + mnBottomFrameSize);
> }
> 
>-
>-
>-
> void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce(
>     const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
>     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
>@@ -2268,9 +2042,6 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapOnce(
>         aRenderState);
> }
> 
>-
>-
>-
> void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
>     const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
>     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
>diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
>index e3e6ebe..e10a5ae 100644
>--- a/sdext/source/presenter/PresenterSlideSorter.hxx
>+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
>@@ -87,14 +87,12 @@ public:
> 
>     void SetActiveState (const bool bIsActive);
> 
>-
>     // lang::XEventListener
> 
>     virtual void SAL_CALL
>         disposing (const css::lang::EventObject& rEventObject)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -109,13 +107,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -130,7 +126,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw(css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -139,7 +134,6 @@ public:
>     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>@@ -148,21 +142,18 @@ public:
>     virtual sal_Bool SAL_CALL isAnchorOnly (void)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XPropertyChangeListener
> 
>     virtual void SAL_CALL propertyChange (
>         const css::beans::PropertyChangeEvent& rEvent)
>         throw(css::uno::RuntimeException);
> 
>-
>     // XSlidePreviewCacheListener
> 
>     virtual void SAL_CALL notifyPreviewCreation (
>         sal_Int32 nSlideIndex)
>         throw(css::uno::RuntimeException);
> 
>-
>     // XDrawView
> 
>     virtual void SAL_CALL setCurrentPage (
>diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
>index 526d9d1..45ea49b 100644
>--- a/sdext/source/presenter/PresenterSprite.cxx
>+++ b/sdext/source/presenter/PresenterSprite.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterSprite.hxx"
> 
> #include <com/sun/star/lang/XComponent.hpp>
>@@ -198,9 +197,6 @@ void PresenterSprite::DisposeSprite (void)
>     }
> }
> 
>-
>-
>-
> } } //end of namespace sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
>index 233028c..256230b 100644
>--- a/sdext/source/presenter/PresenterSpritePane.cxx
>+++ b/sdext/source/presenter/PresenterSpritePane.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterSpritePane.hxx"
> #include "PresenterGeometryHelper.hxx"
> #include <com/sun/star/lang/XMultiComponentFactory.hpp>
>@@ -58,16 +57,10 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx
>         UNO_QUERY_THROW);
> }
> 
>-
>-
>-
> PresenterSpritePane::~PresenterSpritePane (void)
> {
> }
> 
>-
>-
>-
> void PresenterSpritePane::disposing (void)
> {
>     mpSprite->SetFactory(NULL);
>@@ -76,9 +69,6 @@ void PresenterSpritePane::disposing (void)
>     PresenterPaneBase::disposing();
> }
> 
>-
>-
>-
> //----- XPane -----------------------------------------------------------------
> 
> Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow (void)
>@@ -88,9 +78,6 @@ Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow (void)
>     return mxContentWindow;
> }
> 
>-
>-
>-
> Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas (void)
>     throw (RuntimeException)
> {
>@@ -102,9 +89,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas (void)
>     return mxContentCanvas;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent)
>@@ -118,10 +102,6 @@ void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent
>     UpdateCanvases();
> }
> 
>-
>-
>-
>-
> void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -134,9 +114,6 @@ void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent)
>     mpSprite->Update();
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -153,9 +130,6 @@ void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>@@ -167,9 +141,6 @@ void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent
>         mxContentWindow->setVisible(sal_False);
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent)
>@@ -185,27 +156,17 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent)
>     */
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
>-
> ::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite (void)
> {
>     return mpSprite;
> }
> 
>-
>-
>-
> void PresenterSpritePane::ShowTransparentBorder (void)
> {
> }
> 
>-
>-
>-
> void PresenterSpritePane::UpdateCanvases (void)
> {
>     Reference<XComponent> xContentCanvasComponent (mxContentCanvas, UNO_QUERY);
>@@ -231,9 +192,6 @@ void PresenterSpritePane::UpdateCanvases (void)
>     PaintBorder(awt::Rectangle(0,0,aWindowBox.Width,aWindowBox.Height));
> }
> 
>-
>-
>-
> void PresenterSpritePane::CreateCanvases (
>     const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
>     const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas)
>@@ -253,9 +211,6 @@ void PresenterSpritePane::CreateCanvases (
>     UpdateCanvases();
> }
> 
>-
>-
>-
> } } // end of namespace ::sd::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
>index 468f531..1e23faf 100644
>--- a/sdext/source/presenter/PresenterSpritePane.hxx
>+++ b/sdext/source/presenter/PresenterSpritePane.hxx
>@@ -51,7 +51,6 @@
> 
> namespace css = ::com::sun::star;
> 
>-
> namespace sdext { namespace presenter {
> 
> /** Use a sprite to display the contents and the border of a pane.  Windows
>@@ -89,7 +88,6 @@ public:
>     virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -104,13 +102,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
> private:
>     css::uno::Reference<css::awt::XWindow> mxParentWindow;
>     css::uno::Reference<css::rendering::XSpriteCanvas> mxParentCanvas;
>diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
>index 63a0f91..d3a84dc 100644
>--- a/sdext/source/presenter/PresenterTextView.cxx
>+++ b/sdext/source/presenter/PresenterTextView.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterTextView.hxx"
> #include "PresenterCanvasHelper.hxx"
> #include "PresenterGeometryHelper.hxx"
>@@ -70,7 +69,6 @@ namespace {
> 
> namespace sdext { namespace presenter {
> 
>-
> //===== PresenterTextView =====================================================
> 
> PresenterTextView::PresenterTextView (
>@@ -410,17 +408,11 @@ void PresenterTextView::Paint (
>     }
> }
> 
>-
>-
>-
> SharedPresenterTextCaret PresenterTextView::GetCaret (void) const
> {
>     return mpCaret;
> }
> 
>-
>-
>-
> awt::Rectangle PresenterTextView::GetCaretBounds (
>     sal_Int32 nParagraphIndex,
>     const sal_Int32 nCharacterIndex) const
>@@ -433,9 +425,6 @@ awt::Rectangle PresenterTextView::GetCaretBounds (
>         return awt::Rectangle(0,0,0,0);
> }
> 
>-
>-
>-
> //----- private ---------------------------------------------------------------
> 
> void PresenterTextView::RequestFormat (void)
>@@ -443,9 +432,6 @@ void PresenterTextView::RequestFormat (void)
>     mbIsFormatPending = true;
> }
> 
>-
>-
>-
> void PresenterTextView::Format (void)
> {
>     mbIsFormatPending = false;
>@@ -465,17 +451,11 @@ void PresenterTextView::Format (void)
>         maTextChangeBroadcaster();
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextView::GetParagraphCount (void) const
> {
>     return maParagraphs.size();
> }
> 
>-
>-
>-
> SharedPresenterTextParagraph PresenterTextView::GetParagraph (
>     const sal_Int32 nParagraphIndex) const
> {
>@@ -487,9 +467,6 @@ SharedPresenterTextParagraph PresenterTextView::GetParagraph (
>         return maParagraphs[nParagraphIndex];
> }
> 
>-
>-
>-
> //===== PresenterTextParagraph ================================================
> 
> PresenterTextParagraph::PresenterTextParagraph (
>@@ -569,7 +546,6 @@ void PresenterTextParagraph::Paint (
>     if ( ! IsTextReferencePointLeft())
>         rRenderState.AffineTransform.m02 += rSize.Width;
> 
>-
> #ifdef SHOW_CHARACTER_BOXES
>     for (sal_Int32 nIndex=0,nCount=maLines.size();
>          nIndex<nCount;
>@@ -607,9 +583,6 @@ void PresenterTextParagraph::Paint (
>         rRenderState.AffineTransform.m02 -= rSize.Width;
> }
> 
>-
>-
>-
> void PresenterTextParagraph::Format (
>     const double nY,
>     const double nWidth,
>@@ -669,9 +642,6 @@ void PresenterTextParagraph::Format (
> 
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextParagraph::GetWordBoundary(
>     const sal_Int32 nLocalCharacterIndex,
>     const sal_Int32 nDistance)
>@@ -712,9 +682,6 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary(
>         return maWordBoundaries[nIndex];
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextParagraph::GetCaretPosition (void) const
> {
>     if (mpCaret && mpCaret->GetParagraphIndex()==mnParagraphIndex)
>@@ -723,27 +690,18 @@ sal_Int32 PresenterTextParagraph::GetCaretPosition (void) const
>         return -1;
> }
> 
>-
>-
>-
> void PresenterTextParagraph::SetCaretPosition (const sal_Int32 nPosition) const
> {
>     if (mpCaret && mpCaret->GetParagraphIndex()==mnParagraphIndex)
>         return mpCaret->SetPosition(mnParagraphIndex, nPosition);
> }
> 
>-
>-
>-
> void PresenterTextParagraph::SetOrigin (const double nXOrigin, const double nYOrigin)
> {
>     mnXOrigin = nXOrigin;
>     mnYOrigin = nYOrigin;
> }
> 
>-
>-
>-
> awt::Point PresenterTextParagraph::GetRelativeLocation (void) const
> {
>     return awt::Point(
>@@ -751,9 +709,6 @@ awt::Point PresenterTextParagraph::GetRelativeLocation (void) const
>         sal_Int32(mnYOrigin + mnVerticalOffset));
> }
> 
>-
>-
>-
> awt::Size PresenterTextParagraph::GetSize (void)
> {
>     return awt::Size(
>@@ -761,9 +716,6 @@ awt::Size PresenterTextParagraph::GetSize (void)
>         sal_Int32(GetTotalTextHeight()));
> }
> 
>-
>-
>-
> void PresenterTextParagraph::AddWord (
>     const double nWidth,
>     i18n::Boundary& rCurrentLine,
>@@ -792,9 +744,6 @@ void PresenterTextParagraph::AddWord (
>     rCurrentLine.endPos = nWordBoundary;
> }
> 
>-
>-
>-
> void PresenterTextParagraph::AddLine (
>     i18n::Boundary& rCurrentLine)
> {
>@@ -828,33 +777,21 @@ void PresenterTextParagraph::AddLine (
>     rCurrentLine.startPos = rCurrentLine.endPos;
> }
> 
>-
>-
>-
> double PresenterTextParagraph::GetTotalTextHeight (void)
> {
>     return maLines.size() * mnLineHeight;
> }
> 
>-
>-
>-
> void PresenterTextParagraph::SetCharacterOffset (const sal_Int32 nCharacterOffset)
> {
>     mnCharacterOffset = nCharacterOffset;
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextParagraph::GetCharacterCount (void) const
> {
>     return msParagraphText.getLength();
> }
> 
>-
>-
>-
> sal_Unicode PresenterTextParagraph::GetCharacter (
>     const sal_Int32 nGlobalCharacterIndex) const
> {
>@@ -869,17 +806,11 @@ sal_Unicode PresenterTextParagraph::GetCharacter (
>     }
> }
> 
>-
>-
>-
> ::rtl::OUString PresenterTextParagraph::GetText (void) const
> {
>     return msParagraphText;
> }
> 
>-
>-
>-
> TextSegment PresenterTextParagraph::GetTextSegment (
>     const sal_Int32 nOffset,
>     const sal_Int32 nIndex,
>@@ -945,9 +876,6 @@ TextSegment PresenterTextParagraph::GetTextSegment (
>     return TextSegment(::rtl::OUString(), 0,0);
> }
> 
>-
>-
>-
> TextSegment PresenterTextParagraph::GetWordTextSegment (
>     const sal_Int32 nOffset,
>     const sal_Int32 nIndex) const
>@@ -993,9 +921,6 @@ TextSegment PresenterTextParagraph::GetWordTextSegment (
>     return CreateTextSegment(aWordBoundary.startPos, aWordBoundary.endPos);
> }
> 
>-
>-
>-
> TextSegment PresenterTextParagraph::CreateTextSegment (
>     sal_Int32 nStartIndex,
>     sal_Int32 nEndIndex) const
>@@ -1012,9 +937,6 @@ TextSegment PresenterTextParagraph::CreateTextSegment (
>             nEndIndex);
> }
> 
>-
>-
>-
> awt::Rectangle PresenterTextParagraph::GetCharacterBounds (
>     sal_Int32 nGlobalCharacterIndex,
>     const bool bCaretBox)
>@@ -1084,18 +1006,12 @@ awt::Rectangle PresenterTextParagraph::GetCharacterBounds (
>     return awt::Rectangle(sal_Int32(nX+0.5), sal_Int32(nY+0.5), 0, 0);
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextParagraph::GetIndexAtPoint (const awt::Point& rPoint) const
> {
>     (void)rPoint;
>     return -1;
> }
> 
>-
>-
>-
> sal_Int8 PresenterTextParagraph::GetTextDirection (void) const
> {
>     // Find first portion that has a non-neutral text direction.
>@@ -1144,17 +1060,11 @@ sal_Int8 PresenterTextParagraph::GetTextDirection (void) const
>     return nTextDirection;
> }
> 
>-
>-
>-
> bool PresenterTextParagraph::IsTextReferencePointLeft (void) const
> {
>     return mnWritingMode != text::WritingMode2::RL_TB;
> }
> 
>-
>-
>-
> void PresenterTextParagraph::SetupCellArray (
>     const PresenterTheme::SharedFontDescriptor& rpFont)
> {
>@@ -1191,9 +1101,6 @@ void PresenterTextParagraph::SetupCellArray (
>     }
> }
> 
>-
>-
>-
> //===== PresenterTextCaret ================================================----
> 
> PresenterTextCaret::PresenterTextCaret (
>@@ -1210,17 +1117,11 @@ PresenterTextCaret::PresenterTextCaret (
> {
> }
> 
>-
>-
>-
> PresenterTextCaret::~PresenterTextCaret (void)
> {
>     HideCaret();
> }
> 
>-
>-
>-
> void PresenterTextCaret::ShowCaret (void)
> {
>     if (mnCaretBlinkTaskId == 0)
>@@ -1233,9 +1134,6 @@ void PresenterTextCaret::ShowCaret (void)
>     mbIsCaretVisible = true;
> }
> 
>-
>-
>-
> void PresenterTextCaret::HideCaret (void)
> {
>     if (mnCaretBlinkTaskId != 0)
>@@ -1249,25 +1147,16 @@ void PresenterTextCaret::HideCaret (void)
>     mnCharacterIndex = -1;
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextCaret::GetParagraphIndex (void) const
> {
>     return mnParagraphIndex;
> }
> 
>-
>-
>-
> sal_Int32 PresenterTextCaret::GetCharacterIndex (void) const
> {
>     return mnCharacterIndex;
> }
> 
>-
>-
>-
> void PresenterTextCaret::SetPosition (
>     const sal_Int32 nParagraphIndex,
>     const sal_Int32 nCharacterIndex)
>@@ -1301,34 +1190,22 @@ void PresenterTextCaret::SetPosition (
>     }
> }
> 
>-
>-
>-
> bool PresenterTextCaret::IsVisible (void) const
> {
>     return mbIsCaretVisible;
> }
> 
>-
>-
>-
> void PresenterTextCaret::SetCaretMotionBroadcaster (
>     const ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)>& rBroadcaster)
> {
>     maBroadcaster = rBroadcaster;
> }
> 
>-
>-
>-
> css::awt::Rectangle PresenterTextCaret::GetBounds (void) const
> {
>     return maCaretBounds;
> }
> 
>-
>-
>-
> void PresenterTextCaret::InvertCaret (void)
> {
>     mbIsCaretVisible = !mbIsCaretVisible;
>@@ -1336,12 +1213,6 @@ void PresenterTextCaret::InvertCaret (void)
>         maInvalidator(maCaretBounds);
> }
> 
>-
>-
>-
>-
>-
>-
> //===== PresenterTextParagraph::Cell ==========================================
> 
> PresenterTextParagraph::Cell::Cell (
>@@ -1354,9 +1225,6 @@ PresenterTextParagraph::Cell::Cell (
> {
> }
> 
>-
>-
>-
> //===== PresenterTextParagraph::Line ==========================================
> 
> PresenterTextParagraph::Line::Line (
>@@ -1371,9 +1239,6 @@ PresenterTextParagraph::Line::Line (
> {
> }
> 
>-
>-
>-
> void PresenterTextParagraph::Line::ProvideCellBoxes (void)
> {
>     if ( ! IsEmpty() && maCellBoxes.getLength()==0)
>@@ -1387,9 +1252,6 @@ void PresenterTextParagraph::Line::ProvideCellBoxes (void)
>     }
> }
> 
>-
>-
>-
> void PresenterTextParagraph::Line::ProvideLayoutedLine (
>     const ::rtl::OUString& rsParagraphText,
>     const PresenterTheme::SharedFontDescriptor& rpFont,
>@@ -1409,17 +1271,11 @@ void PresenterTextParagraph::Line::ProvideLayoutedLine (
>     }
> }
> 
>-
>-
>-
> bool PresenterTextParagraph::Line::IsEmpty (void) const
> {
>     return mnLineStartCharacterIndex >= mnLineEndCharacterIndex;
> }
> 
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
>index 32c54ca..bb0f76e 100644
>--- a/sdext/source/presenter/PresenterTextView.hxx
>+++ b/sdext/source/presenter/PresenterTextView.hxx
>@@ -94,9 +94,6 @@ private:
> };
> typedef ::boost::shared_ptr<PresenterTextCaret> SharedPresenterTextCaret;
> 
>-
>-
>-
> //===== PresenterTextParagraph ================================================
> 
> class PresenterTextParagraph
>@@ -194,7 +191,6 @@ private:
>         bool IsEmpty (void) const;
>     };
> 
>-
>     cssu::Reference<css::i18n::XBreakIterator> mxBreakIterator;
>     cssu::Reference<css::i18n::XScriptTypeDetector> mxScriptTypeDetector;
>     ::std::vector<Line> maLines;
>@@ -227,9 +223,6 @@ private:
> };
> typedef ::boost::shared_ptr<PresenterTextParagraph> SharedPresenterTextParagraph;
> 
>-
>-
>-
> /** A simple text view that paints text onto a given canvas.
> */
> class PresenterTextView
>diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
>index 57c7ee3..7f0ed3a 100644
>--- a/sdext/source/presenter/PresenterTheme.cxx
>+++ b/sdext/source/presenter/PresenterTheme.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterTheme.hxx"
> #include "PresenterBitmapContainer.hxx"
> #include "PresenterCanvasHelper.hxx"
>@@ -80,7 +79,6 @@ public:
>         return aSequence;
>     };
> 
>-
>     void Merge (const BorderSize& rBorderSize)
>     {
>         if (mnLeft == mnInvalidValue)
>@@ -94,7 +92,6 @@ public:
>     }
> };
> 
>-
> /** Reading a theme from the configurations is done in various classes.  The
>     ReadContext gives access to frequently used objects and functions to make
>     the configuration handling easier.
>@@ -139,9 +136,6 @@ private:
>         const OUString& rsName) const;
> };
> 
>-
>-
>-
> /** A PaneStyle describes how a pane is rendered.
> */
> class PaneStyle
>@@ -168,9 +162,6 @@ private:
> 
> typedef ::boost::shared_ptr<PaneStyle> SharedPaneStyle;
> 
>-
>-
>-
> class PaneStyleContainer : vector<SharedPaneStyle>
> {
> public:
>@@ -187,9 +178,6 @@ private:
>         const ::std::vector<css::uno::Any>& rValues);
> };
> 
>-
>-
>-
> /** A ViewStyle describes how a view is displayed.
> */
> class ViewStyle
>@@ -211,9 +199,6 @@ public:
> 
> typedef ::boost::shared_ptr<ViewStyle> SharedViewStyle;
> 
>-
>-
>-
> class ViewStyleContainer : vector<SharedViewStyle>
> {
> public:
>@@ -229,17 +214,12 @@ private:
>         const Reference<beans::XPropertySet>& rxProperties);
> };
> 
>-
>-
>-
> class ViewDescriptor
> {
> };
> typedef ::boost::shared_ptr<ViewDescriptor> SharedViewDescriptor;
> typedef ::std::vector<SharedViewDescriptor> ViewDescriptorContainer;
> 
>-
>-
> class StyleAssociationContainer
> {
> public:
>@@ -261,7 +241,6 @@ private:
> 
> } // end of anonymous namespace
> 
>-
> class PresenterTheme::Theme
> {
> public:
>@@ -298,9 +277,6 @@ private:
>         const Reference<beans::XPropertySet>& rxProperties);
> };
> 
>-
>-
>-
> //===== PresenterTheme ========================================================
> 
> PresenterTheme::PresenterTheme (
>@@ -316,16 +292,10 @@ PresenterTheme::PresenterTheme (
>     mpTheme = ReadTheme();
> }
> 
>-
>-
>-
> PresenterTheme::~PresenterTheme (void)
> {
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme (void)
> {
>     ReadContext aReadContext(mxContext, mxCanvas);
>@@ -338,17 +308,11 @@ PresenterTheme::~PresenterTheme (void)
>     return aReadContext.ReadTheme(aConfiguration, msThemeName);
> }
> 
>-
>-
>-
> bool PresenterTheme::HasCanvas (void) const
> {
>     return mxCanvas.is();
> }
> 
>-
>-
>-
> void PresenterTheme::ProvideCanvas (const Reference<rendering::XCanvas>& rxCanvas)
> {
>     if ( ! mxCanvas.is() && rxCanvas.is())
>@@ -358,9 +322,6 @@ void PresenterTheme::ProvideCanvas (const Reference<rendering::XCanvas>& rxCanva
>     }
> }
> 
>-
>-
>-
> OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) const
> {
>     OUString sStyleName;
>@@ -373,9 +334,6 @@ OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) con
>     return sStyleName;
> }
> 
>-
>-
>-
> ::std::vector<sal_Int32> PresenterTheme::GetBorderSize (
>     const ::rtl::OUString& rsStyleName,
>     const bool bOuter) const
>@@ -394,9 +352,6 @@ OUString PresenterTheme::GetStyleName (const ::rtl::OUString& rsResourceURL) con
>     }
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor PresenterTheme::ReadFont (
>     const Reference<container::XHierarchicalNameAccess>& rxNode,
>     const OUString& rsFontPath,
>@@ -405,9 +360,6 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::ReadFont (
>     return ReadContext::ReadFont(rxNode, rsFontPath, rpDefault);
> }
> 
>-
>-
>-
> bool PresenterTheme::ConvertToColor (
>     const Any& rColorSequence,
>     sal_uInt32& rColor)
>@@ -428,9 +380,6 @@ bool PresenterTheme::ConvertToColor (
>         return false;
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterConfigurationAccess> PresenterTheme::GetNodeForViewStyle (
>     const ::rtl::OUString& rsStyleName,
>     const PresenterConfigurationAccess::WriteMode) const
>@@ -459,9 +408,6 @@ bool PresenterTheme::ConvertToColor (
>     return pConfiguration;
> }
> 
>-
>-
>-
> SharedBitmapDescriptor PresenterTheme::GetBitmap (
>     const OUString& rsStyleName,
>     const OUString& rsBitmapName) const
>@@ -504,9 +450,6 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
>     return SharedBitmapDescriptor();
> }
> 
>-
>-
>-
> SharedBitmapDescriptor PresenterTheme::GetBitmap (
>     const OUString& rsBitmapName) const
> {
>@@ -532,9 +475,6 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
>     return SharedBitmapDescriptor();
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer (void) const
> {
>     if (mpTheme.get() != NULL)
>@@ -543,9 +483,6 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
>         return ::boost::shared_ptr<PresenterBitmapContainer>();
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
>     const OUString& rsStyleName) const
> {
>@@ -606,7 +543,6 @@ bool PresenterTheme::FontDescriptor::PrepareFont (
>     if ( ! rxCanvas.is())
>         return false;
> 
>-
>     const double nCellSize (GetCellSizeForDesignSize(rxCanvas, mnSize));
>     mxFont = CreateFont(rxCanvas, nCellSize);
> 
>@@ -679,16 +615,10 @@ PresenterTheme::Theme::Theme (
> {
> }
> 
>-
>-
>-
> PresenterTheme::Theme::~Theme (void)
> {
> }
> 
>-
>-
>-
> void PresenterTheme::Theme::Read (
>     PresenterConfigurationAccess& rConfiguration,
>     ReadContext& rReadContext)
>@@ -760,9 +690,6 @@ void PresenterTheme::Theme::Read (
>             this, ::boost::ref(rReadContext), _1, _2));
> }
> 
>-
>-
>-
> SharedPaneStyle PresenterTheme::Theme::GetPaneStyle (const OUString& rsStyleName) const
> {
>     SharedPaneStyle pPaneStyle (maPaneStyles.GetPaneStyle(rsStyleName));
>@@ -774,9 +701,6 @@ SharedPaneStyle PresenterTheme::Theme::GetPaneStyle (const OUString& rsStyleName
>         return SharedPaneStyle();
> }
> 
>-
>-
>-
> SharedViewStyle PresenterTheme::Theme::GetViewStyle (const OUString& rsStyleName) const
> {
>     SharedViewStyle pViewStyle (maViewStyles.GetViewStyle(rsStyleName));
>@@ -788,9 +712,6 @@ SharedViewStyle PresenterTheme::Theme::GetViewStyle (const OUString& rsStyleName
>         return SharedViewStyle();
> }
> 
>-
>-
>-
> void PresenterTheme::Theme::ProcessFont(
>     ReadContext& rReadContext,
>     const OUString& rsKey,
>@@ -800,9 +721,6 @@ void PresenterTheme::Theme::ProcessFont(
>     maFontContainer[rsKey] = ReadContext::ReadFont(rxProperties, SharedFontDescriptor());
> }
> 
>-
>-
>-
> namespace {
> 
> //===== ReadContext ===========================================================
>@@ -829,16 +747,10 @@ ReadContext::ReadContext (
>     SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
> }
> 
>-
>-
>-
> ReadContext::~ReadContext (void)
> {
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
>     const Reference<container::XHierarchicalNameAccess>& rxNode,
>     const OUString& rsFontPath,
>@@ -866,9 +778,6 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
>     return PresenterTheme::SharedFontDescriptor();
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
>     const Reference<beans::XPropertySet>& rxProperties,
>     const PresenterTheme::SharedFontDescriptor& rpDefault)
>@@ -889,9 +798,6 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
>     return pDescriptor;
> }
> 
>-
>-
>-
> Any ReadContext::GetByName (
>     const Reference<container::XNameAccess>& rxNode,
>     const OUString& rsName) const
>@@ -903,9 +809,6 @@ Any ReadContext::GetByName (
>         return Any();
> }
> 
>-
>-
>-
> ::boost::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
>     PresenterConfigurationAccess& rConfiguration,
>     const OUString& rsThemeName)
>@@ -958,9 +861,6 @@ Any ReadContext::GetByName (
>     return pTheme;
> }
> 
>-
>-
>-
> BorderSize ReadContext::ReadBorderSize (const Reference<container::XNameAccess>& rxNode)
> {
>     BorderSize aBorderSize;
>@@ -976,18 +876,12 @@ BorderSize ReadContext::ReadBorderSize (const Reference<container::XNameAccess>&
>     return aBorderSize;
> }
> 
>-
>-
>-
> void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier)
> {
>     // Get base path to bitmaps.
>     msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier);
> }
> 
>-
>-
>-
> //===== PaneStyleContainer ====================================================
> 
> void PaneStyleContainer::Read (
>@@ -1017,9 +911,6 @@ void PaneStyleContainer::Read (
>     }
> }
> 
>-
>-
>-
> void PaneStyleContainer::ProcessPaneStyle(
>     ReadContext& rReadContext,
>     const OUString& rsKey,
>@@ -1079,9 +970,6 @@ void PaneStyleContainer::ProcessPaneStyle(
>     push_back(pStyle);
> }
> 
>-
>-
>-
> SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) const
> {
>     const_iterator iEnd (end());
>@@ -1091,9 +979,6 @@ SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) c
>     return SharedPaneStyle();
> }
> 
>-
>-
>-
> //===== PaneStyle =============================================================
> 
> PaneStyle::PaneStyle (void)
>@@ -1106,16 +991,10 @@ PaneStyle::PaneStyle (void)
> {
> }
> 
>-
>-
>-
> PaneStyle::~PaneStyle (void)
> {
> }
> 
>-
>-
>-
> void PaneStyle::UpdateBorderSize (BorderSize& rBorderSize, bool bInner)
> {
>     if (mpParentStyle.get() != NULL)
>@@ -1132,9 +1011,6 @@ void PaneStyle::UpdateBorderSize (BorderSize& rBorderSize, bool bInner)
>         rBorderSize.mnBottom = rThisBorderSize.mnBottom;
> }
> 
>-
>-
>-
> const SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) const
> {
>     if (mpBitmaps.get() != NULL)
>@@ -1150,9 +1026,6 @@ const SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName)
>         return SharedBitmapDescriptor();
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor PaneStyle::GetFont (void) const
> {
>     if (mpFont.get() != NULL)
>@@ -1163,9 +1036,6 @@ PresenterTheme::SharedFontDescriptor PaneStyle::GetFont (void) const
>         return PresenterTheme::SharedFontDescriptor();
> }
> 
>-
>-
>-
> //===== ViewStyleContainer ====================================================
> 
> void ViewStyleContainer::Read (
>@@ -1188,9 +1058,6 @@ void ViewStyleContainer::Read (
>     }
> }
> 
>-
>-
>-
> void ViewStyleContainer::ProcessViewStyle(
>     ReadContext& rReadContext,
>     const Reference<beans::XPropertySet>& rxProperties)
>@@ -1240,9 +1107,6 @@ void ViewStyleContainer::ProcessViewStyle(
>     push_back(pStyle);
> }
> 
>-
>-
>-
> SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) const
> {
>     const_iterator iEnd (end());
>@@ -1252,9 +1116,6 @@ SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) c
>     return SharedViewStyle();
> }
> 
>-
>-
>-
> //===== ViewStyle =============================================================
> 
> ViewStyle::ViewStyle (void)
>@@ -1265,16 +1126,10 @@ ViewStyle::ViewStyle (void)
> {
> }
> 
>-
>-
>-
> ViewStyle::~ViewStyle (void)
> {
> }
> 
>-
>-
>-
> const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) const
> {
>     if (rsBitmapName == A2S("Background"))
>@@ -1283,9 +1138,6 @@ const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName)
>         return SharedBitmapDescriptor();
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor ViewStyle::GetFont (void) const
> {
>     if (mpFont.get() != NULL)
>@@ -1296,9 +1148,6 @@ PresenterTheme::SharedFontDescriptor ViewStyle::GetFont (void) const
>         return PresenterTheme::SharedFontDescriptor();
> }
> 
>-
>-
>-
> //===== StyleAssociationContainer =============================================
> 
> void StyleAssociationContainer::Read (
>@@ -1323,9 +1172,6 @@ void StyleAssociationContainer::Read (
>     }
> }
> 
>-
>-
>-
> OUString StyleAssociationContainer::GetStyleName (const OUString& rsResourceName) const
> {
>     StyleAssociations::const_iterator iAssociation (maStyleAssociations.find(rsResourceName));
>@@ -1335,9 +1181,6 @@ OUString StyleAssociationContainer::GetStyleName (const OUString& rsResourceName
>         return OUString();
> }
> 
>-
>-
>-
> void StyleAssociationContainer::ProcessStyleAssociation(
>     ReadContext& rReadContext,
>     const OUString& rsKey,
>@@ -1358,9 +1201,6 @@ void StyleAssociationContainer::ProcessStyleAssociation(
>     }
> }
> 
>-
>-
>-
> } // end of anonymous namespace
> 
> } } // end of namespace ::sdext::presenter
>diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
>index ef40599..6c5f8d9 100644
>--- a/sdext/source/presenter/PresenterTimer.cxx
>+++ b/sdext/source/presenter/PresenterTimer.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterTimer.hxx"
> #include <osl/doublecheckedlocking.h>
> #include <osl/thread.hxx>
>@@ -62,7 +61,6 @@ public:
> 
> typedef ::boost::shared_ptr<TimerTask> SharedTimerTask;
> 
>-
> class TimerTaskComparator
> {
> public:
>@@ -74,9 +72,6 @@ public:
>     }
> };
> 
>-
>-
>-
> /** Queue all scheduled tasks and process them when their time has come.
> */
> class TimerScheduler
>@@ -128,7 +123,6 @@ private:
> 
> } // end of anonymous namespace
> 
>-
> //===== PresenterTimer ========================================================
> 
> sal_Int32 PresenterTimer::ScheduleSingleTaskAbsolute (
>@@ -140,9 +134,6 @@ sal_Int32 PresenterTimer::ScheduleSingleTaskAbsolute (
>     return pTask->mnTaskId;
> }
> 
>-
>-
>-
> sal_Int32 PresenterTimer::ScheduleRepeatedTask (
>     const Task& rTask,
>     const sal_Int64 nDelay,
>@@ -163,17 +154,11 @@ sal_Int32 PresenterTimer::ScheduleRepeatedTask (
>     return NotAValidTaskId;
> }
> 
>-
>-
>-
> void PresenterTimer::CancelTask (const sal_Int32 nTaskId)
> {
>     return TimerScheduler::Instance()->CancelTask(nTaskId);
> }
> 
>-
>-
>-
> //===== TimerScheduler ========================================================
> 
> ::boost::shared_ptr<TimerScheduler> TimerScheduler::mpInstance;
>@@ -201,18 +186,12 @@ sal_Int32 TimerScheduler::mnTaskId = PresenterTimer::NotAValidTaskId;
>     return pInstance;
> }
> 
>-
>-
>-
> void TimerScheduler::Release (void)
> {
>     ::osl::MutexGuard aGuard (maInstanceMutex);
>     mpInstance.reset();
> }
> 
>-
>-
>-
> TimerScheduler::TimerScheduler (void)
>     : maTaskContainerMutex(),
>       maScheduledTasks(),
>@@ -222,15 +201,10 @@ TimerScheduler::TimerScheduler (void)
> {
> }
> 
>-
>-
>-
> TimerScheduler::~TimerScheduler (void)
> {
> }
> 
>-
>-
> SharedTimerTask TimerScheduler::CreateTimerTask (
>     const PresenterTimer::Task& rTask,
>     const TimeValue& rDueTime,
>@@ -239,9 +213,6 @@ SharedTimerTask TimerScheduler::CreateTimerTask (
>     return SharedTimerTask(new TimerTask(rTask, rDueTime, nRepeatIntervall, ++mnTaskId));
> }
> 
>-
>-
>-
> void TimerScheduler::ScheduleTask (const SharedTimerTask& rpTask)
> {
>     if (rpTask.get() == NULL)
>@@ -259,9 +230,6 @@ void TimerScheduler::ScheduleTask (const SharedTimerTask& rpTask)
>     }
> }
> 
>-
>-
>-
> void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
> {
>     // Set of scheduled tasks is sorted after their due times, not their
>@@ -300,9 +268,6 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL TimerScheduler::run (void)
> {
>     while (mbIsRunning)
>@@ -379,17 +344,11 @@ void SAL_CALL TimerScheduler::run (void)
>     }
> }
> 
>-
>-
>-
> void SAL_CALL TimerScheduler::onTerminated (void)
> {
>     Release();
> }
> 
>-
>-
>-
> bool TimerScheduler::GetCurrentTime (TimeValue& rCurrentTime)
> {
>     TimeValue aSystemTime;
>@@ -398,9 +357,6 @@ bool TimerScheduler::GetCurrentTime (TimeValue& rCurrentTime)
>     return false;
> }
> 
>-
>-
>-
> sal_Int64 TimerScheduler::GetTimeDifference (
>     const TimeValue& rTargetTime,
>     const TimeValue& rCurrentTime)
>@@ -408,9 +364,6 @@ sal_Int64 TimerScheduler::GetTimeDifference (
>     return ConvertFromTimeValue(rTargetTime) - ConvertFromTimeValue(rCurrentTime);
> }
> 
>-
>-
>-
> void TimerScheduler::ConvertToTimeValue (
>     TimeValue& rTimeValue,
>     const sal_Int64 nTimeDifference)
>@@ -419,18 +372,12 @@ void TimerScheduler::ConvertToTimeValue (
>     rTimeValue.Nanosec = sal::static_int_cast<sal_Int32>(nTimeDifference % 1000000000L);
> }
> 
>-
>-
>-
> sal_Int64 TimerScheduler::ConvertFromTimeValue (
>     const TimeValue& rTimeValue)
> {
>     return sal_Int64(rTimeValue.Seconds) * 1000000000L + rTimeValue.Nanosec;
> }
> 
>-
>-
>-
> //===== TimerTask =============================================================
> 
> namespace {
>@@ -450,12 +397,8 @@ TimerTask::TimerTask (
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== PresenterTimer ========================================================
> 
>-
> ::rtl::Reference<PresenterClockTimer> PresenterClockTimer::mpInstance;
> 
> ::rtl::Reference<PresenterClockTimer> PresenterClockTimer::Instance (
>@@ -476,9 +419,6 @@ TimerTask::TimerTask (
>     return pTimer;
> }
> 
>-
>-
>-
> PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rxContext)
>     : PresenterClockTimerInterfaceBase(m_aMutex),
>       maListeners(),
>@@ -497,9 +437,6 @@ PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rx
>             UNO_QUERY_THROW);
> }
> 
>-
>-
>-
> PresenterClockTimer::~PresenterClockTimer (void)
> {
>     if (mnTimerTaskId != PresenterTimer::NotAValidTaskId)
>@@ -514,9 +451,6 @@ PresenterClockTimer::~PresenterClockTimer (void)
>     mxRequestCallback = NULL;
> }
> 
>-
>-
>-
> void PresenterClockTimer::AddListener (const SharedListener& rListener)
> {
>     osl::MutexGuard aGuard (maMutex);
>@@ -533,9 +467,6 @@ void PresenterClockTimer::AddListener (const SharedListener& rListener)
>     }
> }
> 
>-
>-
>-
> void PresenterClockTimer::RemoveListener (const SharedListener& rListener)
> {
>     osl::MutexGuard aGuard (maMutex);
>@@ -558,9 +489,6 @@ void PresenterClockTimer::RemoveListener (const SharedListener& rListener)
>     }
> }
> 
>-
>-
>-
> oslDateTime PresenterClockTimer::GetCurrentTime (void)
> {
>     TimeValue aCurrentTime;
>@@ -570,9 +498,6 @@ oslDateTime PresenterClockTimer::GetCurrentTime (void)
>     return aDateTime;
> }
> 
>-
>-
>-
> void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime)
> {
>     css::uno::Reference<css::awt::XRequestCallback> xRequestCallback;
>@@ -606,9 +531,6 @@ void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime)
>         xRequestCallback->addCallback(xCallback, Any());
> }
> 
>-
>-
>-
> //----- XCallback -------------------------------------------------------------
> 
> void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData)
>@@ -640,8 +562,6 @@ void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData)
>     }
> }
> 
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
>index 601b27e..f674a03 100644
>--- a/sdext/source/presenter/PresenterTimer.hxx
>+++ b/sdext/source/presenter/PresenterTimer.hxx
>@@ -76,8 +76,6 @@ public:
>     static void CancelTask (const sal_Int32 nTaskId);
> };
> 
>-
>-
> typedef cppu::WeakComponentImplHelper1<
>     css::awt::XCallback
>     > PresenterClockTimerInterfaceBase;
>@@ -126,10 +124,6 @@ private:
>     void CheckCurrentTime (const TimeValue& rCurrentTime);
> };
> 
>-
>-
>-
>-
> } } // end of namespace ::sdext::presenter
> 
> #endif
>diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
>index 19abfd8..905c2f3 100644
>--- a/sdext/source/presenter/PresenterToolBar.cxx
>+++ b/sdext/source/presenter/PresenterToolBar.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterToolBar.hxx"
> 
> #include "PresenterBitmapContainer.hxx"
>@@ -125,7 +124,6 @@ namespace {
> 
> }  // end of anonymous namespace
> 
>-
> class PresenterToolBar::Context
>     : private ::boost::noncopyable
> {
>@@ -135,9 +133,6 @@ public:
>     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
> };
> 
>-
>-
>-
> //===== PresenterToolBar::Element =============================================
> 
> namespace {
>@@ -217,15 +212,11 @@ namespace {
> 
> } // end of anonymous namespace
> 
>-
> class PresenterToolBar::ElementContainerPart
>     : public ::std::vector<rtl::Reference<Element> >
> {
> };
> 
>-
>-
>-
> //===== Button ================================================================
> 
> namespace {
>@@ -264,9 +255,6 @@ namespace {
>         PresenterBitmapDescriptor::Mode GetMode (void) const;
>     };
> 
>-
>-
>-
> //===== Label =================================================================
> 
>     class Label : public Element
>@@ -285,10 +273,8 @@ namespace {
>             const Reference<rendering::XCanvas>& rxCanvas);
>     };
> 
>-
> // Some specialized controls.
> 
>-
>     class TimeFormatter
>     {
>     public:
>@@ -388,8 +374,6 @@ namespace {
>     };
> } // end of anonymous namespace
> 
>-
>-
> //===== PresenterToolBar ======================================================
> 
> PresenterToolBar::PresenterToolBar (
>@@ -414,9 +398,6 @@ PresenterToolBar::PresenterToolBar (
> {
> }
> 
>-
>-
>-
> void PresenterToolBar::Initialize (
>     const ::rtl::OUString& rsConfigurationPath)
> {
>@@ -450,16 +431,10 @@ void PresenterToolBar::Initialize (
>     }
> }
> 
>-
>-
>-
> PresenterToolBar::~PresenterToolBar (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterToolBar::disposing (void)
> {
>     if (mxWindow.is())
>@@ -496,9 +471,6 @@ void SAL_CALL PresenterToolBar::disposing (void)
>     maElementContainer.clear();
> }
> 
>-
>-
>-
> void PresenterToolBar::InvalidateArea (
>     const awt::Rectangle& rRepaintBox,
>     const bool bSynchronous)
>@@ -1189,9 +1161,6 @@ Element::~Element (void)
> {
> }
> 
>-
>-
>-
> void Element::SetModes (
>     const SharedElementMode& rpNormalMode,
>     const SharedElementMode& rpMouseOverMode,
>@@ -1205,16 +1174,10 @@ void Element::SetModes (
>     mpMode = rpNormalMode;
> }
> 
>-
>-
>-
> void Element::disposing (void)
> {
> }
> 
>-
>-
>-
> awt::Size Element::GetBoundingSize (
>     const Reference<rendering::XCanvas>& rxCanvas)
> {
>@@ -1222,40 +1185,26 @@ awt::Size Element::GetBoundingSize (
>     return maSize;
> }
> 
>-
>-
>-
> awt::Rectangle Element::GetBoundingBox (void) const
> {
>     return awt::Rectangle(maLocation.X,maLocation.Y, maSize.Width, maSize.Height);
> }
> 
>-
>-
>-
> void Element::CurrentSlideHasChanged (void)
> {
>     UpdateState();
> }
> 
>-
>-
>-
> void Element::SetLocation (const awt::Point& rLocation)
> {
>     maLocation = rLocation;
> }
> 
>-
>-
> void Element::SetSize (const geometry::RealSize2D& rSize)
> {
>     maSize = awt::Size(sal_Int32(0.5+rSize.Width), sal_Int32(0.5+rSize.Height));
> }
> 
>-
>-
>-
> bool Element::SetState (
>     const bool bIsOver,
>     const bool bIsPressed)
>@@ -1307,18 +1256,12 @@ bool Element::SetState (
>     return bModified;
> }
> 
>-
>-
>-
> void Element::Invalidate (const bool bSynchronous)
> {
>     OSL_ASSERT(mpToolBar.is());
>     mpToolBar->InvalidateArea(GetBoundingBox(), bSynchronous);
> }
> 
>-
>-
>-
> bool Element::IsOutside (const awt::Rectangle& rBox)
> {
>     if (rBox.X >= maLocation.X+maSize.Width)
>@@ -1333,24 +1276,16 @@ bool Element::IsOutside (const awt::Rectangle& rBox)
>         return false;
> }
> 
>-
>-
> bool Element::IsEnabled (void) const
> {
>     return mbIsEnabled;
> }
> 
>-
>-
>-
> bool Element::IsFilling (void) const
> {
>     return false;
> }
> 
>-
>-
>-
> void Element::UpdateState (void)
> {
>     OSL_ASSERT(mpToolBar.get() != NULL);
>@@ -1368,9 +1303,6 @@ void Element::UpdateState (void)
>     }
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent)
>@@ -1379,9 +1311,6 @@ void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent)
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- document::XEventListener ----------------------------------------------
> 
> void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent)
>@@ -1391,9 +1320,6 @@ void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent)
>     UpdateState();
> }
> 
>-
>-
>-
> //----- frame::XStatusListener ------------------------------------------------
> 
> void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEvent)
>@@ -1414,9 +1340,6 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== ElementMode ===========================================================
> 
> namespace {
>@@ -1428,9 +1351,6 @@ ElementMode::ElementMode (void)
> {
> }
> 
>-
>-
>-
> void ElementMode::ReadElementMode (
>     const Reference<beans::XPropertySet>& rxElementProperties,
>     const OUString& rsModeName,
>@@ -1490,9 +1410,6 @@ void ElementMode::ReadElementMode (
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== Button ================================================================
> 
> namespace {
>@@ -1505,9 +1422,6 @@ namespace {
>     return ::rtl::Reference<Element>(pElement.get());
> }
> 
>-
>-
>-
> Button::Button (
>     const ::rtl::Reference<PresenterToolBar>& rpToolBar)
>     : Element(rpToolBar),
>@@ -1518,25 +1432,16 @@ Button::Button (
>     OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
> }
> 
>-
>-
>-
> Button::~Button (void)
> {
> }
> 
>-
>-
>-
> void Button::Initialize (void)
> {
>     mpToolBar->GetPresenterController()->GetWindowManager()->AddLayoutListener(this);
>     mbIsListenerRegistered = true;
> }
> 
>-
>-
>-
> void Button::disposing (void)
> {
>     OSL_ASSERT(mpToolBar.get() != NULL);
>@@ -1552,9 +1457,6 @@ void Button::disposing (void)
>     Element::disposing();
> }
> 
>-
>-
>-
> void Button::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState)
>@@ -1582,9 +1484,6 @@ void Button::Paint (
>     mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), aOffset);
> }
> 
>-
>-
>-
> awt::Size Button::CreateBoundingSize (
>     const Reference<rendering::XCanvas>& rxCanvas)
> {
>@@ -1609,9 +1508,6 @@ awt::Size Button::CreateBoundingSize (
>         return awt::Size(nTextWidth,nTextHeight);
> }
> 
>-
>-
>-
> void Button::PaintIcon (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const sal_Int32 nTextHeight,
>@@ -1636,9 +1532,6 @@ void Button::PaintIcon (
>     }
> }
> 
>-
>-
>-
> PresenterBitmapDescriptor::Mode Button::GetMode (void) const
> {
>     if ( ! IsEnabled())
>@@ -1651,9 +1544,6 @@ PresenterBitmapDescriptor::Mode Button::GetMode (void) const
>         return PresenterBitmapDescriptor::Normal;
> }
> 
>-
>-
>-
> //----- lang::XEventListener --------------------------------------------------
> 
> void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent)
>@@ -1666,9 +1556,6 @@ void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent)
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== PresenterToolBar::Label ===============================================
> 
> namespace {
>@@ -1678,9 +1565,6 @@ Label::Label (const ::rtl::Reference<PresenterToolBar>& rpToolBar)
> {
> }
> 
>-
>-
>-
> awt::Size Label::CreateBoundingSize (
>     const Reference<rendering::XCanvas>& rxCanvas)
> {
>@@ -1693,10 +1577,6 @@ awt::Size Label::CreateBoundingSize (
>         sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1));
> }
> 
>-
>-
>-
>-
> void Label::SetText (const OUString& rsText)
> {
>     OSL_ASSERT(mpToolBar.get() != NULL);
>@@ -1715,9 +1595,6 @@ void Label::SetText (const OUString& rsText)
>         Invalidate(false);
> }
> 
>-
>-
>-
> void Label::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState)
>@@ -1729,9 +1606,6 @@ void Label::Paint (
>     mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), awt::Point(0,0));
> }
> 
>-
>-
>-
> bool Label::SetState (const bool bIsOver, const bool bIsPressed)
> {
>     // For labels there is no mouse over effect.
>@@ -1742,9 +1616,6 @@ bool Label::SetState (const bool bIsOver, const bool bIsPressed)
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== Text ==================================================================
> 
> namespace {
>@@ -1755,18 +1626,12 @@ Text::Text (void)
> {
> }
> 
>-
>-
>-
> Text::Text (const Text& rText)
>     : msText(rText.msText),
>       mpFont(rText.mpFont)
> {
> }
> 
>-
>-
>-
> Text::Text (
>     const OUString& rsText,
>     const PresenterTheme::SharedFontDescriptor& rpFont)
>@@ -1775,33 +1640,21 @@ Text::Text (
> {
> }
> 
>-
>-
>-
> void Text::SetText (const OUString& rsText)
> {
>     msText = rsText;
> }
> 
>-
>-
>-
> OUString Text::GetText (void) const
> {
>     return msText;
> }
> 
>-
>-
>-
> PresenterTheme::SharedFontDescriptor Text::GetFont (void) const
> {
>     return mpFont;
> }
> 
>-
>-
>-
> void Text::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState,
>@@ -1849,9 +1702,6 @@ void Text::Paint (
>         rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
> }
> 
>-
>-
>-
> geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanvas>& rxCanvas)
> {
>     if (mpFont.get() != NULL && !msText.isEmpty())
>@@ -1872,9 +1722,6 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv
>     return geometry::RealRectangle2D(0,0,0,0);
> }
> 
>-
>-
>-
> //===== TimeFormatter =========================================================
> 
> TimeFormatter::TimeFormatter (void)
>@@ -1884,9 +1731,6 @@ TimeFormatter::TimeFormatter (void)
> {
> }
> 
>-
>-
>-
> OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
> {
>     ::rtl::OUStringBuffer sText;
>@@ -1930,9 +1774,6 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
>     return sText.makeStringAndClear();
> }
> 
>-
>-
>-
> //===== TimeLabel =============================================================
> 
> TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar)
>@@ -1941,27 +1782,18 @@ TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar)
> {
> }
> 
>-
>-
>-
> void SAL_CALL TimeLabel::disposing (void)
> {
>     PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->RemoveListener(mpListener);
>     mpListener.reset();
> }
> 
>-
>-
>-
> void TimeLabel::ConnectToTimer (void)
> {
>     mpListener.reset(new Listener(this));
>     PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->AddListener(mpListener);
> }
> 
>-
>-
>-
> //===== CurrentTimeLabel ======================================================
> 
> ::rtl::Reference<Element> CurrentTimeLabel::Create (
>@@ -1972,16 +1804,10 @@ void TimeLabel::ConnectToTimer (void)
>     return ::rtl::Reference<Element>(pElement.get());
> }
> 
>-
>-
>-
> CurrentTimeLabel::~CurrentTimeLabel (void)
> {
> }
> 
>-
>-
>-
> CurrentTimeLabel::CurrentTimeLabel (
>     const ::rtl::Reference<PresenterToolBar>& rpToolBar)
>     : TimeLabel(rpToolBar),
>@@ -1989,18 +1815,12 @@ CurrentTimeLabel::CurrentTimeLabel (
> {
> }
> 
>-
>-
>-
> void CurrentTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime)
> {
>     SetText(maTimeFormatter.FormatTime(rCurrentTime));
>     Invalidate(false);
> }
> 
>-
>-
>-
> void CurrentTimeLabel::SetModes (
>     const SharedElementMode& rpNormalMode,
>     const SharedElementMode& rpMouseOverMode,
>@@ -2011,9 +1831,6 @@ void CurrentTimeLabel::SetModes (
>     SetText(maTimeFormatter.FormatTime(PresenterClockTimer::GetCurrentTime()));
> }
> 
>-
>-
>-
> //===== PresentationTimeLabel =================================================
> 
> ::rtl::Reference<Element> PresentationTimeLabel::Create (
>@@ -2024,16 +1841,10 @@ void CurrentTimeLabel::SetModes (
>     return ::rtl::Reference<Element>(pElement.get());
> }
> 
>-
>-
>-
> PresentationTimeLabel::~PresentationTimeLabel (void)
> {
> }
> 
>-
>-
>-
> PresentationTimeLabel::PresentationTimeLabel (
>     const ::rtl::Reference<PresenterToolBar>& rpToolBar)
>     : TimeLabel(rpToolBar),
>@@ -2044,9 +1855,6 @@ PresentationTimeLabel::PresentationTimeLabel (
>     maStartTimeValue.Nanosec = 0;
> }
> 
>-
>-
>-
> void PresentationTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime)
> {
>     TimeValue aCurrentTimeValue;
>@@ -2076,8 +1884,6 @@ void PresentationTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime)
>     }
> }
> 
>-
>-
> void PresentationTimeLabel::SetModes (
>     const SharedElementMode& rpNormalMode,
>     const SharedElementMode& rpMouseOverMode,
>@@ -2093,9 +1899,6 @@ void PresentationTimeLabel::SetModes (
>     }
> }
> 
>-
>-
>-
> //===== VerticalSeparator =====================================================
> 
> VerticalSeparator::VerticalSeparator (
>@@ -2104,9 +1907,6 @@ VerticalSeparator::VerticalSeparator (
> {
> }
> 
>-
>-
>-
> void VerticalSeparator::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState)
>@@ -2138,9 +1938,6 @@ void VerticalSeparator::Paint (
>         aRenderState);
> }
> 
>-
>-
>-
> awt::Size VerticalSeparator::CreateBoundingSize (
>     const Reference<rendering::XCanvas>& rxCanvas)
> {
>@@ -2148,17 +1945,11 @@ awt::Size VerticalSeparator::CreateBoundingSize (
>     return awt::Size(1,20);
> }
> 
>-
>-
>-
> bool VerticalSeparator::IsFilling (void) const
> {
>     return true;
> }
> 
>-
>-
>-
> //===== HorizontalSeparator ===================================================
> 
> HorizontalSeparator::HorizontalSeparator (
>@@ -2167,9 +1958,6 @@ HorizontalSeparator::HorizontalSeparator (
> {
> }
> 
>-
>-
>-
> void HorizontalSeparator::Paint (
>     const Reference<rendering::XCanvas>& rxCanvas,
>     const rendering::ViewState& rViewState)
>@@ -2201,9 +1989,6 @@ void HorizontalSeparator::Paint (
>         aRenderState);
> }
> 
>-
>-
>-
> awt::Size HorizontalSeparator::CreateBoundingSize (
>     const Reference<rendering::XCanvas>& rxCanvas)
> {
>@@ -2211,20 +1996,13 @@ awt::Size HorizontalSeparator::CreateBoundingSize (
>     return awt::Size(20,1);
> }
> 
>-
>-
>-
> bool HorizontalSeparator::IsFilling (void) const
> {
>     return true;
> }
> 
>-
>-
>-
> } // end of anonymous namespace
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
>index fd9ed28..af698a3 100644
>--- a/sdext/source/presenter/PresenterToolBar.hxx
>+++ b/sdext/source/presenter/PresenterToolBar.hxx
>@@ -121,7 +121,6 @@ public:
>         disposing (const css::lang::EventObject& rEventObject)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XWindowListener
> 
>     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
>@@ -136,13 +135,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -157,7 +154,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseMotionListener
> 
>     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
>@@ -166,7 +162,6 @@ public:
>     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XDrawView
> 
>     virtual void SAL_CALL setCurrentPage (
>@@ -237,9 +232,6 @@ private:
>         throw (css::lang::DisposedException);
> };
> 
>-
>-
>-
> /** View for the PresenterToolBar.
> */
> class PresenterToolBarView
>@@ -259,20 +251,17 @@ public:
> 
>     ::rtl::Reference<PresenterToolBar> GetPresenterToolBar (void) const;
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // lang::XEventListener
> 
>     virtual void SAL_CALL
>         disposing (const css::lang::EventObject& rEventObject)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XResourceId
> 
>     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
>@@ -281,7 +270,6 @@ public:
>     virtual sal_Bool SAL_CALL isAnchorOnly (void)
>         throw (com::sun::star::uno::RuntimeException);
> 
>-
>     // XDrawView
> 
>     virtual void SAL_CALL setCurrentPage (
>diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx
>index 6f3f745..4ba65e3 100644
>--- a/sdext/source/presenter/PresenterUIPainter.cxx
>+++ b/sdext/source/presenter/PresenterUIPainter.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterUIPainter.hxx"
> 
> #include "PresenterCanvasHelper.hxx"
>diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx
>index 52cdd5d..b0224b6 100644
>--- a/sdext/source/presenter/PresenterUIPainter.hxx
>+++ b/sdext/source/presenter/PresenterUIPainter.hxx
>@@ -39,7 +39,6 @@ namespace css = ::com::sun::star;
> 
> namespace sdext { namespace presenter {
> 
>-
> /** Functions for painting UI elements.
> */
> class PresenterUIPainter
>diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
>index 9e27757..5e2a56e 100644
>--- a/sdext/source/presenter/PresenterViewFactory.cxx
>+++ b/sdext/source/presenter/PresenterViewFactory.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #include "PresenterViewFactory.hxx"
> #include "PresenterPaneContainer.hxx"
> #include "PresenterHelper.hxx"
>@@ -70,8 +69,6 @@ const ::rtl::OUString PresenterViewFactory::msSlideSorterURL(
> const ::rtl::OUString PresenterViewFactory::msHelpViewURL(
>     A2S("private:resource/view/Presenter/Help"));
> 
>-
>-
> //===== SimpleView ============================================================
> 
> namespace {
>@@ -96,8 +93,6 @@ private:
>     Reference<XResourceId> mxResourceId;
> };
> 
>-
>-
> /** By default the PresenterSlidePreview shows the preview of the current
>     slide.  This adapter class makes it display the preview of the next
>     slide.
>@@ -156,9 +151,6 @@ public:
> 
> } // end of anonymous namespace
> 
>-
>-
>-
> //===== PresenterViewFactory ==============================================
> 
> PresenterViewFactory::PresenterViewFactory (
>@@ -174,9 +166,6 @@ PresenterViewFactory::PresenterViewFactory (
> {
> }
> 
>-
>-
>-
> Reference<drawing::framework::XResourceFactory> PresenterViewFactory::Create (
>     const Reference<uno::XComponentContext>& rxContext,
>     const Reference<frame::XController>& rxController,
>@@ -189,9 +178,6 @@ Reference<drawing::framework::XResourceFactory> PresenterViewFactory::Create (
>         static_cast<XWeak*>(pFactory.get()), UNO_QUERY);
> }
> 
>-
>-
>-
> void PresenterViewFactory::Register (const Reference<frame::XController>& rxController)
> {
>     try
>@@ -224,16 +210,10 @@ void PresenterViewFactory::Register (const Reference<frame::XController>& rxCont
>     }
> }
> 
>-
>-
>-
> PresenterViewFactory::~PresenterViewFactory (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterViewFactory::disposing (void)
>     throw (RuntimeException)
> {
>@@ -262,9 +242,6 @@ void SAL_CALL PresenterViewFactory::disposing (void)
>     }
> }
> 
>-
>-
>-
> //----- XViewFactory ----------------------------------------------------------
> 
> Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
>@@ -294,9 +271,6 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
>     return xView;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>& rxView)
>     throw (RuntimeException)
> {
>@@ -347,9 +321,6 @@ void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>&
>     }
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> Reference<XResource> PresenterViewFactory::GetViewFromCache(
>@@ -388,9 +359,6 @@ Reference<XResource> PresenterViewFactory::GetViewFromCache(
>     return NULL;
> }
> 
>-
>-
>-
> Reference<XResource> PresenterViewFactory::CreateView(
>     const Reference<XResourceId>& rxViewId,
>     const Reference<XPane>& rxAnchorPane)
>@@ -439,9 +407,6 @@ Reference<XResource> PresenterViewFactory::CreateView(
>     return Reference<XResource>(xView, UNO_QUERY);
> }
> 
>-
>-
>-
> Reference<XView> PresenterViewFactory::CreateSlideShowView(
>     const Reference<XResourceId>& rxViewId) const
> {
>@@ -471,9 +436,6 @@ Reference<XView> PresenterViewFactory::CreateSlideShowView(
>     return xView;
> }
> 
>-
>-
>-
> Reference<XView> PresenterViewFactory::CreateSlidePreviewView(
>     const Reference<XResourceId>& rxViewId,
>     const Reference<XPane>& rxAnchorPane) const
>@@ -503,9 +465,6 @@ Reference<XView> PresenterViewFactory::CreateSlidePreviewView(
>     return xView;
> }
> 
>-
>-
>-
> Reference<XView> PresenterViewFactory::CreateToolBarView(
>     const Reference<XResourceId>& rxViewId) const
> {
>@@ -516,9 +475,6 @@ Reference<XView> PresenterViewFactory::CreateToolBarView(
>         mpPresenterController);
> }
> 
>-
>-
>-
> Reference<XView> PresenterViewFactory::CreateNotesView(
>     const Reference<XResourceId>& rxViewId,
>     const Reference<XPane>& rxAnchorPane) const
>@@ -549,9 +505,6 @@ Reference<XView> PresenterViewFactory::CreateNotesView(
>     return xView;
> }
> 
>-
>-
>-
> Reference<XView> PresenterViewFactory::CreateSlideSorterView(
>     const Reference<XResourceId>& rxViewId) const
> {
>@@ -585,9 +538,6 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView(
>     return xView;
> }
> 
>-
>-
>-
> Reference<XView> PresenterViewFactory::CreateHelpView(
>     const Reference<XResourceId>& rxViewId) const
> {
>@@ -598,10 +548,6 @@ Reference<XView> PresenterViewFactory::CreateHelpView(
>         mpPresenterController));
> }
> 
>-
>-
>-
>-
> void PresenterViewFactory::ThrowIfDisposed (void) const
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -614,9 +560,6 @@ void PresenterViewFactory::ThrowIfDisposed (void) const
>     }
> }
> 
>-
>-
>-
> //===== CachablePresenterView =================================================
> 
> CachablePresenterView::CachablePresenterView (void)
>@@ -624,31 +567,20 @@ CachablePresenterView::CachablePresenterView (void)
> {
> }
> 
>-
>-
>-
> void CachablePresenterView::ActivatePresenterView (void)
> {
>     mbIsPresenterViewActive = true;
> }
> 
>-
>-
>-
> void CachablePresenterView::DeactivatePresenterView (void)
> {
>     mbIsPresenterViewActive = false;
> }
> 
>-
>-
>-
> void CachablePresenterView::ReleaseView (void)
> {
> }
> 
>-
>-
> } }
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
>index 5fab682..7d06be5 100644
>--- a/sdext/source/presenter/PresenterViewFactory.hxx
>+++ b/sdext/source/presenter/PresenterViewFactory.hxx
>@@ -78,9 +78,6 @@ protected:
>     CachablePresenterView (void);
> };
> 
>-
>-
>-
> /** Factory of the presenter screen specific views.  The supported set of
>     views includes:
>         a life view of the current slide,
>@@ -121,7 +118,6 @@ public:
>     virtual void SAL_CALL disposing (void)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XResourceFactory
> 
>     virtual css::uno::Reference<css::drawing::framework::XResource>
>diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
>index 065ed09..5dceffc 100644
>--- a/sdext/source/presenter/PresenterWindowManager.cxx
>+++ b/sdext/source/presenter/PresenterWindowManager.cxx
>@@ -26,7 +26,6 @@
>  *
>  ************************************************************************/
> 
>-
> #undef ENABLE_PANE_RESIZING
> //#define ENABLE_PANE_RESIZING
> 
>@@ -105,16 +104,10 @@ PresenterWindowManager::PresenterWindowManager (
>     UpdateWindowList();
> }
> 
>-
>-
>-
> PresenterWindowManager::~PresenterWindowManager (void)
> {
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::disposing (void)
> {
>     NotifyDisposing();
>@@ -141,9 +134,6 @@ void SAL_CALL PresenterWindowManager::disposing (void)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::SetParentPane (
>     const Reference<drawing::framework::XPane>& rxPane)
> {
>@@ -181,9 +171,6 @@ void PresenterWindowManager::SetParentPane (
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme)
> {
>     mpTheme = rpTheme;
>@@ -241,18 +228,12 @@ void PresenterWindowManager::SetPanePosSizeAbsolute (
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::SetPaneBorderPainter (
>     const ::rtl::Reference<PresenterPaneBorderPainter>& rPainter)
> {
>     mpPaneBorderPainter = rPainter;
> }
> 
>-
>-
>-
> //----- XWindowListener -------------------------------------------------------
> 
> void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEvent)
>@@ -276,9 +257,6 @@ void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEv
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEvent)
>     throw (RuntimeException)
> {
>@@ -293,27 +271,18 @@ void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEven
>     }
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::windowShown (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEvent)
>     throw (RuntimeException)
> {
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XPaintListener --------------------------------------------------------
> 
> void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent)
>@@ -347,9 +316,6 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent
>     }
> }
> 
>-
>-
>-
> //----- XMouseListener --------------------------------------------------------
> 
> void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -359,9 +325,6 @@ void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent&
>     mbIsMouseClickPending = true;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -376,9 +339,6 @@ void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent&
> #endif
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -386,9 +346,6 @@ void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent&
>     mbIsMouseClickPending = false;
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& rEvent)
>     throw(css::uno::RuntimeException)
> {
>@@ -396,9 +353,6 @@ void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& r
>     mbIsMouseClickPending = false;
> }
> 
>-
>-
>-
> //----- XFocusListener --------------------------------------------------------
> 
> void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& rEvent)
>@@ -410,9 +364,6 @@ void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& r
>         rEvent.Source.get());
> }
> 
>-
>-
>-
> void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEvent)
>     throw (css::uno::RuntimeException)
> {
>@@ -420,9 +371,6 @@ void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEv
>     (void)rEvent;
> }
> 
>-
>-
>-
> //----- XEventListener --------------------------------------------------------
> 
> void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent)
>@@ -436,9 +384,6 @@ void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent
>     }
> }
> 
>-
>-
>-
> //-----------------------------------------------------------------------------
> 
> bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
>@@ -497,9 +442,6 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
>     return bChildInvalidated;
> }
> 
>-
>-
>-
> void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
> {
>     OSL_ASSERT(mpPresenterController.get() != NULL);
>@@ -521,9 +463,6 @@ void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::SetSlideSorterState (bool bIsActive)
> {
>     if (mbIsSlideSorterActive != bIsActive)
>@@ -590,9 +529,6 @@ void PresenterWindowManager::SetViewMode (const ViewMode eMode)
>     StoreViewMode(eMode);
> }
> 
>-
>-
>-
> PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode (void) const
> {
>     if (mbIsHelpViewActive)
>@@ -605,9 +541,6 @@ PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode (void) cons
>         return VM_Standard;
> }
> 
>-
>-
>-
> void PresenterWindowManager::RestoreViewMode (void)
> {
>     sal_Int32 nMode (0);
>@@ -633,9 +566,6 @@ void PresenterWindowManager::RestoreViewMode (void)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
> {
>     try
>@@ -670,18 +600,12 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::AddLayoutListener (
>     const Reference<document::XEventListener>& rxListener)
> {
>     maLayoutListeners.push_back(rxListener);
> }
> 
>-
>-
>-
> void PresenterWindowManager::RemoveLayoutListener (
>     const Reference<document::XEventListener>& rxListener)
> {
>@@ -698,9 +622,6 @@ void PresenterWindowManager::RemoveLayoutListener (
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::Layout (void)
> {
>     if (mxParentWindow.is() && ! mbIsLayouting)
>@@ -739,9 +660,6 @@ void PresenterWindowManager::Layout (void)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::LayoutStandardMode (void)
> {
>     awt::Rectangle aBox = mxParentWindow->getPosSize();
>@@ -770,7 +688,6 @@ void PresenterWindowManager::LayoutStandardMode (void)
>             aCurrentSlideOuterBox.Height);
>     }
> 
>-
>     // For the next slide view calculate the outer height from the outer
>     // width.  This takes into acount the slide aspect ratio and thus has to
>     // go over the inner pane size.
>@@ -791,9 +708,6 @@ void PresenterWindowManager::LayoutStandardMode (void)
>     LayoutToolBar();
> }
> 
>-
>-
>-
> void PresenterWindowManager::LayoutNotesMode (void)
> {
>     awt::Rectangle aBox = mxParentWindow->getPosSize();
>@@ -844,7 +758,6 @@ void PresenterWindowManager::LayoutNotesMode (void)
>             aCurrentSlideOuterBox.Height);
>     }
> 
>-
>     // For the next slide view calculate the outer height from the outer
>     // width.  This takes into acount the slide aspect ratio and thus has to
>     // go over the inner pane size.
>@@ -863,9 +776,6 @@ void PresenterWindowManager::LayoutNotesMode (void)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::LayoutSlideSorterMode (void)
> {
>     const geometry::RealRectangle2D aToolBarBox (LayoutToolBar());
>@@ -880,9 +790,6 @@ void PresenterWindowManager::LayoutSlideSorterMode (void)
>         aToolBarBox.Y1 - 2*nGap);
> }
> 
>-
>-
>-
> void PresenterWindowManager::LayoutHelpMode (void)
> {
>     const geometry::RealRectangle2D aToolBarBox (LayoutToolBar());
>@@ -899,9 +806,6 @@ void PresenterWindowManager::LayoutHelpMode (void)
>         aToolBarBox.Y1 - 2*nGap);
> }
> 
>-
>-
>-
> geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar (void)
> {
>     double nToolBarWidth (400);
>@@ -957,9 +861,6 @@ geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar (void)
>         nToolBarY + nToolBarHeight - 1);
> }
> 
>-
>-
>-
> awt::Size PresenterWindowManager::CalculatePaneSize (
>     const double nOuterWidth,
>     const OUString& rsPaneURL)
>@@ -985,9 +886,6 @@ awt::Size PresenterWindowManager::CalculatePaneSize (
>     return awt::Size(aOuterBox.Width, aOuterBox.Height);
> }
> 
>-
>-
>-
> void PresenterWindowManager::NotifyLayoutModeChange (void)
> {
>     document::EventObject aEvent;
>@@ -1015,9 +913,6 @@ void PresenterWindowManager::NotifyLayoutModeChange (void)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::NotifyDisposing (void)
> {
>     lang::EventObject aEvent;
>@@ -1078,9 +973,6 @@ void PresenterWindowManager::UpdateWindowSize (const Reference<awt::XWindow>& rx
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox)
> {
>     (void)rUpdateBox;
>@@ -1150,9 +1042,6 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox)
>     }
> }
> 
>-
>-
>-
> void PresenterWindowManager::ProvideBackgroundBitmap (void)
> {
>     if ( ! mxScaledBackgroundBitmap.is())
>@@ -1186,9 +1075,6 @@ void PresenterWindowManager::ProvideBackgroundBitmap (void)
>     }
> }
> 
>-
>-
>-
> Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolygon (void) const
> {
>     // Create a clip polygon that includes the whole update area but has the
>@@ -1227,9 +1113,6 @@ Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolyg
>     return xPolyPolygon;
> }
> 
>-
>-
>-
> void PresenterWindowManager::UpdateWindowList (void)
> {
> #ifdef ENABLE_PANE_RESIZING
>@@ -1281,33 +1164,21 @@ void PresenterWindowManager::UpdateWindowList (void)
> #endif
> }
> 
>-
>-
>-
> void PresenterWindowManager::Invalidate (void)
> {
>     mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow);
> }
> 
>-
>-
>-
> Reference<awt::XWindow> PresenterWindowManager::GetParentWindow (void) const
> {
>     return mxParentWindow;
> }
> 
>-
>-
>-
> Reference<rendering::XCanvas> PresenterWindowManager::GetParentCanvas (void) const
> {
>     return mxParentCanvas;
> }
> 
>-
>-
>-
> void PresenterWindowManager::Update (void)
> {
>     mxClipPolygon = NULL;
>@@ -1317,9 +1188,6 @@ void PresenterWindowManager::Update (void)
>     Invalidate();
> }
> 
>-
>-
>-
> void PresenterWindowManager::ThrowIfDisposed (void) const
>     throw (::com::sun::star::lang::DisposedException)
> {
>@@ -1332,8 +1200,6 @@ void PresenterWindowManager::ThrowIfDisposed (void) const
>     }
> }
> 
>-
>-
> namespace {
> 
> //===== ModeChangeAnimation ===================================================
>@@ -1362,12 +1228,8 @@ private:
>     Reference<rendering::XSpriteCanvas> mxCanvas;
> };
> 
>-
>-
>-
> } // end of anonymous namespace
> 
>-
> } } // end of namespace ::sdext::presenter
> 
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
>index 58d5563..3051c38 100644
>--- a/sdext/source/presenter/PresenterWindowManager.hxx
>+++ b/sdext/source/presenter/PresenterWindowManager.hxx
>@@ -69,7 +69,6 @@ namespace {
>     > PresenterWindowManagerInterfaceBase;
> }
> 
>-
> /** A simple manager of the positions of the panes of the presenter screen.
>     Uses relative coordinates of the four sides of each pane.  Allows panes
>     to be moved or resized with the mouse.
>@@ -143,13 +142,11 @@ public:
>     virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XPaintListener
> 
>     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XMouseListener
> 
>     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
>@@ -164,7 +161,6 @@ public:
>     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
>         throw(css::uno::RuntimeException);
> 
>-
>     // XFocusListener
> 
>     virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
>@@ -173,7 +169,6 @@ public:
>     virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
>         throw (css::uno::RuntimeException);
> 
>-
>     // XEventListener
> 
>     virtual void SAL_CALL disposing (
>-- 
>1.7.8.1
>

Actions: View

Attachments on bug 44635: 55487