remove un-used code, and make a start at rampant vspace wasting

12 files changed, 3 insertions, 393 deletions

diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 07a0e192b011..5dccb6cca5f2 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -52,16 +52,10 @@ PresenterCanvasHelper::PresenterCanvasHelper (void)
 {
 }
 
-
-
-
 PresenterCanvasHelper::~PresenterCanvasHelper (void)
 {
 }
 
-
-
-
 void PresenterCanvasHelper::Paint (
     const SharedBitmapDescriptor& rpBitmap,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -73,9 +67,6 @@ void PresenterCanvasHelper::Paint (
         maDefaultViewState, maDefaultRenderState);
 }
 
-
-
-
 void PresenterCanvasHelper::PaintRectangle (
     const SharedBitmapDescriptor& rpBitmap,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 0131e974e98e..5d6a900bcc57 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -95,35 +95,11 @@ void PresenterFrameworkObserver::RunOnUpdateEnd (
         rAction);
 }
 
-
-
-
-bool PresenterFrameworkObserver::HasResource (
-    const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
-    const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId)
-{
-    return rxController.is() && rxController->getResource(rxResourceId).is();
-}
-
-
-
-
 bool PresenterFrameworkObserver::True (void)
 {
     return true;
 }
 
-
-
-
-bool PresenterFrameworkObserver::False (void)
-{
-    return false;
-}
-
-
-
-
 void SAL_CALL PresenterFrameworkObserver::disposing (void)
 {
     if ( ! maAction.empty())
@@ -131,9 +107,6 @@ void SAL_CALL PresenterFrameworkObserver::disposing (void)
     Shutdown();
 }
 
-
-
-
 void PresenterFrameworkObserver::Shutdown (void)
 {
     maAction = Action();
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 3612f5471a8e..f0062b832cfc 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -94,20 +94,9 @@ private:
 
     void Shutdown (void);
 
-    /** Predicate that returns true when the specified resource is active
-        with respect to the given configuration controller.
-    */
-    static bool HasResource (
-        const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
-        const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId);
-
     /** Predicate that always returns true.
     */
     static bool True (void);
-
-    /** Predicate that always returns false.
-    */
-    static bool False (void);
 };
 
 
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 807503c44a7c..526d9d11ed5f 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -52,9 +52,6 @@ PresenterSprite::PresenterSprite (void)
 {
 }
 
-
-
-
 PresenterSprite::~PresenterSprite (void)
 {
     if (mxSprite.is())
@@ -67,9 +64,6 @@ PresenterSprite::~PresenterSprite (void)
     }
 }
 
-
-
-
 void PresenterSprite::SetFactory (
     const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory)
 {
@@ -82,9 +76,6 @@ void PresenterSprite::SetFactory (
     }
 }
 
-
-
-
 ::css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void)
 {
     ProvideSprite();
@@ -94,9 +85,6 @@ void PresenterSprite::SetFactory (
         return NULL;
 }
 
-
-
-
 void PresenterSprite::Show (void)
 {
     mbIsVisible = true;
@@ -106,9 +94,6 @@ void PresenterSprite::Show (void)
         ProvideSprite();
 }
 
-
-
-
 void PresenterSprite::Hide (void)
 {
     mbIsVisible = false;
@@ -116,19 +101,6 @@ void PresenterSprite::Hide (void)
         mxSprite->hide();
 }
 
-
-
-
-void PresenterSprite::SetPriority (const double nPriority)
-{
-    mnPriority = nPriority;
-    if (mxSprite.is())
-        mxSprite->setPriority(mnPriority);
-}
-
-
-
-
 void PresenterSprite::Resize (const css::geometry::RealSize2D& rSize)
 {
     maSize = rSize;
@@ -138,17 +110,11 @@ void PresenterSprite::Resize (const css::geometry::RealSize2D& rSize)
         ProvideSprite();
 }
 
-
-
-
 css::geometry::RealSize2D PresenterSprite::GetSize (void) const
 {
     return maSize;
 }
 
-
-
-
 void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation)
 {
     maLocation = rLocation;
@@ -166,17 +132,11 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation)
             );
 }
 
-
-
-
 css::geometry::RealPoint2D PresenterSprite::GetLocation (void) const
 {
     return maLocation;
 }
 
