loplugin:staticfunction

Change-Id: I4b7b04031fa74956379c5a1b21abe10b0717f3e9

26 files changed, 69 insertions, 74 deletions

diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
index ae532ffa6635..553bb07c5f09 100644
--- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx
+++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
@@ -45,7 +45,7 @@ namespace pdfi
         virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
             StyleContainer&, PDFIProcessor&) const = 0;
         /// Create visitor that emits tree to an output target
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext&, PDFIProcessor&) const = 0;
+        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext&) const = 0;
     };
 
     typedef boost::shared_ptr<TreeVisitorFactory> TreeVisitorFactorySharedPtr;
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 67f491283ff7..e722dc3cd680 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -125,7 +125,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
     }
 
     if (isRTL)  // If so, reverse string
-        str = m_rProcessor.mirrorString( str );
+        str = PDFIProcessor::mirrorString( str );
 
     m_rEmitContext.rEmitter.beginTag( "text:span", aProps );
 
@@ -627,7 +627,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
         // move element to current paragraph
        if (! pCurPara )  // new paragraph, insert one
        {
-            pCurPara = m_rProcessor.getElementFactory()->createParagraphElement( NULL );
+            pCurPara = ElementFactory::createParagraphElement( NULL );
             // set parent
             pCurPara->Parent = &elem;
             //insert new paragraph before current element
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index 78e146f6ed94..dd09f4ceb26a 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -80,28 +80,25 @@ namespace pdfi
     class DrawXmlEmitter : public ElementTreeVisitor
     {
     private:
-    css::uno::Reference< css::lang::XMultiServiceFactory > xFactory;
-    css::uno::Reference< css::uno::XComponentContext > xCtx;
-    css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter;
-    css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass;
-
-        PDFIProcessor&  m_rProcessor;
+        css::uno::Reference< css::lang::XMultiServiceFactory > xFactory;
+        css::uno::Reference< css::uno::XComponentContext > xCtx;
+        css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter;
+        css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass;
 
         EmitContext& m_rEmitContext ;
         /// writes Impress doc when false
         const bool   m_bWriteDrawDocument;
 
-        void fillFrameProps( DrawElement&       rElem,
+        static void fillFrameProps( DrawElement&       rElem,
                              PropertyMap&       rProps,
                              const EmitContext& rEmitContext,
                              bool               bWasTransformed = false
                              );
 
     public:
-    const css::uno::Reference< css::i18n::XCharacterClassification >& GetCharacterClassification();
+        const css::uno::Reference< css::i18n::XCharacterClassification >& GetCharacterClassification();
         enum DocType{ DRAW_DOC, IMPRESS_DOC };
-        explicit DrawXmlEmitter(EmitContext& rEmitContext, DocType eDocType, PDFIProcessor& rProc ) :
-            m_rProcessor( rProc ),
+        explicit DrawXmlEmitter(EmitContext& rEmitContext, DocType eDocType) :
             m_rEmitContext(rEmitContext),
             m_bWriteDrawDocument(eDocType==DRAW_DOC)
         {}
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index 9ceabd68aedb..c91d11d82c36 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -295,29 +295,29 @@ namespace pdfi
         ElementFactory() {}
         virtual ~ElementFactory();
 
-        HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI )
+        static HyperlinkElement* createHyperlinkElement( Element* pParent, const OUString& rURI )
         { return new HyperlinkElement( pParent, rURI ); }
 
-        TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId )
+        static TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId )
         { return new TextElement( pParent, nGCId, nFontId ); }
-        ParagraphElement* createParagraphElement( Element* pParent )
+        static ParagraphElement* createParagraphElement( Element* pParent )
         { return new ParagraphElement( pParent ); }
 
-        FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId )
+        static FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId )
         { return new FrameElement( pParent, nGCId ); }
-        PolyPolyElement*
+        static PolyPolyElement*
             createPolyPolyElement( Element* pParent,
                                    sal_Int32 nGCId,
                                    const basegfx::B2DPolyPolygon& rPolyPoly,
                                    sal_Int8 nAction)
         { return new PolyPolyElement( pParent, nGCId, rPolyPoly, nAction ); }
