loplugin:unusedfields UnoControls,ucb

Change-Id: I2ff2db21d79d80785f3b6849c879537d5111a960
This commit is contained in:
Noel Grandin
2015-12-21 12:45:50 +02:00
parent 85ae903734
commit dff9873c27
23 changed files with 20 additions and 68 deletions
@@ -50,7 +50,6 @@ FrameControl::FrameControl( const Reference< XComponentContext >& rxContext)
: BaseControl ( rxContext )
, OBroadcastHelper ( m_aMutex )
, OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) )
, m_aInterfaceContainer ( m_aMutex )
, m_aConnectionPointContainer ( new OConnectionPointContainerHelper(m_aMutex) )
{
}
-1
View File
@@ -213,7 +213,6 @@ private:
css::uno::Reference< css::frame::XFrame2 > m_xFrame;
OUString m_sComponentURL;
css::uno::Sequence< css::beans::PropertyValue > m_seqLoaderArguments;
::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer;
css::uno::Reference<OConnectionPointContainerHelper> m_aConnectionPointContainer;
}; // class FrameControl
+3 -7
View File
@@ -111,13 +111,11 @@ PropertySetMap_Impl;
// class PropertySetInfo_Impl
class PropertySetInfo_Impl : public cppu::WeakImplHelper < XPropertySetInfo >
{
Reference< XComponentContext > m_xContext;
Sequence< Property >* m_pProps;
PersistentPropertySet* m_pOwner;
public:
PropertySetInfo_Impl( const Reference< XComponentContext >& xContext,
PersistentPropertySet* pOwner );
PropertySetInfo_Impl( PersistentPropertySet* pOwner );
virtual ~PropertySetInfo_Impl();
// XPropertySetInfo
@@ -1238,7 +1236,7 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo
PropertySetInfo_Impl*& rpInfo = m_pImpl->m_pInfo;
if ( !rpInfo )
{
rpInfo = new PropertySetInfo_Impl( m_xContext, this );
rpInfo = new PropertySetInfo_Impl( this );
rpInfo->acquire();
}
return Reference< XPropertySetInfo >( rpInfo );
@@ -2197,10 +2195,8 @@ PropertySetRegistry& PersistentPropertySet::getPropertySetRegistry()
PropertySetInfo_Impl::PropertySetInfo_Impl(
const Reference< XComponentContext >& xContext,
PersistentPropertySet* pOwner )
: m_xContext( xContext ),
m_pProps( nullptr ),
: m_pProps( nullptr ),
m_pOwner( pOwner )
{
}
-2
View File
@@ -1316,7 +1316,6 @@ BaseContent::cPSL()
PropertySetInfoChangeNotifier* p = nullptr;
if( m_pPropertySetInfoChangeListeners )
p = new PropertySetInfoChangeNotifier( this,
m_xContentIdentifier,
m_pPropertySetInfoChangeListeners->getElements() );
return p;
@@ -1350,7 +1349,6 @@ BaseContent::cPCL()
}
p = new PropertyChangeNotifier( this,
m_xContentIdentifier,
listener );
}
+1 -2
View File
@@ -32,8 +32,7 @@ using namespace com::sun::star::ucb;
#endif
XCommandInfo_impl::XCommandInfo_impl( shell* pMyShell )
: m_pMyShell( pMyShell ),
m_xProvider( pMyShell->m_pProvider )
: m_pMyShell( pMyShell )
{
}
-1
View File
@@ -92,7 +92,6 @@ namespace fileaccess {
private:
shell* m_pMyShell;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
};
}
+2 -3
View File
@@ -32,9 +32,8 @@ using namespace com::sun::star::ucb;
#define THROW_WHERE ""
#endif
XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock )
: m_xProvider( pMyShell->m_pProvider ),
m_aFile( aUncPath ),
XInputStream_impl::XInputStream_impl( const OUString& aUncPath, bool bLock )
: m_aFile( aUncPath ),
m_nErrorCode( TASKHANDLER_NO_ERROR ),
m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
{
+1 -2
View File
@@ -42,7 +42,7 @@ namespace fileaccess {
{
public:
XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock );
XInputStream_impl( const OUString& aUncPath, bool bLock );
virtual ~XInputStream_impl();
@@ -137,7 +137,6 @@ namespace fileaccess {
private:
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
bool m_nIsOpen;
ReconnectingFile m_aFile;
-4
View File
@@ -149,10 +149,8 @@ void ContentEventNotifier::notifyExchanged()
PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier(
const uno::Reference< XContent >& xCreatorContent,
const uno::Reference< XContentIdentifier >& xCreatorId,
const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners )
: m_xCreatorContent( xCreatorContent ),
m_xCreatorId( xCreatorId ),
m_sListeners( sListeners )
{
@@ -202,10 +200,8 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty
PropertyChangeNotifier::PropertyChangeNotifier(
const css::uno::Reference< XContent >& xCreatorContent,
const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId,
ListenerMap* pListeners )
: m_xCreatorContent( xCreatorContent ),
m_xCreatorId( xCreatorId ),
m_pListeners( pListeners )
{
}
-4
View File
@@ -64,12 +64,10 @@ namespace fileaccess {
{
private:
css::uno::Reference< css::ucb::XContent > m_xCreatorContent;
css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId;
css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners;
public:
PropertySetInfoChangeNotifier(
const css::uno::Reference< css::ucb::XContent >& xCreatorContent,
const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId,
const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners );
void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName );
@@ -85,12 +83,10 @@ namespace fileaccess {
{
private:
css::uno::Reference< css::ucb::XContent > m_xCreatorContent;
css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId;
ListenerMap* m_pListeners;
public:
PropertyChangeNotifier(
const css::uno::Reference< css::ucb::XContent >& xCreatorContent,
const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId,
ListenerMap* pListeners );
~PropertyChangeNotifier();
-1
View File
@@ -36,7 +36,6 @@ using namespace com::sun::star::ucb;
XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath )
: m_pMyShell( pMyShell ),
m_xProvider( pMyShell->m_pProvider ),
m_count( 0 ),
m_seq( 0 )
{
+2 -3
View File
@@ -53,9 +53,8 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper<
throw( css::uno::RuntimeException, std::exception ) override;
private:
shell* m_pMyShell;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
sal_Int32 m_count;
shell* m_pMyShell;
sal_Int32 m_count;
css::uno::Sequence< css::beans::Property > m_seq;
};
}
-1
View File
@@ -79,7 +79,6 @@ XRow_impl::XRow_impl( shell* pMyShell,const uno::Sequence< uno::Any >& seq )
: m_aValueMap( seq ),
m_nWasNull(false),
m_pMyShell( pMyShell ),
m_xProvider( pMyShell->m_pProvider ),
m_xTypeConverter( nullptr )
{
}
+3 -4
View File
@@ -158,11 +158,10 @@ namespace fileaccess {
css::uno::RuntimeException, std::exception) override;
private:
osl::Mutex m_aMutex;
osl::Mutex m_aMutex;
css::uno::Sequence< css::uno::Any > m_aValueMap;
bool m_nWasNull;
shell* m_pMyShell;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
bool m_nWasNull;
shell* m_pMyShell;
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
};
-1
View File
@@ -47,7 +47,6 @@ XResultSet_impl::XResultSet_impl( shell* pMyShell,
const uno::Sequence< beans::Property >& seq,
const uno::Sequence< ucb::NumberedSortingInfo >& seqSort )
: m_pMyShell( pMyShell )
, m_xProvider( pMyShell->m_pProvider )
, m_nRow( -1 )
, m_nWasNull ( false )
, m_nOpenMode( OpenMode )
+3 -8
View File
@@ -582,17 +582,12 @@ class XResultSet_impl : public Notifier,
private:
// Members
// const uno::Reference< lang::XMultiServiceFactory > m_xMSF;
// const uno::Reference< ucb::XContentProvider > m_xProvider;
shell* m_pMyShell;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
bool m_nIsOpen;
bool m_nIsOpen;
sal_Int32 m_nRow;
bool m_nWasNull;
bool m_nWasNull;
sal_Int32 m_nOpenMode;
bool m_bRowCountFinal;
bool m_bRowCountFinal;
typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet;
typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet;
+1 -3
View File
@@ -41,11 +41,9 @@ using namespace css::ucb;
/* */
/******************************************************************************/
XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock )
XStream_impl::XStream_impl( const OUString& aUncPath, bool bLock )
: m_bInputStreamCalled( false ),
m_bOutputStreamCalled( false ),
m_pMyShell( pMyShell ),
m_xProvider( m_pMyShell->m_pProvider ),
m_aFile( aUncPath ),
m_nErrorCode( TASKHANDLER_NO_ERROR ),
m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
+2 -5
View File
@@ -49,7 +49,7 @@ class XStream_impl : public cppu::WeakImplHelper<
public:
XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock );
XStream_impl( const OUString& aUncPath, bool bLock );
/**
* Returns an error code as given by filerror.hxx
@@ -178,10 +178,7 @@ class XStream_impl : public cppu::WeakImplHelper<
osl::Mutex m_aMutex;
bool m_bInputStreamCalled,m_bOutputStreamCalled;
shell* m_pMyShell;
css::uno::Reference< css::ucb::XContentProvider > m_xProvider;
bool m_nIsOpen;
bool m_nIsOpen;
ReconnectingFile m_aFile;
+2 -2
View File
@@ -661,7 +661,7 @@ shell::open( sal_Int32 CommandId,
const OUString& aUnqPath,
bool bLock )
{
XInputStream_impl* xInputStream = new XInputStream_impl( this, aUnqPath, bLock ); // from filinpstr.hxx
XInputStream_impl* xInputStream = new XInputStream_impl( aUnqPath, bLock ); // from filinpstr.hxx
sal_Int32 ErrorCode = xInputStream->CtorSuccess();
@@ -697,7 +697,7 @@ shell::open_rw( sal_Int32 CommandId,
const OUString& aUnqPath,
bool bLock )
{
XStream_impl* xStream = new XStream_impl( this, aUnqPath, bLock ); // from filstr.hxx
XStream_impl* xStream = new XStream_impl( aUnqPath, bLock ); // from filstr.hxx
sal_Int32 ErrorCode = xStream->CtorSuccess();
-2
View File
@@ -551,9 +551,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
Reference< XDynamicResultSet > xSet
= new DynamicResultSet(
m_xContext,
this,
aOpenCommand,
Environment,
new ResultSetFactoryI(m_xContext,
m_xProvider.get(),
aOpenCommand.Properties,
-4
View File
@@ -39,13 +39,9 @@ using namespace ftp;
DynamicResultSet::DynamicResultSet(
const Reference< XComponentContext >& rxContext,
const rtl::Reference< FTPContent >& rxContent,
const OpenCommandArgument2& rCommand,
const Reference< XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory )
: ResultSetImplHelper( rxContext, rCommand ),
m_xContent( rxContent ),
m_xEnv( rxEnv ),
m_pFactory( pFactory )
{
}
-4
View File
@@ -31,8 +31,6 @@ namespace ftp {
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
rtl::Reference< FTPContent > m_xContent;
css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
ResultSetFactory* m_pFactory;
private:
@@ -42,9 +40,7 @@ namespace ftp {
public:
DynamicResultSet(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const rtl::Reference< FTPContent >& rxContent,
const css::ucb::OpenCommandArgument2& rCommand,
const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory );
virtual ~DynamicResultSet();
-3
View File
@@ -42,9 +42,6 @@ namespace ftp {
css::io::XOutputStream>& out);
virtual ~FTPOutputStreamContainer() {}
private:
css::uno::Reference< css::io::XOutputStream> m_out;
};