loplugin:staticcall

Change-Id: I502702dfd04405748a314bd171e6298850777c0a

16 files changed, 22 insertions, 22 deletions

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 394dd81619cf..f6c0131d0274 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -252,7 +252,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     rISet.Put(aBulletItem);
 
     // New BulletItem
-    pSSPool->PutNumBulletItem( pSheet, aBulletFont );
+    SdStyleSheetPool::PutNumBulletItem( pSheet, aBulletFont );
 
     SfxItemSet* pISet = NULL;
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3208bfbf54f1..916638c65c7a 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2283,7 +2283,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
                 sal_uInt32 nMirrorFlags;
                 OUString sCustomShapeType;
-                MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType );
+                MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType( mXShape, nMirrorFlags, sCustomShapeType );
                 if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" )
                 {   // sj: creating metafile for customshapes that can't be saved to ms format properly
                     ImplCreateShape( ESCHER_ShpInst_PictureFrame, 0xa00, aSolverContainer );
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index be60d6502bae..2529ffed9cb6 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -597,7 +597,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe
                     // with node
                     xE2->nextElement() >>= xEA2;
                     if( xEA2.is() )
-                        xE2.query( xEA2->createEnumeration() );
+                        xE2.set(xEA2->createEnumeration(), css::uno::UNO_QUERY);
                     else
                         xE2.clear();
 
@@ -2831,7 +2831,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny )
                 {
                     if ( ( nRecLen & 1 ) && ( nRecLen > 1 ) )
                     {
-                        OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, true );
+                        OUString aOUString = SvxMSDffManager::MSDFFReadZString( mrStCtrl, nRecLen - 1, true );
                         rAny <<= aOUString;
 
                         bOk = true;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 5fa4be3d37db..da5a53847352 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -173,7 +173,7 @@ void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt )
         if ( !( (nKey == KEY_Z || nKey == KEY_Y) && rKeyCode.IsMod1()) )
         {
             bool bIsProtected = mpAnnotationWindow->IsProtected();
-            if (!bIsProtected || (bIsProtected && !mpAnnotationWindow->Engine()->GetEditEngine().DoesKeyChangeText(rKeyEvt)) )
+            if (!bIsProtected || (bIsProtected && !EditEngine::DoesKeyChangeText(rKeyEvt)) )
 
             bDone = mpOutlinerView->PostKeyEvent( rKeyEvt );
         }
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 1989f83b277a..50cf43819dd2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -1047,7 +1047,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
         if ( aGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL )
             aTmpSizeLog = pDefDev->PixelToLogic( aGraphic.GetPrefSize(), aMap100 );
         else
-            aTmpSizeLog = pDefDev->LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), aMap100 );
+            aTmpSizeLog = OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), aMap100 );
 
         aMaxSizeLog.Width() = std::max( aMaxSizeLog.Width(), aTmpSizeLog.Width() );
         aMaxSizeLog.Height() = std::max( aMaxSizeLog.Height(), aTmpSizeLog.Height() );
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index d45e5e44b64b..cd69eaa65a19 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -519,9 +519,9 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r
             ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
 
             // The slide sorter and the task panel are cacheable and relocatable.
-            maCacheableResources.push_back(pHelper->CreateResourceId(
+            maCacheableResources.push_back(FrameworkHelper::CreateResourceId(
                 FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftDrawPaneURL));
-            maCacheableResources.push_back(pHelper->CreateResourceId(
+            maCacheableResources.push_back(FrameworkHelper::CreateResourceId(
                 FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftImpressPaneURL));
         }
 
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 82e7588aa2b1..62bf57a7d969 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -61,7 +61,7 @@ ResourceManager::ResourceManager (
       mxConfigurationController(),
       mpActiveMainViewContainer(new MainViewContainer()),
       mxResourceId(rxResourceId),
-      mxMainViewAnchorId(FrameworkHelper::Instance(rxController)->CreateResourceId(
+      mxMainViewAnchorId(FrameworkHelper::CreateResourceId(
           FrameworkHelper::msCenterPaneURL)),
       msCurrentMainViewURL()
 {
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 95532343deba..33619e434e09 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -246,7 +246,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
                     if( !bCommonTerms )
                         nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
 
-                    Font aTargetFont = mpWindow->GetDefaultFont(
+                    Font aTargetFont = OutputDevice::GetDefaultFont(
                                         DEFAULTFONT_CJK_PRESENTATION,
                                         nTargetLang, DEFAULTFONT_FLAGS_ONLYONE );
 
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 9c9ce36757ff..a22e877f2f86 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -329,12 +329,12 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
 
     /* Maybe a QueryBox is opened ("update links?"), therefore the dialog
        becomes the current DefModalDialogParent */
-    ::Window* pDefParent = GetpApp()->GetDefDialogParent();
-    GetpApp()->SetDefDialogParent(pDlg->GetWindow());
+    ::Window* pDefParent = Application::GetDefDialogParent();
+    Application::SetDefDialogParent(pDlg->GetWindow());
 
     sal_uInt16 nRet = pDlg->Execute();
 
-    GetpApp()->SetDefDialogParent(pDefParent);
+    Application::SetDefDialogParent(pDefParent);
 
     mpDocSh->SetWaitCursor( true );
 
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index dde213073a1f..aa8a17470341 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -371,7 +371,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
             const FontDta &rFntDta = aTable[i];
             LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ?
                 rFntDta.nFallbackLang : rFntDta.nLang;
-            Font aFont = Application::GetDefaultDevice()->GetDefaultFont(
+            Font aFont = OutputDevice::GetDefaultFont(
                 rFntDta.nFontType, nLang, DEFAULTFONT_FLAGS_ONLYONE);
             mpEditEngineItemPool->SetPoolDefaultItem(
                 SvxFontItem(
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 2b2d4645cedb..f9dcacf0a7e4 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -105,7 +105,7 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation)
                 ::boost::shared_ptr<FrameworkHelper> pHelper(
                     FrameworkHelper::Instance(*mpViewShellBase));
                 if (pHelper->GetConfigurationController()->getResource(
-                    pHelper->CreateResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
+                    FrameworkHelper::CreateResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
                 {
                     ::sd::framework::ConfigurationController::Lock aLock (
                         pHelper->GetConfigurationController());
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f615b8767b96..e3668648a1f6 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1119,7 +1119,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
     try
     {
         mxShow = Reference< XSlideShow >( createSlideShow(), UNO_QUERY_THROW );
-        mxView = mxView.createFromQuery( new SlideShowView(
+        mxView = comphelper::ImplementationReference<sd::SlideShowView, css::presentation::XSlideShowView>::createFromQuery( new SlideShowView(
                                              *mpShowWindow,
                                              mpDoc,
                                              meAnimationMode,
diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx
index 073a70345892..5fce6fe9d9a2 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -48,7 +48,7 @@ sal_Int32 IdleDetection::GetIdleState (const ::Window* pWindow)
 
 sal_Int32 IdleDetection::CheckInputPending (void)
 {
-    if (GetpApp()->AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD | VCL_INPUT_PAINT))
+    if (Application::AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD | VCL_INPUT_PAINT))
         return IDET_SYSTEM_EVENT_PENDING;
     else
         return IDET_IDLE;
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 1c15d23d77e8..81577fc8753b 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -101,7 +101,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
         }
         else
         {
-            OUString aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) );
+            OUString aShortName( GraphicDescriptor::GetImportFormatShortName( aDesc.GetFileFormat() ) );
             GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter();
             const OUString aName( rGrfFilter.GetImportFormatTypeName( rGrfFilter.GetImportFormatNumberForShortName( aShortName ) ) );
 
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 53ddeb2c019b..cd795477b90d 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -498,7 +498,7 @@ uno::Reference< text::XTextRange >  SdUnoSearchReplaceShape::Search( uno::Refere
         {
             uno::Reference< text::XTextContent >  xParagraph( xParaEnum->nextElement(), uno::UNO_QUERY );
             if( xParagraph.is() )
-                xEnumAccess.query( xParagraph );
+                xEnumAccess.set(xParagraph, css::uno::UNO_QUERY);
             else
                 xEnumAccess.clear();
 
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 4237e2c461f4..a75d9d76b20b 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -326,9 +326,9 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
 
             // Create the resource ids for the center pane and view.
             const Reference<drawing::framework::XResourceId> xCenterPaneId (
-                pHelper->CreateResourceId(FrameworkHelper::msCenterPaneURL));
+                FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL));
             const Reference<drawing::framework::XResourceId> xCenterViewId (
-                pHelper->CreateResourceId(sView, xCenterPaneId));
+                FrameworkHelper::CreateResourceId(sView, xCenterPaneId));
 
             // Request center pane and view.
             xConfigurationController->requestResourceActivation(xCenterPaneId, ResourceActivationMode_ADD);
@@ -1192,7 +1192,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
                 pFrameView->GetPageKindOnLoad());
             ::boost::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(mrBase));
             pHelper->RequestView(
-                pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
+                FrameworkHelper::GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
                 FrameworkHelper::msCenterPaneURL);
             pHelper->RunOnConfigurationEvent("ConfigurationUpdateEnd", CurrentPageSetter(mrBase));
         }