13 files changed, 21 insertions, 21 deletions
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 41676b58d27c..eb9a60af3b67 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -154,7 +154,7 @@ private:
         const SharedBitmapDescriptor& rpRight);
     css::geometry::IntegerSize2D CalculateButtonSize (void);
     void Invalidate (void);
-    css::uno::Reference<css::rendering::XBitmap> GetBitmap (
+    static css::uno::Reference<css::rendering::XBitmap> GetBitmap (
         const SharedBitmapDescriptor& mpIcon,
         const PresenterBitmapDescriptor::Mode eMode);
     void SetupButtonBitmaps (void);
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 44e943d29542..ff2eac9258f8 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -118,8 +118,8 @@ public:
     css::uno::Reference<css::drawing::framework::XConfigurationController>
         GetConfigurationController (void) const;
     css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide (void) const;
-    bool HasTransition (css::uno::Reference<css::drawing::XDrawPage>& rxPage);
-    bool HasCustomAnimation (css::uno::Reference<css::drawing::XDrawPage>& rxPage);
+    static bool HasTransition (css::uno::Reference<css::drawing::XDrawPage>& rxPage);
+    static bool HasCustomAnimation (css::uno::Reference<css::drawing::XDrawPage>& rxPage);
     void SetAccessibilityActiveState (const bool bIsActive);
     bool IsAccessibilityActive (void) const { return mbIsAccessibilityActive;}
 
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 7152b9a0db0d..4b3bf639c623 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -89,7 +89,7 @@ namespace {
         const OUString msText;
         ::boost::shared_ptr<vector<LineDescriptor> > mpLineDescriptors;
 
-        void SplitText (const OUString& rsText, vector<OUString>& rTextParts);
+        static void SplitText (const OUString& rsText, vector<OUString>& rTextParts);
         void FormatText (
             const vector<OUString>& rTextParts,
             const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 0dfe86261ce1..fec447bb4a0e 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -134,7 +134,7 @@ protected:
     void CreateWindows (
         const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
         const bool bIsWindowVisibleOnCreation);
-    void PaintBorderBackground (
+    static void PaintBorderBackground (
         const css::awt::Rectangle& rCenterBox,
         const css::awt::Rectangle& rUpdateBox);
     void PaintBorder (const css::awt::Rectangle& rUpdateRectangle);
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index c18625492d74..60a762632aef 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -115,7 +115,7 @@ namespace {
     private:
         bool mbOn;
         rtl::Reference<PresenterController> mpPresenterController;
-        bool IsActive (const ::rtl::Reference<PresenterWindowManager>& rpWindowManager) const;
+        static bool IsActive (const ::rtl::Reference<PresenterWindowManager>& rpWindowManager);
     };
 
     class SetSlideSorterCommand : public Command
@@ -651,7 +651,7 @@ Any SetNotesViewCommand::GetState (void) const
 }
 
 bool SetNotesViewCommand::IsActive (
-    const ::rtl::Reference<PresenterWindowManager>& rpWindowManager) const
+    const ::rtl::Reference<PresenterWindowManager>& rpWindowManager)
 {
     return rpWindowManager->GetViewMode() == PresenterWindowManager::VM_Notes;
 }
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 5c19b05e691d..022dcb80cabb 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -219,7 +219,7 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb
     if ( Event.EventName == "OnStartPresentation" )
     {
         mpPresenterScreen = new PresenterScreen(mxComponentContext, mxModel);
-        if(mpPresenterScreen->isPresenterScreenEnabled(mxComponentContext))
+        if(PresenterScreen::isPresenterScreenEnabled(mxComponentContext))
             mpPresenterScreen->InitializePresenterScreen();
     }
     else if ( Event.EventName == "OnEndPresentation" )
@@ -524,7 +524,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
     return GetPresenterScreenFromScreen(nScreenNumber);
 }
 
-sal_Int32 PresenterScreen::GetPresenterScreenFromScreen( sal_Int32 nPresentationScreen ) const
+sal_Int32 PresenterScreen::GetPresenterScreenFromScreen( sal_Int32 nPresentationScreen )
 {
     // Setup the resource id of the full screen background pane so that
     // it is displayed on another screen than the presentation.
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 49341a67537d..3c7088910e40 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -106,7 +106,7 @@ public:
 
     virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
-    bool isPresenterScreenEnabled(
+    static bool isPresenterScreenEnabled(
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     /** Make the presenter screen visible.
     */
@@ -224,7 +224,7 @@ private:
     sal_Int32 GetPresenterScreenNumber (
                 const css::uno::Reference<css::presentation::XPresentation2>& rxPresentation) const;
 
-    sal_Int32 GetPresenterScreenFromScreen( sal_Int32 nPresentationScreen ) const;
+    static sal_Int32 GetPresenterScreenFromScreen( sal_Int32 nPresentationScreen );
 
     /** Create a resource id for the full screen background pane so that it
         is displayed on another screen than the full screen presentation.
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 895a26587c59..75817bf10924 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -262,8 +262,8 @@ void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox)
     bool bTransition = false;
     if( mxCurrentSlide.is() )
     {
-        bCustomAnimation = mpPresenterController->HasCustomAnimation(mxCurrentSlide);
-        bTransition = mpPresenterController->HasTransition(mxCurrentSlide);
+        bCustomAnimation = PresenterController::HasCustomAnimation(mxCurrentSlide);
+        bTransition = PresenterController::HasTransition(mxCurrentSlide);
     }
 
     if ( ! mxPreview.is() && mxCurrentSlide.is())
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index e3c5ee4b245d..4bf2d73be048 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -219,13 +219,13 @@ private:
     sal_Int32 mnRightFrameSize;
     sal_Int32 mnBottomFrameSize;
 
-    void PaintBitmapOnce(
+    static void PaintBitmapOnce(
         const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const Reference<rendering::XPolyPolygon2D>& rxClip,
         const double nX,
         const double nY);
-    void PaintBitmapTiled(
+    static void PaintBitmapTiled(
         const css::uno::Reference<css::rendering::XBitmap>& rxBitmap,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const geometry::RealRectangle2D& rClipBox,
@@ -911,8 +911,8 @@ void PresenterSlideSorter::PaintPreview (
     Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY);
     Reference<drawing::XDrawPage> xPage = Reference<drawing::XDrawPage>(
         xIndexAccess->getByIndex(nSlideIndex), UNO_QUERY);
-    bool bTransition = mpPresenterController->HasTransition(xPage);
-    bool bCustomAnimation = mpPresenterController->HasCustomAnimation(xPage);
+    bool bTransition = PresenterController::HasTransition(xPage);
+    bool bCustomAnimation = PresenterController::HasCustomAnimation(xPage);
 
     // Create clip rectangle as intersection of the current update area and
     // the bounding box of all previews.
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 0f9568ae1f4e..53128fbc84ed 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -74,7 +74,7 @@ public:
 
     virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
-    void SetActiveState (const bool bIsActive);
+    static void SetActiveState (const bool bIsActive);
 
     // lang::XEventListener
 
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 5dd2ea49ae17..47e1c6133088 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -188,7 +188,7 @@ private:
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const SharedElementContainerPart& rpPart,
         const bool bIsHorizontal);
-    void LayoutPart (
+    static void LayoutPart (
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const SharedElementContainerPart& rpPart,
         const css::geometry::RealRectangle2D& rBoundingBox,
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 463a35bce800..30611b3204d0 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -493,7 +493,7 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView(
             mpPresenterController->GetPaneContainer()->FindPaneId(rxViewId->getAnchor()));
         if (pDescriptor.get() != NULL)
             pDescriptor->maActivator = ::boost::bind(
-                &PresenterSlideSorter::SetActiveState, pView.get(), _1);
+                &PresenterSlideSorter::SetActiveState, _1);
         xView = pView.get();
     }
     catch (RuntimeException&)
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 085059981df4..a8475e2b54bb 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -195,7 +195,7 @@ private:
     css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon (void) const;
     void ToTop ();
 
-    void UpdateWindowList (void);
+    static void UpdateWindowList (void);
     bool ChildNeedsRepaint (
         const css::uno::Reference<css::drawing::framework::XPane>& rxPane) const;