-
-
-
 void PresenterSprite::Transform (const css::geometry::AffineMatrix2D& rTransform)
 {
     maTransform = rTransform;
@@ -184,9 +144,6 @@ void PresenterSprite::Transform (const css::geometry::AffineMatrix2D& rTransform
         mxSprite->transform(maTransform);
 }
 
-
-
-
 void PresenterSprite::SetAlpha (const double nAlpha)
 {
     mnAlpha = nAlpha;
@@ -194,18 +151,12 @@ void PresenterSprite::SetAlpha (const double nAlpha)
         mxSprite->setAlpha(mnAlpha);
 }
 
-
-
-
 void PresenterSprite::Update (void)
 {
     if (mxSpriteFactory.is())
         mxSpriteFactory->updateScreen(sal_False);
 }
 
-
-
-
 void PresenterSprite::ProvideSprite (void)
 {
     if ( ! mxSprite.is()
@@ -235,9 +186,6 @@ void PresenterSprite::ProvideSprite (void)
     }
 }
 
-
-
-
 void PresenterSprite::DisposeSprite (void)
 {
     if (mxSprite.is())
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index c55d4dba42da..4ae4024274d0 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -63,8 +63,6 @@ public:
     void Show (void);
     void Hide (void);
 
-    void SetPriority (const double nPriority);
-
     void Resize (const css::geometry::RealSize2D& rSize);
     css::geometry::RealSize2D GetSize (void) const;
 
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index b30e441727c7..5bfbfd7d77d0 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -116,54 +116,6 @@ PresenterTextView::PresenterTextView (
         UNO_QUERY_THROW);
 }
 
-
-
-
-PresenterTextView::PresenterTextView (
-    const Reference<XComponentContext>& rxContext,
-    const Reference<rendering::XCanvas>& rxCanvas)
-    : mxCanvas(rxCanvas),
-      mbDoOuput(false),
-      mxBreakIterator(),
-      mxScriptTypeDetector(),
-      maLocation(0,0),
-      maSize(0,0),
-      mpFont(),
-      maParagraphs(),
-      mpCaret(new PresenterTextCaret(
-          ::boost::bind(&PresenterTextView::GetCaretBounds, this, _1, _2),
-          ::boost::function<void(const css::awt::Rectangle&)>())),
-      mnLeftOffset(0),
-      mnTopOffset(0),
-      maInvalidator(),
-      mbIsFormatPending(false),
-      mnCharacterCount(-1),
-      maTextChangeBroadcaster()
-{
-    Reference<lang::XMultiComponentFactory> xFactory (
-        rxContext->getServiceManager(), UNO_QUERY);
-    if ( ! xFactory.is())
-        return;
-
-    // Create the break iterator that we use to break text into lines.
-    mxBreakIterator = Reference<i18n::XBreakIterator>(
-        xFactory->createInstanceWithContext(
-            A2S("com.sun.star.i18n.BreakIterator"),
-            rxContext),
-        UNO_QUERY_THROW);
-
-    // Create the script type detector that is used to split paragraphs into
-    // portions of the same text direction.
-    mxScriptTypeDetector = Reference<i18n::XScriptTypeDetector>(
-        xFactory->createInstanceWithContext(
-            A2S("com.sun.star.i18n.ScriptTypeDetector"),
-            rxContext),
-        UNO_QUERY_THROW);
-}
-
-
-
-
 void PresenterTextView::SetText (const Reference<text::XText>& rxText)
 {
     maParagraphs.clear();
@@ -202,48 +154,12 @@ void PresenterTextView::SetText (const Reference<text::XText>& rxText)
     RequestFormat();
 }
 
-
-
-
-void PresenterTextView::SetText (const ::rtl::OUString& rsText)
-{
-    maParagraphs.clear();
-    mnCharacterCount = -1;
-
-    if ( ! mpFont || ! mpFont->PrepareFont(mxCanvas))
-        return;
-
-    sal_Int32 nCharacterCount (0);
-
-    SharedPresenterTextParagraph pParagraph (new PresenterTextParagraph(
-        0,
-        mxBreakIterator,
-        mxScriptTypeDetector,
-        rsText,
-        mpCaret));
-    pParagraph->SetupCellArray(mpFont);
-    pParagraph->SetCharacterOffset(nCharacterCount);
-    nCharacterCount += pParagraph->GetCharacterCount();
-    maParagraphs.push_back(pParagraph);
-
-    if (mpCaret)
-        mpCaret->HideCaret();
-
-    RequestFormat();
-}
-
-
-
-
 void PresenterTextView::SetTextChangeBroadcaster (
     const ::boost::function<void(void)>& rBroadcaster)
 {
     maTextChangeBroadcaster = rBroadcaster;
 }
 
-
-
-
 void PresenterTextView::SetLocation (const css::geometry::RealPoint2D& rLocation)
 {
     maLocation = rLocation;
@@ -260,18 +176,12 @@ void PresenterTextView::SetLocation (const css::geometry::RealPoint2D& rLocation
     }
 }
 
-
-
-
 void PresenterTextView::SetSize (const css::geometry::RealSize2D& rSize)
 {
     maSize = rSize;
     RequestFormat();
 }
 
-
-
-
 double PresenterTextView::GetTotalTextHeight (void)
 {
     double nTotalHeight (0);
@@ -295,18 +205,12 @@ double PresenterTextView::GetTotalTextHeight (void)
     return nTotalHeight;
 }
 
-
-
-
 void PresenterTextView::SetFont (const PresenterTheme::SharedFontDescriptor& rpFont)
 {
     mpFont = rpFont;
     RequestFormat();
 }
 
-
-
-
 void PresenterTextView::SetOffset(
     const double nLeft,
     const double nTop)
@@ -318,8 +222,6 @@ void PresenterTextView::SetOffset(
     SetLocation(maLocation);
 }
 
-
-
 void PresenterTextView::MoveCaret (
     const sal_Int32 nDistance,
     const sal_Int16 nTextType)
@@ -402,9 +304,6 @@ void PresenterTextView::MoveCaret (
     mpCaret->SetPosition(nParagraphIndex, nCharacterIndex);
 }
 
-
-
-
 void PresenterTextView::Paint (
     const css::awt::Rectangle& rUpdateBox)
 {
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index 66dd154b8fd0..062a24721466 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -246,15 +246,7 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const ::boost::function<void(const ::css::awt::Rectangle&)>& rInvalidator);
-    /** Create a new instance that does no output but only provides
-        geometric information to an accessibility object.
-    */
-    PresenterTextView (
-        const css::uno::Reference<css::uno::XComponentContext>& rxContext,
-        const css::uno::Reference<css::rendering::XCanvas>& rxCanvas);
-
     void SetText (const css::uno::Reference<css::text::XText>& rxText);
-    void SetText (const ::rtl::OUString& rsText);
     void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster);
 
     void SetLocation (const css::geometry::RealPoint2D& rLocation);
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 2b1505fa3139..7ed83c9a495e 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -573,25 +573,8 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
     return SharedFontDescriptor();
 }
 
