Kaydet (Commit) bef6471c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wunused-private-field (Clang towards 3.2)

Change-Id: I7d8b487e12defa4178869dc0ce1286722ad631db
üst 4662df8a
...@@ -62,7 +62,6 @@ namespace cmis ...@@ -62,7 +62,6 @@ namespace cmis
throw ( ucb::ContentCreationException ) throw ( ucb::ContentCreationException )
: ContentImplHelper( rxSMgr, pProvider, Identifier ), : ContentImplHelper( rxSMgr, pProvider, Identifier ),
m_pProvider( pProvider ), m_pProvider( pProvider ),
m_pSession( NULL ),
m_aURL( Identifier->getContentIdentifier( ) ), m_aURL( Identifier->getContentIdentifier( ) ),
m_sRepositoryId( ), m_sRepositoryId( ),
m_aRepositories( aRepos ) m_aRepositories( aRepos )
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <com/sun/star/ucb/TransferInfo.hpp> #include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XContentCreator.hpp> #include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contenthelper.hxx>
#include <libcmis/session-factory.hxx> #include <libcmis/repository.hxx>
#include <list> #include <list>
...@@ -68,7 +68,6 @@ class RepoContent : public ::ucbhelper::ContentImplHelper, ...@@ -68,7 +68,6 @@ class RepoContent : public ::ucbhelper::ContentImplHelper,
{ {
private: private:
ContentProvider* m_pProvider; ContentProvider* m_pProvider;
libcmis::Session* m_pSession;
URL m_aURL; URL m_aURL;
rtl::OUString m_sRepositoryId; rtl::OUString m_sRepositoryId;
......
...@@ -1351,8 +1351,7 @@ BaseContent::cPSL( void ) ...@@ -1351,8 +1351,7 @@ BaseContent::cPSL( void )
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
PropertySetInfoChangeNotifier* p = 0; PropertySetInfoChangeNotifier* p = 0;
if( m_pPropertySetInfoChangeListeners ) if( m_pPropertySetInfoChangeListeners )
p = new PropertySetInfoChangeNotifier( m_pMyShell, p = new PropertySetInfoChangeNotifier( this,
this,
m_xContentIdentifier, m_xContentIdentifier,
m_pPropertySetInfoChangeListeners->getElements() ); m_pPropertySetInfoChangeListeners->getElements() );
...@@ -1383,8 +1382,7 @@ BaseContent::cPCL( void ) ...@@ -1383,8 +1382,7 @@ BaseContent::cPCL( void )
(*listener)[seqNames[i]] = m_pPropertyListener->getContainer( seqNames[i] )->getElements(); (*listener)[seqNames[i]] = m_pPropertyListener->getContainer( seqNames[i] )->getElements();
} }
p = new PropertyChangeNotifier( m_pMyShell, p = new PropertyChangeNotifier( this,
this,
m_xContentIdentifier, m_xContentIdentifier,
listener ); listener );
} }
......
...@@ -38,8 +38,7 @@ FileContentIdentifier::FileContentIdentifier( ...@@ -38,8 +38,7 @@ FileContentIdentifier::FileContentIdentifier(
shell* pMyShell, shell* pMyShell,
const rtl::OUString& aUnqPath, const rtl::OUString& aUnqPath,
sal_Bool IsNormalized ) sal_Bool IsNormalized )
: m_pMyShell( pMyShell ), : m_pMyShell( pMyShell )
m_bNormalized( IsNormalized )
{ {
if( IsNormalized ) if( IsNormalized )
{ {
......
...@@ -85,7 +85,6 @@ namespace fileaccess { ...@@ -85,7 +85,6 @@ namespace fileaccess {
rtl::OUString m_aContentId; // The URL string rtl::OUString m_aContentId; // The URL string
rtl::OUString m_aNormalizedId; // The somehow normalized string rtl::OUString m_aNormalizedId; // The somehow normalized string
rtl::OUString m_aProviderScheme; rtl::OUString m_aProviderScheme;
sal_Bool m_bNormalized;
}; };
} // end namespace fileaccess } // end namespace fileaccess
......
...@@ -39,9 +39,7 @@ using namespace com::sun::star::ucb; ...@@ -39,9 +39,7 @@ using namespace com::sun::star::ucb;
XInputStream_impl::XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock ) XInputStream_impl::XInputStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_Bool bLock )
: m_pMyShell( pMyShell ), : m_xProvider( pMyShell->m_pProvider ),
m_xProvider( pMyShell->m_pProvider ),
m_bLock( bLock ),
m_aFile( aUncPath ), m_aFile( aUncPath ),
m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nErrorCode( TASKHANDLER_NO_ERROR ),
m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
......
...@@ -137,13 +137,10 @@ namespace fileaccess { ...@@ -137,13 +137,10 @@ namespace fileaccess {
private: private:
shell* m_pMyShell;
com::sun::star::uno::Reference< com::sun::star::uno::Reference<
com::sun::star::ucb::XContentProvider > m_xProvider; com::sun::star::ucb::XContentProvider > m_xProvider;
sal_Bool m_nIsOpen; sal_Bool m_nIsOpen;
sal_Bool m_bLock;
ReconnectingFile m_aFile; ReconnectingFile m_aFile;
sal_Int32 m_nErrorCode; sal_Int32 m_nErrorCode;
......
...@@ -148,12 +148,10 @@ void ContentEventNotifier::notifyExchanged() ...@@ -148,12 +148,10 @@ void ContentEventNotifier::notifyExchanged()
PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier( PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier(
shell* pMyShell,
const uno::Reference< XContent >& xCreatorContent, const uno::Reference< XContent >& xCreatorContent,
const uno::Reference< XContentIdentifier >& xCreatorId, const uno::Reference< XContentIdentifier >& xCreatorId,
const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners ) const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners )
: m_pMyShell( pMyShell ), : m_xCreatorContent( xCreatorContent ),
m_xCreatorContent( xCreatorContent ),
m_xCreatorId( xCreatorId ), m_xCreatorId( xCreatorId ),
m_sListeners( sListeners ) m_sListeners( sListeners )
{ {
...@@ -203,12 +201,10 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const rtl::OUString & aPro ...@@ -203,12 +201,10 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const rtl::OUString & aPro
PropertyChangeNotifier::PropertyChangeNotifier( PropertyChangeNotifier::PropertyChangeNotifier(
shell* pMyShell,
const com::sun::star::uno::Reference< XContent >& xCreatorContent, const com::sun::star::uno::Reference< XContent >& xCreatorContent,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId,
ListenerMap* pListeners ) ListenerMap* pListeners )
: m_pMyShell( pMyShell ), : m_xCreatorContent( xCreatorContent ),
m_xCreatorContent( xCreatorContent ),
m_xCreatorId( xCreatorId ), m_xCreatorId( xCreatorId ),
m_pListeners( pListeners ) m_pListeners( pListeners )
{ {
......
...@@ -75,13 +75,11 @@ namespace fileaccess { ...@@ -75,13 +75,11 @@ namespace fileaccess {
class PropertySetInfoChangeNotifier class PropertySetInfoChangeNotifier
{ {
private: private:
shell* m_pMyShell;
com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent;
com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId;
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > > m_sListeners; com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > > m_sListeners;
public: public:
PropertySetInfoChangeNotifier( PropertySetInfoChangeNotifier(
shell* pMyShell,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId,
const com::sun::star::uno::Sequence< const com::sun::star::uno::Sequence<
...@@ -100,13 +98,11 @@ namespace fileaccess { ...@@ -100,13 +98,11 @@ namespace fileaccess {
class PropertyChangeNotifier class PropertyChangeNotifier
{ {
private: private:
shell* m_pMyShell;
com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent;
com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId;
ListenerMap* m_pListeners; ListenerMap* m_pListeners;
public: public:
PropertyChangeNotifier( PropertyChangeNotifier(
shell* pMyShell,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId,
ListenerMap* pListeners ); ListenerMap* pListeners );
......
...@@ -103,7 +103,6 @@ XStream_impl::XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_B ...@@ -103,7 +103,6 @@ XStream_impl::XStream_impl( shell* pMyShell,const rtl::OUString& aUncPath, sal_B
m_bOutputStreamCalled( false ), m_bOutputStreamCalled( false ),
m_pMyShell( pMyShell ), m_pMyShell( pMyShell ),
m_xProvider( m_pMyShell->m_pProvider ), m_xProvider( m_pMyShell->m_pProvider ),
m_bLock( bLock ),
m_aFile( aUncPath ), m_aFile( aUncPath ),
m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nErrorCode( TASKHANDLER_NO_ERROR ),
m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) m_nMinorErrorCode( TASKHANDLER_NO_ERROR )
......
...@@ -211,8 +211,6 @@ namespace fileaccess { ...@@ -211,8 +211,6 @@ namespace fileaccess {
com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider;
sal_Bool m_nIsOpen; sal_Bool m_nIsOpen;
sal_Bool m_bLock;
ReconnectingFile m_aFile; ReconnectingFile m_aFile;
sal_Int32 m_nErrorCode; sal_Int32 m_nErrorCode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment