mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedfields in basic

Browse Source 
Change-Id: I304f3903f305ba5b538964071ab95b57ebf2f970
This commit is contained in:
Noel Grandin
2015-12-23 09:46:48 +02:00
parent 85e9b0f3ea
commit 70d14d2ccd
8 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
basic/source/classes/sbunoobj.cxx
View File

@@ -3793,17 +3793,15 @@ SbUnoSingleton* findUnoSingleton( const OUString& rName )
{ {
Reference< XSingletonTypeDescription > xSingletonTypeDesc( xTypeDesc, UNO_QUERY ); Reference< XSingletonTypeDescription > xSingletonTypeDesc( xTypeDesc, UNO_QUERY );
if( xSingletonTypeDesc.is() ) if( xSingletonTypeDesc.is() )
pSbUnoSingleton = new SbUnoSingleton( rName, xSingletonTypeDesc ); pSbUnoSingleton = new SbUnoSingleton( rName );
} }
} }
} }
return pSbUnoSingleton; return pSbUnoSingleton;
} }
SbUnoSingleton::SbUnoSingleton( const OUString& aName_, SbUnoSingleton::SbUnoSingleton( const OUString& aName_ )
const Reference< XSingletonTypeDescription >& xSingletonTypeDesc )
: SbxObject( aName_ ) : SbxObject( aName_ )
, m_xSingletonTypeDesc( xSingletonTypeDesc )
{ {
SbxVariableRef xGetMethodRef = new SbxMethod( OUString( "get" ), SbxOBJECT ); SbxVariableRef xGetMethodRef = new SbxMethod( OUString( "get" ), SbxOBJECT );
QuickInsert( static_cast<SbxVariable*>(xGetMethodRef) ); QuickInsert( static_cast<SbxVariable*>(xGetMethodRef) );
@@ -3991,7 +3989,6 @@ public:
virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override;
private: private:
Reference< XIdlReflection > m_xCoreReflection;
Reference< XAllListener > m_xAllListener; Reference< XAllListener > m_xAllListener;
Reference< XIdlClass > m_xListenerType; Reference< XIdlClass > m_xListenerType;
Any m_Helper; Any m_Helper;

2
basic/source/inc/dlgcont.hxx
View File

@@ -119,7 +119,6 @@ public:
( (
ModifiableHelper& _rModifiable, ModifiableHelper& _rModifiable,
const OUString& aName, const OUString& aName,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
SfxDialogLibraryContainer* pParent SfxDialogLibraryContainer* pParent
); );
@@ -128,7 +127,6 @@ public:
( (
ModifiableHelper& _rModifiable, ModifiableHelper& _rModifiable,
const OUString& aName, const OUString& aName,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly, const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly,
SfxDialogLibraryContainer* pParent SfxDialogLibraryContainer* pParent

3
basic/source/inc/namecont.hxx
View File

@@ -560,7 +560,6 @@ class SfxLibrary
friend class SfxDialogLibraryContainer; friend class SfxDialogLibraryContainer;
friend class SfxScriptLibraryContainer; friend class SfxScriptLibraryContainer;
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::ucb::XSimpleFileAccess3 > mxSFI; css::uno::Reference< css::ucb::XSimpleFileAccess3 > mxSFI;
ModifiableHelper& mrModifiable; ModifiableHelper& mrModifiable;
@@ -622,13 +621,11 @@ public:
SfxLibrary( SfxLibrary(
ModifiableHelper& _rModifiable, ModifiableHelper& _rModifiable,
const css::uno::Type& aType, const css::uno::Type& aType,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI
); );
SfxLibrary( SfxLibrary(
ModifiableHelper& _rModifiable, ModifiableHelper& _rModifiable,
const css::uno::Type& aType, const css::uno::Type& aType,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aLibInfoFileURL,
const OUString& aStorageURL, const OUString& aStorageURL,

5
basic/source/inc/sbunoobj.hxx
View File

@@ -285,11 +285,8 @@ public:
// Wrapper for UNO Singleton // Wrapper for UNO Singleton
class SbUnoSingleton : public SbxObject class SbUnoSingleton : public SbxObject
{ {
const css::uno::Reference< css::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc;
public: public:
SbUnoSingleton( const OUString& aName_, SbUnoSingleton( const OUString& aName_ );
const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
void Notify( SfxBroadcaster&, const SfxHint& rHint ) override; void Notify( SfxBroadcaster&, const SfxHint& rHint ) override;
}; };

2
basic/source/inc/scriptcont.hxx
View File

@@ -148,14 +148,12 @@ public:
SfxScriptLibrary SfxScriptLibrary
( (
ModifiableHelper& _rModifiable, ModifiableHelper& _rModifiable,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI
); );
SfxScriptLibrary SfxScriptLibrary
( (
ModifiableHelper& _rModifiable, ModifiableHelper& _rModifiable,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI, const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly
); );

10
basic/source/uno/dlgcont.cxx
View File

@@ -85,7 +85,7 @@ SfxDialogLibraryContainer::SfxDialogLibraryContainer( const uno::Reference< embe
// Methods to get library instances of the correct type // Methods to get library instances of the correct type
SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const OUString& aName ) SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const OUString& aName )
{ {
SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, mxContext, mxSFI, this ); SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, mxSFI, this );
return pRet; return pRet;
} }
@@ -94,7 +94,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink
const OUString& StorageURL, bool ReadOnly ) const OUString& StorageURL, bool ReadOnly )
{ {
SfxLibrary* pRet = new SfxDialogLibrary SfxLibrary* pRet = new SfxDialogLibrary
( maModifiable, aName, mxContext, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this ); ( maModifiable, aName, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this );
return pRet; return pRet;
} }
@@ -467,10 +467,9 @@ Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceName
// Ctor // Ctor
SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const OUString& aName, const OUString& aName,
const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI, const Reference< XSimpleFileAccess3 >& xSFI,
SfxDialogLibraryContainer* pParent ) SfxDialogLibraryContainer* pParent )
: SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(), xContext, xSFI ) : SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(), xSFI )
, m_pParent( pParent ) , m_pParent( pParent )
, m_aName( aName ) , m_aName( aName )
{ {
@@ -478,14 +477,13 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const OUString& aName, const OUString& aName,
const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI, const Reference< XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aLibInfoFileURL,
const OUString& aStorageURL, const OUString& aStorageURL,
bool ReadOnly, bool ReadOnly,
SfxDialogLibraryContainer* pParent ) SfxDialogLibraryContainer* pParent )
: SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(), : SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(),
xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) xSFI, aLibInfoFileURL, aStorageURL, ReadOnly)
, m_pParent( pParent ) , m_pParent( pParent )
, m_aName( aName ) , m_aName( aName )
{ {

6
basic/source/uno/namecont.cxx
View File

@@ -3003,9 +3003,8 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServic
// Ctor // Ctor
SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI ) const Reference< XSimpleFileAccess3 >& xSFI )
: OComponentHelper( m_aMutex ) : OComponentHelper( m_aMutex )
, mxContext( xContext )
, mxSFI( xSFI ) , mxSFI( xSFI )
, mrModifiable( _rModifiable ) , mrModifiable( _rModifiable )
, maNameContainer( new NameContainer(aType) ) , maNameContainer( new NameContainer(aType) )
@@ -3025,10 +3024,9 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
} }
SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI, const Reference< XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly ) const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly )
: OComponentHelper( m_aMutex ) : OComponentHelper( m_aMutex )
, mxContext( xContext )
, mxSFI( xSFI ) , mxSFI( xSFI )
, mrModifiable( _rModifiable ) , mrModifiable( _rModifiable )
, maNameContainer( new NameContainer(aType) ) , maNameContainer( new NameContainer(aType) )

10
basic/source/uno/scriptcont.cxx
View File

@@ -117,7 +117,7 @@ SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embe
SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName ) SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName )
{ {
(void)aName; // Only needed for SfxDialogLibrary (void)aName; // Only needed for SfxDialogLibrary
SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxContext, mxSFI ); SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxSFI );
return pRet; return pRet;
} }
@@ -127,7 +127,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString& aN
bool ReadOnly ) bool ReadOnly )
{ {
(void)aName; // Only needed for SfxDialogLibrary (void)aName; // Only needed for SfxDialogLibrary
SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxContext, mxSFI, SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxSFI,
aLibInfoFileURL, StorageURL, ReadOnly ); aLibInfoFileURL, StorageURL, ReadOnly );
return pRet; return pRet;
} }
@@ -1181,21 +1181,19 @@ Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceName
// Ctor // Ctor
SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable,
const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI ) const Reference< XSimpleFileAccess3 >& xSFI )
: SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xContext, xSFI ) : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xSFI )
, mbLoadedSource( false ) , mbLoadedSource( false )
, mbLoadedBinary( false ) , mbLoadedBinary( false )
{ {
} }
SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable,
const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI, const Reference< XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aLibInfoFileURL,
const OUString& aStorageURL, const OUString& aStorageURL,
bool ReadOnly ) bool ReadOnly )
: SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xContext, xSFI, : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xSFI,
aLibInfoFileURL, aStorageURL, ReadOnly) aLibInfoFileURL, aStorageURL, ReadOnly)
, mbLoadedSource( false ) , mbLoadedSource( false )
, mbLoadedBinary( false ) , mbLoadedBinary( false )