-
-
-
 //===== FontDescriptor ========================================================
 
-PresenterTheme::FontDescriptor::FontDescriptor (void)
-    : msFamilyName(),
-      msStyleName(),
-      mnSize(12),
-      mnColor(0x00000000),
-      msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))),
-      mnXOffset(0),
-      mnYOffset(0)
-{
-}
-
-
-
-
 PresenterTheme::FontDescriptor::FontDescriptor (
     const ::boost::shared_ptr<FontDescriptor>& rpDescriptor)
     : msFamilyName(),
@@ -614,9 +597,6 @@ PresenterTheme::FontDescriptor::FontDescriptor (
     }
 }
 
-
-
-
 bool PresenterTheme::FontDescriptor::PrepareFont (
     const Reference<rendering::XCanvas>& rxCanvas)
 {
@@ -633,9 +613,6 @@ bool PresenterTheme::FontDescriptor::PrepareFont (
     return mxFont.is();
 }
 
-
-
-
 Reference<rendering::XCanvasFont> PresenterTheme::FontDescriptor::CreateFont (
     const Reference<rendering::XCanvas>& rxCanvas,
     const double nCellSize) const
@@ -658,9 +635,6 @@ Reference<rendering::XCanvasFont> PresenterTheme::FontDescriptor::CreateFont (
         geometry::Matrix2D(1,0,0,1));
 }
 
-
-
-
 double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize (
     const Reference<rendering::XCanvas>& rxCanvas,
     const double nDesignSize) const
@@ -688,9 +662,6 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize (
     return nDesignSize * nScale;
 }
 
-
-
-
 //===== Theme =================================================================
 
 PresenterTheme::Theme::Theme (
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index 14c647e728b7..b4b263efea41 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -84,13 +84,10 @@ public:
         const ::rtl::OUString& rsStyleName,
         const bool bOuter) const;
 
-    class FontDescriptor;
     class Theme;
-
     class FontDescriptor
     {
     public:
-        explicit FontDescriptor (void);
         explicit FontDescriptor (const ::boost::shared_ptr<FontDescriptor>& rpDescriptor);
 
         ::rtl::OUString msFamilyName;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index e72dfb616989..1ac909840836 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -509,31 +509,6 @@ void PresenterToolBar::InvalidateArea (
         bSynchronous);
 }
 