-        ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage )
+        static ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage )
         { return new ImageElement( pParent, nGCId, nImage ); }
 
-        PageElement* createPageElement( Element* pParent,
+        static PageElement* createPageElement( Element* pParent,
                                                 sal_Int32 nPageNr )
         { return new PageElement( pParent, nPageNr ); }
-        DocumentElement* createDocumentElement()
+        static DocumentElement* createDocumentElement()
         { return new DocumentElement(); }
     };
 }
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 87eda4e36929..fe81e28603c5 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -58,7 +58,7 @@ namespace pdfi
     m_xContext(xContext),
     prevCharWidth(0),
     m_pElFactory( new ElementFactory() ),
-    m_pDocument( m_pElFactory->createDocumentElement() ),
+    m_pDocument( ElementFactory::createDocumentElement() ),
     m_pCurPage(0),
     m_pCurElement(0),
     m_nNextFontId( 1 ),
@@ -238,18 +238,18 @@ void PDFIProcessor::processGlyphLine()
         spaceDetectBoundary = avgGlyphWidth * 0.2;
     }
 
-    FrameElement* frame = m_pElFactory->createFrameElement(
+    FrameElement* frame = ElementFactory::createFrameElement(
         m_GlyphsList[0].getCurElement(),
         getGCId(m_GlyphsList[0].getGC()));
     frame->ZOrder = m_nNextZOrder++;
     frame->IsForText = true;
     frame->FontSize = getFont(m_GlyphsList[0].getGC().FontId).size;
-    ParagraphElement* para = m_pElFactory->createParagraphElement(frame);
+    ParagraphElement* para = ElementFactory::createParagraphElement(frame);
 
     for (size_t i = 0; i < m_GlyphsList.size(); i++)
     {
         bool prependSpace = false;
-        TextElement* text = m_pElFactory->createTextElement(
+        TextElement* text = ElementFactory::createTextElement(
             para,
             getGCId(m_GlyphsList[i].getGC()),
             m_GlyphsList[i].getGC().FontId);
@@ -348,8 +348,8 @@ void PDFIProcessor::setupImage(ImageId nImage)
     rGC.Transformation.decompose(aScale, aTranslation, fRotate, fShearX);
 
     const sal_Int32 nGCId = getGCId(rGC);
-    FrameElement* pFrame = m_pElFactory->createFrameElement( m_pCurElement, nGCId );
-    ImageElement* pImageElement = m_pElFactory->createImageElement( pFrame, nGCId, nImage );
+    FrameElement* pFrame = ElementFactory::createFrameElement( m_pCurElement, nGCId );
+    ImageElement* pImageElement = ElementFactory::createImageElement( pFrame, nGCId, nImage );
     pFrame->x = pImageElement->x = aTranslation.getX();
     pFrame->y = pImageElement->y = aTranslation.getY();
     pFrame->w = pImageElement->w = aScale.getX();
@@ -401,7 +401,7 @@ void PDFIProcessor::strokePath( const uno::Reference< rendering::XPolyPolygon2D
     basegfx::B2DPolyPolygon aPoly=basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
     aPoly.transform(getCurrentContext().Transformation);
 
-    PolyPolyElement* pPoly = m_pElFactory->createPolyPolyElement(
+    PolyPolyElement* pPoly = ElementFactory::createPolyPolyElement(
         m_pCurElement,
         getGCId(getCurrentContext()),
         aPoly,
@@ -415,7 +415,7 @@ void PDFIProcessor::fillPath( const uno::Reference< rendering::XPolyPolygon2D >&
     basegfx::B2DPolyPolygon aPoly=basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
     aPoly.transform(getCurrentContext().Transformation);
 
-    PolyPolyElement* pPoly = m_pElFactory->createPolyPolyElement(
+    PolyPolyElement* pPoly = ElementFactory::createPolyPolyElement(
         m_pCurElement,
         getGCId(getCurrentContext()),
         aPoly,
@@ -429,7 +429,7 @@ void PDFIProcessor::eoFillPath( const uno::Reference< rendering::XPolyPolygon2D
     basegfx::B2DPolyPolygon aPoly=basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath);
     aPoly.transform(getCurrentContext().Transformation);
 
-    PolyPolyElement* pPoly = m_pElFactory->createPolyPolyElement(
+    PolyPolyElement* pPoly = ElementFactory::createPolyPolyElement(
         m_pCurElement,
         getGCId(getCurrentContext()),
         aPoly,
@@ -469,7 +469,7 @@ void PDFIProcessor::hyperLink( const geometry::RealRectangle2D& rBounds,
 {
     if( !rURI.isEmpty() )
     {
-        HyperlinkElement* pLink = m_pElFactory->createHyperlinkElement(
+        HyperlinkElement* pLink = ElementFactory::createHyperlinkElement(
             &m_pCurPage->Hyperlinks,
             rURI );
         pLink->x = rBounds.X1;
@@ -536,7 +536,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize )
             startIndicator( OUString( " " ) );
         m_xStatusIndicator->setValue( nNextPageNr );
     }
-    m_pCurPage = m_pElFactory->createPageElement(m_pDocument.get(), nNextPageNr);
+    m_pCurPage = ElementFactory::createPageElement(m_pDocument.get(), nNextPageNr);
     m_pCurElement = m_pCurPage;
     m_pCurPage->w = rSize.Width;
     m_pCurPage->h = rSize.Height;
@@ -572,7 +572,7 @@ void PDFIProcessor::emit( XmlEmitter&               rEmitter,
 
     EmitContext aContext( rEmitter, aStyles, m_aImages, *this, m_xStatusIndicator, m_xContext );
     ElementTreeVisitorSharedPtr aEmittingVisitor(
-        rVisitorFactory.createEmittingVisitor(aContext, *this));
+        rVisitorFactory.createEmittingVisitor(aContext));
 
     PropertyMap aProps;
     // document prolog
@@ -722,7 +722,7 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep )
 }
 
 // helper method: get a mirrored string
-OUString PDFIProcessor::mirrorString( const OUString& i_rString ) const
+OUString PDFIProcessor::mirrorString( const OUString& i_rString )
 {
     const sal_Int32 nLen = i_rString.getLength();
     OUStringBuffer aMirror( nLen );
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index bfef980af937..363d86229439 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -97,7 +97,7 @@ namespace pdfi
 
         void sortElements( Element* pElement, bool bDeep = false );
 
-        OUString mirrorString( const OUString& i_rInString ) const;
+        static OUString mirrorString( const OUString& i_rInString );
 
     private:
         void processGlyphLine();
diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
index 9a2352917e88..c718277df4bf 100644
--- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx
+++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
@@ -40,7 +40,7 @@ namespace pdfi
             return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlFinalizer(rStyles,rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor&) const SAL_OVERRIDE
+        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
         {
             return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlEmitter(rEmitContext));
         }
@@ -62,11 +62,10 @@ namespace pdfi
             return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const SAL_OVERRIDE
+        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
         {
             return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
-                                                                            DrawXmlEmitter::IMPRESS_DOC,
-                                                                            rProc
+                                                                            DrawXmlEmitter::IMPRESS_DOC
                                                                             ));
         }
     };
@@ -87,11 +86,10 @@ namespace pdfi
             return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
         }
 
-        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext, PDFIProcessor& rProc) const SAL_OVERRIDE
+        virtual boost::shared_ptr<ElementTreeVisitor> createEmittingVisitor(EmitContext& rEmitContext) const SAL_OVERRIDE
         {
             return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlEmitter(rEmitContext,
-                                                                            DrawXmlEmitter::DRAW_DOC,
-                                                                            rProc
+                                                                            DrawXmlEmitter::DRAW_DOC
                                                                             ));
         }
     };
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 7b448b156c8f..e54d41281fde 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -623,7 +623,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::
         // move element to current paragraph
         if( ! pCurPara ) // new paragraph, insert one
         {
-            pCurPara = m_rProcessor.getElementFactory()->createParagraphElement( NULL );
+            pCurPara = ElementFactory::createParagraphElement( NULL );
             // set parent
             pCurPara->Parent = &elem;
             //insert new paragraph before current element
@@ -1208,7 +1208,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
     // no paragraph or other elements before the first paragraph
     if( ! pFirstPara )
     {
-        pFirstPara = m_rProcessor.getElementFactory()->createParagraphElement( NULL );
+        pFirstPara = ElementFactory::createParagraphElement( NULL );
         pFirstPara->Parent = &elem;
         elem.Children.push_front( pFirstPara );
     }
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index d2cef9df9ddf..fd74363d43f6 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -56,7 +56,7 @@ namespace pdfi
         StyleContainer& m_rStyleContainer;
         PDFIProcessor&  m_rProcessor;
 
-        void setFirstOnPage( ParagraphElement&    rElem,
+        static void setFirstOnPage( ParagraphElement&    rElem,
                              StyleContainer&      rStyles,
                              const OUString& rMasterPageName );
 
@@ -83,7 +83,7 @@ namespace pdfi
     {
     private:
         EmitContext& m_rEmitContext ;
-        void fillFrameProps( DrawElement&       rElem,
+        static void fillFrameProps( DrawElement&       rElem,
                              PropertyMap&       rProps,
                              const EmitContext& rEmitContext );
 
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 8b0abf34281b..c908fb996580 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -162,7 +162,7 @@ class Parser
     void                 readLineJoin();
     void                 readTransformation();
     rendering::ARGBColor readColor();
-    void                 parseFontFamilyName( FontAttributes& aResult );
+    static void          parseFontFamilyName( FontAttributes& aResult );
     void                 readFont();
     uno::Sequence<beans::PropertyValue> readImageImpl();
 
@@ -171,10 +171,10 @@ class Parser
     void                 readLink();
     void                 readMaskedImage();
     void                 readSoftMaskedImage();
-    sal_Int32 parseFontCheckForString(const sal_Unicode* pCopy, sal_Int32 nCopyLen,
+    static sal_Int32 parseFontCheckForString(const sal_Unicode* pCopy, sal_Int32 nCopyLen,
                                       const char* pAttrib, sal_Int32 nAttribLen,
                                       FontAttributes& rResult, bool bItalic, bool bBold);
-    sal_Int32 parseFontRemoveSuffix(const sal_Unicode* pCopy, sal_Int32 nCopyLen,
+    static sal_Int32 parseFontRemoveSuffix(const sal_Unicode* pCopy, sal_Int32 nCopyLen,
                               const char* pAttrib, sal_Int32 nAttribLen);
 
 public:
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 987ae3c494cb..b7c47d88fe59 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -509,7 +509,7 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
     gfree(pBuf);
 }
 
-void PDFOutDev::printPath( GfxPath* pPath ) const
+void PDFOutDev::printPath( GfxPath* pPath )
 {
     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
     for( int i=0; i<nSubPaths; i++ )
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d2602c1b586f..d15491b52ab6 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -142,7 +142,7 @@ namespace pdfi
 
         int  parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
         void writeFontFile( GfxFont* gfxFont ) const;
-        void printPath( GfxPath* pPath ) const;
+        static void printPath( GfxPath* pPath );
 
     public:
         explicit PDFOutDev( PDFDoc* pDoc );
@@ -267,7 +267,7 @@ namespace pdfi
 #endif
                                         ) SAL_OVERRIDE;
 
-        void setPageNum( int nNumPages );
+        static void setPageNum( int nNumPages );
         void setSkipImages ( bool bSkipImages );
     };
 }
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index c72ba95d5f60..ed4c65fda2d6 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
 
     // tell the receiver early - needed for proper progress calculation
     const int nPages = rDoc.isOk()? rDoc.getNumPages(): 0;
-    aOutDev.setPageNum(nPages);
+    pdfi::PDFOutDev::setPageNum(nPages);
 
     // virtual resolution of the PDF OutputDev in dpi
     static const int PDFI_OUTDEV_RESOLUTION = 7200;
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;