loplugin:staticcall

Change-Id: If7b285a2214bc878e8464a986538d0445078fcb3

13 files changed, 36 insertions, 38 deletions

diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 949e43874312..aec81f1bc17a 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -161,7 +161,7 @@ void SvtTabAppearanceCfg::SetMiddleMouseButton ( sal_uInt16 nSet )
 
 void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
 {
-    AllSettings   hAppSettings = pApp->GetSettings();
+    AllSettings   hAppSettings = Application::GetSettings();
     StyleSettings hAppStyle    = hAppSettings.GetStyleSettings();
 
     // Look & Feel
@@ -218,10 +218,10 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
     hAppSettings.SetMouseSettings( hMouseSettings );
 
     hAppSettings.SetStyleSettings( hAppStyle );
-    pApp->MergeSystemSettings    ( hAppSettings );      // Allow system-settings to apply
+    Application::MergeSystemSettings    ( hAppSettings );      // Allow system-settings to apply
     pApp->OverrideSystemSettings ( hAppSettings );
 
-    pApp->SetSettings ( hAppSettings );
+    Application::SetSettings ( hAppSettings );
 }
 
 
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 7a087c45c8b4..23e7cb1cf419 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -368,7 +368,7 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings()
     Application* pApp = GetpApp();
     if( pApp )
     {
-        AllSettings aSettings = pApp->GetSettings();
+        AllSettings aSettings = Application::GetSettings();
         StyleSettings aStyleSettings( aSettings.GetStyleSettings() );
 
         ColorConfigValue aRet = GetColorConfigValue(svtools::FONTCOLOR);
@@ -382,7 +382,7 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings()
             aStyleSettings.SetFontColor( aFontColor );
 
             aSettings.SetStyleSettings( aStyleSettings );
-            pApp->SetSettings( aSettings );
+            Application::SetSettings( aSettings );
         }
     }
 }
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index a7f0ed205a8e..d2a0536613c1 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -530,7 +530,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast()
         m_bBroadcastWhenUnlocked = ExtendedColorConfig::m_pImpl != NULL;
         if ( m_bBroadcastWhenUnlocked )
         {
-            if ( ExtendedColorConfig::m_pImpl->IsEnableBroadcast() )
+            if ( ExtendedColorConfig_Impl::IsEnableBroadcast() )
             {
                 m_bBroadcastWhenUnlocked = false;
                 ExtendedColorConfig::m_pImpl->Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
@@ -621,12 +621,12 @@ EditableExtendedColorConfig::EditableExtendedColorConfig() :
     m_pImpl(new ExtendedColorConfig_Impl),
     m_bModified(false)
 {
-    m_pImpl->LockBroadcast();
+    ExtendedColorConfig_Impl::LockBroadcast();
 }
 
 EditableExtendedColorConfig::~EditableExtendedColorConfig()
 {
-    m_pImpl->UnlockBroadcast();
+    ExtendedColorConfig_Impl::UnlockBroadcast();
     if(m_bModified)
         m_pImpl->SetModified();
     if(m_pImpl->IsModified())
@@ -688,12 +688,12 @@ void EditableExtendedColorConfig::Commit()
 
 void EditableExtendedColorConfig::DisableBroadcast()
 {
-    m_pImpl->DisableBroadcast();
+    ExtendedColorConfig_Impl::DisableBroadcast();
 }
 
 void EditableExtendedColorConfig::EnableBroadcast()
 {
-    m_pImpl->EnableBroadcast();
+    ExtendedColorConfig_Impl::EnableBroadcast();
 }
 
 sal_Int32 EditableExtendedColorConfig::GetComponentCount() const
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 0205159b7f40..13356932a709 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3311,8 +3311,8 @@ IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPo
 
     aAccReturn.SetActivateHdl( LINK( this, IcnViewEdit_Impl, ReturnHdl_Impl) );
     aAccEscape.SetActivateHdl( LINK( this, IcnViewEdit_Impl, EscapeHdl_Impl) );
-    GetpApp()->InsertAccel( &aAccReturn);//, ACCEL_ALWAYS );
-    GetpApp()->InsertAccel( &aAccEscape);//, ACCEL_ALWAYS );
+    Application::InsertAccel( &aAccReturn);//, ACCEL_ALWAYS );
+    Application::InsertAccel( &aAccEscape);//, ACCEL_ALWAYS );
     Show();
     GrabFocus();
 }
@@ -3321,8 +3321,8 @@ IcnViewEdit_Impl::~IcnViewEdit_Impl()
 {
     if( !bAlreadyInCallback )
     {
-        GetpApp()->RemoveAccel( &aAccReturn );
-        GetpApp()->RemoveAccel( &aAccEscape );
+        Application::RemoveAccel( &aAccReturn );
+        Application::RemoveAccel( &aAccEscape );
     }
 }
 
@@ -3332,8 +3332,8 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl()
     if ( !bAlreadyInCallback )
     {
         bAlreadyInCallback = true;
-        GetpApp()->RemoveAccel( &aAccReturn );
-        GetpApp()->RemoveAccel( &aAccEscape );
+        Application::RemoveAccel( &aAccReturn );
+        Application::RemoveAccel( &aAccEscape );
         Hide();
         aCallBackHdl.Call( this );
     }
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 89c1ca2980dc..269259198dc4 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -152,8 +152,8 @@ SvInplaceEdit2::SvInplaceEdit2
 
     aAccReturn.SetActivateHdl( LINK( this, SvInplaceEdit2, ReturnHdl_Impl) );
     aAccEscape.SetActivateHdl( LINK( this, SvInplaceEdit2, EscapeHdl_Impl) );
-    GetpApp()->InsertAccel( &aAccReturn );
-    GetpApp()->InsertAccel( &aAccEscape );
+    Application::InsertAccel( &aAccReturn );
+    Application::InsertAccel( &aAccEscape );
 
     pEdit->Show();
     pEdit->GrabFocus();
@@ -163,8 +163,8 @@ SvInplaceEdit2::~SvInplaceEdit2()
 {
     if( !bAlreadyInCallBack )
     {
-        GetpApp()->RemoveAccel( &aAccReturn );
-        GetpApp()->RemoveAccel( &aAccEscape );
+        Application::RemoveAccel( &aAccReturn );
+        Application::RemoveAccel( &aAccEscape );
     }
     delete pEdit;
 }
@@ -252,8 +252,8 @@ void SvInplaceEdit2::CallCallBackHdl_Impl()
     if ( !bAlreadyInCallBack )
     {
         bAlreadyInCallBack = true;
-        GetpApp()->RemoveAccel( &aAccReturn );
-        GetpApp()->RemoveAccel( &aAccEscape );
+        Application::RemoveAccel( &aAccReturn );
+        Application::RemoveAccel( &aAccEscape );
         pEdit->Hide();
         aCallBackHdl.Call( this );
     }
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index dfc086e7de83..10f10495673f 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1659,12 +1659,12 @@ void FontSizeBox::Fill( const vcl::FontInfo* pInfo, const FontList* pList )
     }
     else
     {
-        pAry = pList->GetStdSizeAry();
+        pAry = FontList::GetStdSizeAry();
     }
 
     // first insert font size names (for simplified/traditional chinese)
     FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
-    if ( pAry == pList->GetStdSizeAry() )
+    if ( pAry == FontList::GetStdSizeAry() )
     {
         // for standard sizes we don't need to bother
         if ( bStdSize && GetEntryCount() && aFontSizeNames.IsEmpty() )
@@ -1682,7 +1682,7 @@ void FontSizeBox::Fill( const vcl::FontInfo* pInfo, const FontList* pList )
 
     if ( !aFontSizeNames.IsEmpty() )
     {
-        if ( pAry == pList->GetStdSizeAry() )
+        if ( pAry == FontList::GetStdSizeAry() )
         {
             // for scalable fonts all font size names
             sal_uLong nCount = aFontSizeNames.Count();
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 860550ae9179..b0b3eba9479e 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -161,7 +161,7 @@ void FontSizeMenu::Fill( const vcl::FontInfo& rInfo, const FontList* pList )
     mpHeightAry = new long[nSizeCount+aFontSizeNames.Count()];
     if ( !aFontSizeNames.IsEmpty() )
     {
-        if ( pAry == pList->GetStdSizeAry() )
+        if ( pAry == FontList::GetStdSizeAry() )
         {
             // for scalable fonts all font size names
             sal_uLong nCount = aFontSizeNames.Count();
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index d39b8dabfb00..809b222e5d01 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -833,7 +833,7 @@ void AssignmentPersistentData::Commit()
             }
             else
             {
-                xDS = xDS.query( m_pImpl->m_xTransientDataSource );
+                xDS.set(m_pImpl->m_xTransientDataSource, css::uno::UNO_QUERY);
             }
 
             // build the connection
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index fbf33defd459..10130cdda8e3 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1281,7 +1281,7 @@ basegfx::B2DVector GraphicObject::calculateCropScaling(
     }
     else
     {
-        aBitmapSize = Application::GetDefaultDevice()->LogicToLogic(aBitmapSize, GetPrefMapMode(), aMapMode100thmm);
+        aBitmapSize = OutputDevice::LogicToLogic(aBitmapSize, GetPrefMapMode(), aMapMode100thmm);
     }
 
     const double fDivX(aBitmapSize.Width() - fLeftCrop - fRightCrop);
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index a184ae298d3d..8a1295b71854 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -638,7 +638,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
     {
         VirtualDevice aDummyVDev;
         GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() );
-        Size aMtfSize( aDummyVDev.LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_100TH_MM ) );
+        Size aMtfSize( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_100TH_MM ) );
         if ( aMtfSize.Width() && aMtfSize.Height() )
         {
             MapMode aNewMapMode( MAP_100TH_MM );
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index b75cd681317d..ef208b2e82fa 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -75,9 +75,9 @@ namespace svt
         :m_xInput( _rxInput )
         ,m_xOutput( _rxOutput )
     {
-        m_xSeekable = m_xSeekable.query( m_xInput );
+        m_xSeekable.set(m_xInput, css::uno::UNO_QUERY);
         if ( !m_xSeekable.is() )
-            m_xSeekable = m_xSeekable.query( m_xOutput );
+            m_xSeekable.set(m_xOutput, css::uno::UNO_QUERY);
         OSL_ENSURE( m_xSeekable.is(), "StreamSupplier::StreamSupplier: at least one of both must be seekable!" );
     }
 
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index b6c9f6907a8d..b1c771956352 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -54,14 +54,14 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ):
 void SfxItemDesruptor_Impl::LaunchDeleteOnIdle()
 {
     // process in Idle
-    GetpApp()->InsertIdleHdl( aLink, 1 );
+    Application::InsertIdleHdl( aLink, 1 );
 }
 
 SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
 {
 
     // remove from Idle-Handler
-    GetpApp()->RemoveIdleHdl( aLink );
+    Application::RemoveIdleHdl( aLink );
 
     // reset RefCount (was set to SFX_ITEMS_SPECIAL before!)
     pItem->SetRefCount( 0 );
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 1dc40e8092a0..ccce5deb75e6 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1448,13 +1448,11 @@ bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage )
 {
     if( !mxGraphicProvider.is() )
     {
-        Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
-        Reference< XInterface > x( graphic::GraphicProvider::create(xContext) );
-        mxGraphicProvider.query( x );
-        mxGraphicProvider = Reference< XGraphicProvider >( x, UNO_QUERY );
+        mxGraphicProvider = graphic::GraphicProvider::create(
+            comphelper::getProcessComponentContext());
     }
 
-    if( mxGraphicProvider.is() ) try
+    try
     {
         ::com::sun::star::beans::PropertyValues aProps( 1 );
         aProps[0].Name = "URL";