-
-
-
-sal_Int32 PresenterToolBar::GetCurrentSlideIndex (void)
-{
-    if (mxSlideShowController.is())
-        return mxSlideShowController->getCurrentSlideIndex();
-    else
-        return -1;
-}
-
-
-
-
-sal_Int32 PresenterToolBar::GetSlideCount (void)
-{
-    if (mxSlideShowController.is())
-        return mxSlideShowController->getSlideCount();
-    else
-        return 0;
-}
-
-
-
-
 void PresenterToolBar::RequestLayout (void)
 {
     mbIsLayoutPending = true;
@@ -541,9 +516,6 @@ void PresenterToolBar::RequestLayout (void)
     mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
 }
 
-
-
-
 geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
 {
     if (mbIsLayoutPending)
@@ -551,25 +523,16 @@ geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
     return maMinimalSize;
 }
 
-
-
-
 ::rtl::Reference<PresenterController> PresenterToolBar::GetPresenterController (void) const
 {
     return mpPresenterController;
 }
 
-
-
-
 Reference<XComponentContext> PresenterToolBar::GetComponentContext (void) const
 {
     return mxComponentContext;
 }
 
-
-
-
 //-----  lang::XEventListener -------------------------------------------------
 
 void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject)
@@ -579,9 +542,6 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject
         mxWindow = NULL;
 }
 
-
-
-
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent)
@@ -591,18 +551,12 @@ void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent)
     mbIsLayoutPending = true;
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::windowMoved (const awt::WindowEvent& rEvent)
     throw (RuntimeException)
 {
     (void)rEvent;
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject& rEvent)
     throw (RuntimeException)
 {
@@ -610,20 +564,13 @@ void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject& rEvent)
     mbIsLayoutPending = true;
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::windowHidden (const lang::EventObject& rEvent)
     throw (RuntimeException)
 {
     (void)rEvent;
 }
 
-
-
-
 //----- XPaintListener --------------------------------------------------------
-
 void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent)
     throw (RuntimeException)
 {
@@ -648,47 +595,31 @@ void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent)
         xSpriteCanvas->updateScreen(sal_False);
 }
 
-
-
-
 //----- XMouseListener --------------------------------------------------------
-
 void SAL_CALL PresenterToolBar::mousePressed (const css::awt::MouseEvent& rEvent)
     throw(css::uno::RuntimeException)
 {
     CheckMouseOver(rEvent, true, true);
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::mouseReleased (const css::awt::MouseEvent& rEvent)
     throw(css::uno::RuntimeException)
 {
     CheckMouseOver(rEvent, true);
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::mouseEntered (const css::awt::MouseEvent& rEvent)
     throw(css::uno::RuntimeException)
 {
     CheckMouseOver(rEvent, true);
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent)
     throw(css::uno::RuntimeException)
 {
     CheckMouseOver(rEvent, false);
 }
 
-
-
-
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -699,9 +630,6 @@ void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent)
     CheckMouseOver(rEvent, true);
 }
 
-
-
-
 void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -709,9 +637,6 @@ void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent
     (void)rEvent;
 }
 
-
-
-
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
@@ -724,18 +649,12 @@ void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPa
     }
 }
 
-
-
-
 Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void)
     throw (RuntimeException)
 {
     return mxCurrentSlide;
 }
 
-
-
-
 //-----------------------------------------------------------------------------
 
 void PresenterToolBar::CreateControls (
@@ -779,9 +698,6 @@ void PresenterToolBar::CreateControls (
     }
 }
 
-
-
-
 void PresenterToolBar::ProcessEntry (
     const Reference<beans::XPropertySet>& rxProperties,
     Context& rContext)
@@ -836,9 +752,6 @@ void PresenterToolBar::ProcessEntry (
     }
 }
 
