diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-03 11:34:11 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:01 +0200 |
commit | 3f18d628ec32eee15903332469bd52f0bd6197b8 (patch) | |
tree | 8139a9f95474f1dd683a9e0224dc702d9dd48a28 | |
parent | 6bf3b6d420873e236b2805a42a95ce33e614ad98 (diff) |
loplugin:constantfunction: sot
this appears to be completely unused
Change-Id: I74dad8b0c478a1aed035ce9cc663a74de157816e
-rw-r--r-- | basctl/source/basicide/basdoc.hxx | 1 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/sot/object.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/GraphicDocShell.hxx | 2 | ||||
-rw-r--r-- | sot/source/base/object.cxx | 11 | ||||
-rw-r--r-- | sot/source/sdstor/stgelem.hxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgstrms.cxx | 8 | ||||
-rw-r--r-- | starmath/inc/document.hxx | 1 | ||||
-rw-r--r-- | sw/inc/docsh.hxx | 1 | ||||
-rw-r--r-- | sw/inc/wdocsh.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/glshell.hxx | 4 |
13 files changed, 5 insertions, 35 deletions
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index bb7393b15ef6..5b6210d5dcab 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -49,7 +49,6 @@ protected: public: TYPEINFO_OVERRIDE(); - using SotObject::GetInterface; SFX_DECL_OBJECTFACTORY(); SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH ) diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c1361ce9241a..423e0fb4b39b 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -220,8 +220,6 @@ public: void Stamp_SetPrintCancelState(bool bState); bool Stamp_GetPrintCancelState() const; - using SotObject::GetInterface; - static OUString CreateShellID( const SfxObjectShell* pShell ); // Document-Shell Iterator diff --git a/include/sot/object.hxx b/include/sot/object.hxx index efc8c1d9d221..c4aa662927dd 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -115,9 +115,6 @@ public: virtual const SotFactory * GetSvFactory() const; virtual void * Cast( const SotFactory * ); - // only for the macros in So3 not to get out of hand - IUnknown * GetInterface( const SvGlobalName & ); - bool Owner() const { return bOwner; } sal_uInt16 GetOwnerLockCount() const { return nOwnerLockCount; } diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 0a0c09d23059..423e13e7337e 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -176,8 +176,6 @@ public: ScDocShell( const sal_uInt64 i_nSfxCreationFlags = SFXMODEL_EMBEDDED_OBJECT ); virtual ~ScDocShell(); - using SotObject::GetInterface; - #if ENABLE_TELEPATHY SAL_DLLPRIVATE ScCollaboration* GetCollaboration(); #endif diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 43aec19d3f07..dc2d510ecb43 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -105,7 +105,6 @@ public: virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; - using SotObject::GetInterface; using SfxObjectShell::GetVisArea; using SfxShell::GetViewShell; diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 4a18ae332b58..3e418c5e257b 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -46,8 +46,6 @@ private: public: SFX_DECL_OBJECTFACTORY(); - using SotObject::GetInterface; - GraphicDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, bool bSdDataObj=false, diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 2e5a7811fb7d..ddce68b1636e 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -62,17 +62,6 @@ SotObject::~SotObject() SotFactory::DecSvObjectCount( this ); } -/************************************************************************* -|* SotObject::GetInterface() -|* -|* Beschreibung: Um so3 zu helfen -*************************************************************************/ -IUnknown * SotObject::GetInterface( const SvGlobalName & ) -{ - return NULL; -} - - void SotObject::OwnerLock ( bool bLock /* true, lock. false, unlock. */ diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index c36b5b48b4e7..7afe2201318b 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -76,7 +76,7 @@ public: void SetFATChain( sal_Int32 n ); sal_Int32 GetMasters() const { return nMaster; } void SetMasters( sal_Int32 n ); - short GetFAT1Size() const { return cFATPagesInHeader; } + static short GetFAT1Size() { return cFATPagesInHeader; } const ClsId& GetClassId() const { return aClsId; } sal_Int32 GetFATPage( short ) const; void SetFATPage( short, sal_Int32 ); diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 0dbfe367c3fe..8a624e042f5c 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -585,10 +585,10 @@ sal_Int32 StgFATStrm::GetPage( short nOff, bool bMake, sal_uInt16 *pnMasterAlloc { OSL_ENSURE( nOff >= 0, "The offset may not be negative!" ); if( pnMasterAlloc ) *pnMasterAlloc = 0; - if( nOff < rIo.aHdr.GetFAT1Size() ) + if( nOff < StgHeader::GetFAT1Size() ) return rIo.aHdr.GetFATPage( nOff ); sal_Int32 nMaxPage = nSize >> 2; - nOff = nOff - rIo.aHdr.GetFAT1Size(); + nOff = nOff - StgHeader::GetFAT1Size(); // Anzahl der Masterpages, durch die wir iterieren muessen sal_uInt16 nMasterCount = ( nPageSize >> 2 ) - 1; sal_uInt16 nBlocks = nOff / nMasterCount; @@ -664,11 +664,11 @@ bool StgFATStrm::SetPage( short nOff, sal_Int32 nNewPage ) m_aPagesCache.clear(); bool bRes = true; - if( nOff < rIo.aHdr.GetFAT1Size() ) + if( nOff < StgHeader::GetFAT1Size() ) rIo.aHdr.SetFATPage( nOff, nNewPage ); else { - nOff = nOff - rIo.aHdr.GetFAT1Size(); + nOff = nOff - StgHeader::GetFAT1Size(); // Anzahl der Masterpages, durch die wir iterieren muessen sal_uInt16 nMasterCount = ( nPageSize >> 2 ) - 1; sal_uInt16 nBlocks = nOff / nMasterCount; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 0976c863fbc4..e437dd1ccee1 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -155,7 +155,6 @@ public: TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+1) - using SotObject::GetInterface; SFX_DECL_OBJECTFACTORY(); private: diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 7461487771f0..bfcf69fcadd9 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -150,7 +150,6 @@ protected: virtual void DoFlushDocInfo() SAL_OVERRIDE; public: - using SotObject::GetInterface; /// but we implement this ourselves. SFX_DECL_INTERFACE(SW_DOCSHELL) diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index f365f935784b..df2a8f77e616 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -26,8 +26,6 @@ class SW_DLLPUBLIC SwWebDocShell: public SwDocShell sal_uInt16 nSourcePara; // Active line in source view. public: - using SotObject::GetInterface; - // But implement yourself. SFX_DECL_INTERFACE(SW_WEBDOCSHELL) SFX_DECL_OBJECTFACTORY(); diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx index e7e3674587fd..b3023eb263b2 100644 --- a/sw/source/uibase/inc/glshell.hxx +++ b/sw/source/uibase/inc/glshell.hxx @@ -26,8 +26,6 @@ class SwGlosDocShell : public SwDocShell OUString aShortName; OUString aGroupName; - using SotObject::GetInterface; - protected: virtual bool Save() SAL_OVERRIDE; @@ -60,8 +58,6 @@ class SwWebGlosDocShell : public SwWebDocShell OUString aShortName; OUString aGroupName; - using SotObject::GetInterface; - protected: virtual bool Save() SAL_OVERRIDE; |