summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-13 17:51:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-13 17:54:32 +0200
commit7c2f000085cdd4ea58a69447a049523f2ad619f8 (patch)
treef0ab116c7b03100932f69732dcdaee6606d3f092
parentloplugin:staticcall (diff)
downloadcore-7c2f000085cdd4ea58a69447a049523f2ad619f8.tar.gz
core-7c2f000085cdd4ea58a69447a049523f2ad619f8.zip
loplugin:staticcall
Change-Id: Ie5e9e21f4c592c58094afc954f1de54512719fd5
-rw-r--r--sfx2/source/appl/appserv.cxx2
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx2
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx4
-rw-r--r--sfx2/source/control/dispatch.cxx2
-rw-r--r--sfx2/source/control/msgpool.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx2
-rw-r--r--sfx2/source/menu/mnumgr.cxx4
-rw-r--r--sfx2/source/notify/hintpost.cxx2
10 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7730e329c38c..bb71221d712c 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -560,7 +560,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
case SID_BASICBREAK :
- BASIC_DLL()->BasicBreak();
+ BasicDLL::BasicBreak();
break;
#endif
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index ac85991fc124..1e33b0d60f14 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -361,7 +361,7 @@ void SvBaseLink::_GetRealObject( bool bConnect)
{
OUString sServer;
if( pImpl->m_pLinkMgr->GetDisplayNames( this, &sServer ) &&
- sServer == GetpApp()->GetAppName() ) // internal Link !!!
+ sServer == Application::GetAppName() ) // internal Link !!!
{
// so that the Internal link can be created!
nObjType = OBJECT_INTERN;
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index d48b5b180d88..4ed63ec893a0 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -394,7 +394,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
// disable shutdown
pShutdownIcon->SetVeto( true );
- pShutdownIcon->addTerminateListener();
+ ShutdownIcon::addTerminateListener();
#ifdef ENABLE_GIO
GFile* pFile = NULL;
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 33d32e261bfd..ee84eaaacf2f 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -203,9 +203,9 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const OUString& rNam
// Try to find out the type of factory.
// Interpret given name as Service- and ShortName!
SvtModuleOptions aOpt;
- SvtModuleOptions::EFactory eFactory = aOpt.ClassifyFactoryByServiceName(rName);
+ SvtModuleOptions::EFactory eFactory = SvtModuleOptions::ClassifyFactoryByServiceName(rName);
if (eFactory == SvtModuleOptions::E_UNKNOWN_FACTORY)
- eFactory = aOpt.ClassifyFactoryByShortName(rName);
+ eFactory = SvtModuleOptions::ClassifyFactoryByShortName(rName);
// could not classify factory by its service nor by its short name.
// Must be an unknown factory! => return NULL
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index cd1a946fe2d7..e8be74f4834b 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -973,7 +973,7 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem )
// Put with mapped Which-Id if possible
const SfxItemPool *pPool = rSet.GetPool();
sal_uInt16 nWhich = rItem.Which();
- if ( pPool->IsSlot(nWhich) )
+ if ( SfxItemPool::IsSlot(nWhich) )
nWhich = pPool->GetWhich(nWhich);
rSet.Put( rItem, nWhich );
}
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 41ddaa2bcd7e..352de2c113cd 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -173,7 +173,7 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo )
SfxResId aResId( (*_pGroups)[_nCurGroup] );
aResId.SetRT(RSC_STRING);
- if ( !aResId.GetResMgr()->IsAvailable(aResId) )
+ if ( !SfxResId::GetResMgr()->IsAvailable(aResId) )
{
OSL_FAIL( "GroupId-Name not defined in SFX!" );
return OUString();
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index c04ae90ecd13..ecda3b483cc2 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -912,7 +912,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
mnPostUserEventId = 0;
// create the picker component
- mxFileDlg = mxFileDlg.query( xFactory->createInstance( aService ) );
+ mxFileDlg.set(xFactory->createInstance( aService ), css::uno::UNO_QUERY);
mbSystemPicker = lcl_isSystemFilePicker( mxFileDlg );
uno::Reference< XFilePickerNotifier > xNotifier( mxFileDlg, UNO_QUERY );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 3eaf8e355415..b70421e04b84 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1119,7 +1119,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI )
if ( !bHandleSysLocked )
{
- uno::Sequence< OUString > aOwnData = aLockFile.GenerateOwnEntry();
+ uno::Sequence< OUString > aOwnData = svt::LockFileCommon::GenerateOwnEntry();
bOwnLock = ( aData.getLength() > LOCKFILE_USERURL_ID
&& aOwnData.getLength() > LOCKFILE_USERURL_ID
&& aOwnData[LOCKFILE_SYSUSERNAME_ID].equals( aData[LOCKFILE_SYSUSERNAME_ID] ) );
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 51536b7e66c1..b2cbdceb4648 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -150,9 +150,9 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
// get synonym list for sub menu
std::vector< OUString > aSynonyms;
SfxThesSubMenuHelper aHelper;
- OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) );
+ OUString aText( SfxThesSubMenuHelper::GetText( aThesLookUpStr, nDelimPos ) );
lang::Locale aLocale;
- aHelper.GetLocale( aLocale, aThesLookUpStr, nDelimPos );
+ SfxThesSubMenuHelper::GetLocale( aLocale, aThesLookUpStr, nDelimPos );
const bool bHasMoreSynonyms = aHelper.GetMeanings( aSynonyms, aText, aLocale, 7 /*max number of synonyms to retrieve*/ );
(void) bHasMoreSynonyms;
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index fddafb36f30c..f13953845f19 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -41,7 +41,7 @@ SfxHintPoster::~SfxHintPoster()
void SfxHintPoster::Post( SfxHint* pHintToPost )
{
- GetpApp()->PostUserEvent( ( LINK(this, SfxHintPoster, DoEvent_Impl) ), pHintToPost );
+ Application::PostUserEvent( ( LINK(this, SfxHintPoster, DoEvent_Impl) ), pHintToPost );
AddRef();
}