-
-
-
 void PresenterToolBar::Layout (
     const Reference<rendering::XCanvas>& rxCanvas)
 {
@@ -916,6 +829,8 @@ void PresenterToolBar::Layout (
     maBoundingBox.X2 = nX + aTotalSize.Width + nTotalHorizontalGap;
     maBoundingBox.Y2 = nY + aTotalSize.Height;
 
+    /* push front or back ? ... */
+
     for (iPart=maElementContainer.begin(), nIndex=0; iPart!=iEnd; ++iPart,++nIndex)
     {
         geometry::RealRectangle2D aBoundingBox(
@@ -936,9 +851,6 @@ void PresenterToolBar::Layout (
     mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
 }
 
-
-
-
 geometry::RealSize2D PresenterToolBar::CalculatePartSize (
     const Reference<rendering::XCanvas>& rxCanvas,
     const SharedElementContainerPart& rpPart,
@@ -975,9 +887,6 @@ geometry::RealSize2D PresenterToolBar::CalculatePartSize (
     return aTotalSize;
 }
 
-
-
-
 void PresenterToolBar::LayoutPart (
     const Reference<rendering::XCanvas>& rxCanvas,
     const SharedElementContainerPart& rpPart,
@@ -1033,9 +942,6 @@ void PresenterToolBar::LayoutPart (
     }
 }
 
-
-
-
 void PresenterToolBar::Paint (
     const awt::Rectangle& rUpdateBox,
     const rendering::ViewState& rViewState)
@@ -1059,9 +965,6 @@ void PresenterToolBar::Paint (
     }
 }
 
-
-
-
 void PresenterToolBar::UpdateSlideNumber (void)
 {
     if( mxSlideShowController.is() )
@@ -1081,9 +984,6 @@ void PresenterToolBar::UpdateSlideNumber (void)
     }
 }
 
-
-
-
 void PresenterToolBar::CheckMouseOver (
     const css::awt::MouseEvent& rEvent,
     const bool bOverWindow,
@@ -1113,9 +1013,6 @@ void PresenterToolBar::CheckMouseOver (
     }
 }
 
-
-
-
 void PresenterToolBar::ThrowIfDisposed (void) const
     throw (::com::sun::star::lang::DisposedException)
 {
@@ -1128,9 +1025,6 @@ void PresenterToolBar::ThrowIfDisposed (void) const
     }
 }
 
-
-
-
 //===== PresenterToolBarView ==================================================
 
 PresenterToolBarView::PresenterToolBarView (
@@ -1182,16 +1076,10 @@ PresenterToolBarView::PresenterToolBarView (
     }
 }
 
-
-
-
 PresenterToolBarView::~PresenterToolBarView (void)
 {
 }
 
-
-
-
 void SAL_CALL PresenterToolBarView::disposing (void)
 {
     Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpToolBar.get()), UNO_QUERY);
@@ -1212,17 +1100,11 @@ void SAL_CALL PresenterToolBarView::disposing (void)
 
 }
 
-
-
-
 ::rtl::Reference<PresenterToolBar> PresenterToolBarView::GetPresenterToolBar (void) const
 {
     return mpToolBar;
 }
 
-
-
-
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEvent)
@@ -1237,9 +1119,6 @@ void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEv
         awt::Rectangle());
 }
 
-
-
-
 //-----  lang::XEventListener -------------------------------------------------
 
 void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventObject)
@@ -1249,9 +1128,6 @@ void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventOb
         mxWindow = NULL;
 }
 
-
-
-
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId (void)
@@ -1260,18 +1136,12 @@ Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId (void)
     return mxViewId;
 }
 
-
-
-
 sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly (void)
     throw (RuntimeException)
 {
     return false;
 }
 
-
-
-
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
@@ -1282,18 +1152,12 @@ void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDr
         xToolBar->setCurrentPage(rxSlide);
 }
 
-
-
-
 Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage (void)
     throw (RuntimeException)
 {
     return NULL;
 }
 
-
-
-
 //===== PresenterToolBar::Element =============================================
 
 namespace {
@@ -1321,9 +1185,6 @@ Element::Element (
     }
 }
 
-
-
-
 Element::~Element (void)
 {
 }
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 116d5437d304..fd9ed2848c9a 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -109,8 +109,7 @@ public:
     void InvalidateArea (
         const css::awt::Rectangle& rRepaintBox,
         const bool bSynchronous);
-    sal_Int32 GetSlideCount (void);
-    sal_Int32 GetCurrentSlideIndex (void);
+
     void RequestLayout (void);
     css::geometry::RealSize2D GetMinimalSize (void);
     ::rtl::Reference<PresenterController> GetPresenterController (void) const;
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx
index 1ccb1cff43ee..6f3f745f40d9 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sdext { namespace presenter {
 
-
 void PresenterUIPainter::PaintHorizontalBitmapComposite (
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
     const css::awt::Rectangle& rRepaintBox,
@@ -142,9 +141,6 @@ void PresenterUIPainter::PaintHorizontalBitmapComposite (
     }
 }
 
-
-
-
 void PresenterUIPainter::PaintVerticalBitmapComposite (
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
     const css::awt::Rectangle& rRepaintBox,
@@ -248,10 +244,6 @@ void PresenterUIPainter::PaintVerticalBitmapComposite (
     }
 }
 
-
-
-
-
 } } // end of namespace sdext::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */