connectivity/source/drivers/file/FDriver.cxx | 1 connectivity/source/drivers/file/FResultSet.cxx | 1 connectivity/source/drivers/jdbc/PreparedStatement.cxx | 2 connectivity/source/drivers/jdbc/ResultSet.cxx | 2 connectivity/source/drivers/jdbc/ResultSetMetaData.cxx | 3 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 11 +- connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 5 - connectivity/source/drivers/odbc/OResultSet.cxx | 1 connectivity/source/drivers/odbc/OStatement.cxx | 1 connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx | 2 connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx | 2 connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx | 3 connectivity/source/drivers/postgresql/pq_statics.cxx | 40 ++++------ connectivity/source/drivers/postgresql/pq_xindex.hxx | 1 connectivity/source/drivers/postgresql/pq_xkey.hxx | 1 connectivity/source/drivers/postgresql/pq_xtable.hxx | 1 connectivity/source/inc/RowFunctionParser.hxx | 5 - connectivity/source/inc/file/FResultSet.hxx | 1 connectivity/source/inc/file/fcode.hxx | 3 connectivity/source/inc/java/sql/ResultSetMetaData.hxx | 3 connectivity/source/inc/odbc/OBoundParam.hxx | 9 -- connectivity/source/inc/odbc/OConnection.hxx | 5 - connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2 connectivity/source/inc/odbc/OPreparedStatement.hxx | 13 --- connectivity/source/inc/odbc/OResultSet.hxx | 1 connectivity/source/inc/odbc/OStatement.hxx | 1 cui/source/dialogs/colorpicker.cxx | 10 +- cui/source/factory/dlgfact.cxx | 8 -- cui/source/factory/dlgfact.hxx | 4 - cui/source/inc/border.hxx | 2 cui/source/inc/cfg.hxx | 5 - cui/source/inc/insdlg.hxx | 3 cui/source/inc/optdict.hxx | 13 --- cui/source/options/optdict.cxx | 13 --- cui/source/options/optlingu.cxx | 5 - cui/source/options/personalization.hxx | 1 dbaccess/source/core/api/CacheSet.hxx | 1 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 1 dbaccess/source/ext/macromigration/migrationengine.cxx | 4 - dbaccess/source/filter/xml/xmlExport.hxx | 1 dbaccess/source/filter/xml/xmlHelper.hxx | 1 dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 1 dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 1 dbaccess/source/filter/xml/xmlfilter.hxx | 1 dbaccess/source/ui/inc/DExport.hxx | 1 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 1 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2 desktop/source/deployment/gui/dp_gui.h | 16 ---- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 desktop/source/deployment/gui/dp_gui_dialog2.hxx | 1 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 3 desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 1 desktop/source/deployment/gui/license_dialog.cxx | 11 -- desktop/source/deployment/manager/dp_commandenvironments.hxx | 1 desktop/source/migration/services/oo3extensionmigration.hxx | 2 desktop/source/splash/unxsplash.cxx | 9 +- desktop/source/splash/unxsplash.hxx | 3 editeng/source/editeng/edtspell.cxx | 3 editeng/source/editeng/edtspell.hxx | 2 editeng/source/editeng/impedit4.cxx | 2 editeng/source/misc/splwrap.cxx | 4 - embeddedobj/source/inc/docholder.hxx | 2 eventattacher/source/eventattacher.cxx | 3 extensions/source/bibliography/bibbeam.hxx | 2 extensions/source/bibliography/bibcont.hxx | 3 extensions/source/bibliography/datman.hxx | 1 extensions/source/bibliography/general.hxx | 3 extensions/source/bibliography/toolbar.hxx | 2 extensions/source/update/check/updatecheck.cxx | 1 filter/source/config/cache/configflush.cxx | 7 - filter/source/config/cache/configflush.hxx | 6 - filter/source/graphic/GraphicExportDialog.cxx | 5 - filter/source/graphic/GraphicExportDialog.hxx | 1 filter/source/graphic/GraphicExportFilter.cxx | 5 - filter/source/graphic/GraphicExportFilter.hxx | 2 filter/source/msfilter/svdfppt.cxx | 3 filter/source/pdf/impdialog.hxx | 1 filter/source/pdf/pdfexport.hxx | 2 filter/source/placeware/exporter.hxx | 1 filter/source/svg/svgdialog.hxx | 1 filter/source/t602/t602filter.cxx | 8 +- filter/source/t602/t602filter.hxx | 3 filter/source/textfilterdetect/filterdetect.cxx | 9 +- filter/source/textfilterdetect/filterdetect.hxx | 4 - forms/source/component/DatabaseForm.cxx | 2 forms/source/component/DatabaseForm.hxx | 1 forms/source/component/Filter.cxx | 3 forms/source/component/Filter.hxx | 4 - forms/source/xforms/submission/submission.hxx | 1 fpicker/source/office/OfficeFilePicker.cxx | 18 +--- fpicker/source/office/OfficeFilePicker.hxx | 4 - fpicker/source/office/OfficeFolderPicker.cxx | 8 -- fpicker/source/office/OfficeFolderPicker.hxx | 2 fpicker/source/office/commonpicker.cxx | 3 fpicker/source/office/commonpicker.hxx | 4 - fpicker/source/office/iodlg.hxx | 2 framework/inc/services/mediatypedetectionhelper.hxx | 7 - framework/inc/services/uriabbreviation.hxx | 2 framework/inc/uielement/commandinfo.hxx | 6 - framework/inc/uielement/macrosmenucontroller.hxx | 6 - framework/inc/uielement/toolbarmanager.hxx | 1 framework/source/services/mediatypedetectionhelper.cxx | 3 framework/source/services/uriabbreviation.cxx | 3 include/connectivity/sqlparse.hxx | 1 include/editeng/splwrap.hxx | 3 include/filter/msfilter/svdfppt.hxx | 6 - include/oox/ole/axbinaryreader.hxx | 6 - include/oox/ole/axbinarywriter.hxx | 1 include/sfx2/printer.hxx | 1 include/sfx2/sidebar/Deck.hxx | 1 include/svtools/treelistbox.hxx | 1 include/svx/fmshell.hxx | 1 include/svx/fntszctl.hxx | 1 include/svx/sidebar/LinePropertyPanelBase.hxx | 2 include/svx/svxdlg.hxx | 4 - include/svx/unoshape.hxx | 3 include/toolkit/controls/unocontrols.hxx | 2 include/unotools/collatorwrapper.hxx | 1 include/unotools/confignode.hxx | 2 include/vbahelper/vbacollectionimpl.hxx | 10 -- sc/source/ui/vba/vbasheetobjects.cxx | 2 sfx2/source/sidebar/Deck.cxx | 1 svx/source/mnuctrls/fntszctl.cxx | 3 svx/source/sidebar/line/LinePropertyPanelBase.cxx | 1 124 files changed, 103 insertions(+), 364 deletions(-)
New commits: commit daa90e38cc85664be743ad1ef19a9c531b0b2b17 Author: Noel Grandin <[email protected]> Date: Wed Dec 23 08:13:30 2015 +0200 loplugin:unusedfields in connectivity Change-Id: I32226b6959b2bfd316de6ed93b070b68ad875562 diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 56299a0..decf7f2 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -225,7 +225,6 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xColumn) : OOperandRow(_nPos,::comphelper::getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) - , m_xColumn(_xColumn) { } diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index a82034f..688ff8a 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -90,7 +90,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte ,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE) ,m_xStatement(*pStmt) ,m_xMetaData(nullptr) - ,m_xDBMetaData(pStmt->getOwnConnection()->getMetaData()) ,m_nRowPos(-1) ,m_nFilePos(0) ,m_nLastVisitedPos(-1) diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 9aa42c8..b92f3f6 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -637,7 +637,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID); - return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection ); + return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection ); } void SAL_CALL java_sql_PreparedStatement::acquire() throw() diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 88fbf7d..1d18bb1 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -242,7 +242,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID); - return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection ); + return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection ); } Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index fa72a45..b504527 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -33,9 +33,8 @@ using namespace ::com::sun::star::lang; jclass java_sql_ResultSetMetaData::theClass = nullptr; -java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ) +java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rCon ) :java_lang_Object( pEnv, myObj ) - ,m_aLogger( _rResultSetLogger ) ,m_pConnection( &_rCon ) ,m_nColumnCount(-1) { diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index 25e2cc3..d1a9b7e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -36,21 +36,20 @@ using ::com::sun::star::lang::XMultiServiceFactory; static MozillaBootstrap *pMozillaBootstrap=nullptr; static Reference<XMozillaBootstrap> xMozillaBootstrap; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) { if (!pMozillaBootstrap) { - pMozillaBootstrap=new connectivity::mozab::MozillaBootstrap( _rxFactory ); + pMozillaBootstrap=new connectivity::mozab::MozillaBootstrap; pMozillaBootstrap->Init(); xMozillaBootstrap = pMozillaBootstrap; } return pMozillaBootstrap; } -MozillaBootstrap::MozillaBootstrap( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) - : OMozillaBootstrap_BASE(m_aMutex), m_xMSFactory( _rxFactory ), - m_ProfileAccess(nullptr), m_ProfileManager(nullptr) +MozillaBootstrap::MozillaBootstrap() + : OMozillaBootstrap_BASE(m_aMutex), + m_ProfileAccess(nullptr) { } diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index aa9df93..e887aec 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -38,17 +38,14 @@ namespace connectivity class MozillaBootstrap : public OMozillaBootstrap_BASE { protected: - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMSFactory; - ::osl::Mutex m_aMutex; // mutex is need to control member access virtual ~MozillaBootstrap(); protected: ProfileAccess * m_ProfileAccess; - ProfileManager * m_ProfileManager; public: void Init(); - explicit MozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + MozillaBootstrap(); // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 39c0460..1993c73 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -97,7 +97,6 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : ,m_nCurrentFetchState(0) ,m_bWasNull(true) ,m_bEOF(true) - ,m_bLastRecord(false) ,m_bFreeHandle(false) ,m_bInserting(false) ,m_bRowInserted(false) diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 301522d..0aa9f00 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -62,7 +62,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) ,m_pConnection(_pConnection) ,m_aStatementHandle(SQL_NULL_HANDLE) ,m_pRowStatusArray(nullptr) - ,rBHelper(OStatement_BASE::rBHelper) { osl_atomic_increment( &m_refCount ); m_pConnection->acquire(); diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index 73a2647..4175b5e 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -76,7 +76,7 @@ SequenceResultSet::SequenceResultSet( { if( pVec ) { - m_meta = new SequenceResultSetMetaData( mutex, *pVec, m_columnNames.getLength() ); + m_meta = new SequenceResultSetMetaData( *pVec, m_columnNames.getLength() ); } } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 548aee6..dabb16d 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -48,10 +48,8 @@ namespace pq_sdbc_driver { SequenceResultSetMetaData::SequenceResultSetMetaData( - const ::rtl::Reference< RefCountedMutex > & refMutex, const ColumnMetaDataVector &metaDataVector, int colCount ) : - m_refMutex( refMutex ), m_columnData( metaDataVector ), m_colCount( colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx index e943adb..7f1cf63 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx @@ -48,8 +48,6 @@ namespace pq_sdbc_driver class SequenceResultSetMetaData : public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData > { - ::rtl::Reference< RefCountedMutex > m_refMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin; ColumnMetaDataVector m_columnData; sal_Int32 m_colCount; @@ -58,7 +56,6 @@ namespace pq_sdbc_driver public: SequenceResultSetMetaData( - const ::rtl::Reference< RefCountedMutex > & reMutex, const ColumnMetaDataVector &vec, int colCount ); diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 3920be3..ea9ca01 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -64,8 +64,6 @@ struct DefColumnMetaData bool isCurrency; bool isNullable; bool isAutoIncrement; - bool isReadOnly; - bool isSigned; }; struct BaseTypeDef { const char * typeName; sal_Int32 value; }; @@ -681,25 +679,25 @@ Statics & getStatics() // that is what is returned by getTypeInfo().getMetaData() DefColumnMetaData defTypeInfoMetaData[] = { - { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 0 - { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 1 - { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 2 - { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 3 - { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 4 - { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 5 - { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 6 - { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 7 - { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 8 - { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 9 - { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 10 - { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 11 - { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 12 - { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true}, // 13 - { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 14 - { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 15 - { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false , true}, // 16 - { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 17 - {nullptr,nullptr,nullptr,nullptr,0,0,0,false,false,false,false, false} + { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 0 + { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 1 + { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 2 + { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 3 + { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 4 + { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 5 + { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 6 + { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 7 + { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 8 + { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 9 + { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 10 + { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 11 + { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 12 + { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false}, // 13 + { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 14 + { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 15 + { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false}, // 16 + { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 17 + {nullptr,nullptr,nullptr,nullptr,0,0,0,false,false,false} }; for( i = 0 ; defTypeInfoMetaData[i].columnName ; i++ ) diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx index 263f5b0..23e9cc1 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx @@ -53,7 +53,6 @@ namespace pq_sdbc_driver class Index : public ReflectionBase, public com::sun::star::sdbcx::XColumnsSupplier { - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta; ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexColumns; OUString m_schemaName; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx index 4fa99a4..76fda2a 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx @@ -53,7 +53,6 @@ namespace pq_sdbc_driver class Key : public ReflectionBase, public com::sun::star::sdbcx::XColumnsSupplier { - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta; ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_keyColumns; OUString m_schemaName; diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index dc5368b4..4f083e8 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -63,7 +63,6 @@ class Table : public ReflectionBase, public com::sun::star::sdbcx::XRename, public com::sun::star::sdbcx::XAlterTable { - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta; ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_columns; ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_keys; ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexes; diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index ec4466e..49dad87 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -29,11 +29,6 @@ namespace connectivity { -struct OOO_DLLPUBLIC_DBTOOLS RowEquation -{ - ORowSetValueDecoratorRef nPara[ 3 ]; -}; - enum ExpressionFunct { FUNC_CONST, diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 6e202cd..0eaeedd 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -104,7 +104,6 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 766b0cd..a4f2d65 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -94,9 +94,6 @@ namespace connectivity // Attributes from a result row class OOO_DLLPUBLIC_FILE OOperandAttr : public OOperandRow { - protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; - public: OOperandAttr(sal_uInt16 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index 4ff4f18..dac2a12 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -34,7 +34,6 @@ namespace connectivity public java_lang_Object { protected: - java::sql::ConnectionLog m_aLogger; java_sql_Connection* m_pConnection; sal_Int32 m_nColumnCount; @@ -45,7 +44,7 @@ namespace connectivity virtual jclass getMyClass() const override; // A ctor that is needed for returning the object - java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ); + java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rCon ); virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 36b0661..73b90f0 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -35,8 +35,6 @@ namespace connectivity : binaryData(nullptr) , paramLength(0) , paramInputStreamLen(0) - , sqlType(::com::sun::star::sdbc::DataType::SQLNULL) - , outputParameter(false) { } ~OBoundParam() @@ -125,12 +123,7 @@ namespace connectivity // until not needed anymore. sal_Int32 paramInputStreamLen; // Length of input stream - - sal_Int32 sqlType; // Java SQL type used to - // register an OUT parameter - - bool outputParameter; // true for OUTPUT parameters - }; + }; } } #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OBOUNDPARAM_HXX diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index e8e2bf0..a3122f5 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -56,13 +56,8 @@ namespace connectivity // Data attributes ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements - TTypeInfoVector m_aTypeInfo; // vector containing an entry - // for each row returned by - // DatabaseMetaData.getTypeInfo. - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by - // an operation OUString m_sUser; // the user name ODBCDriver* m_pDriver; // Pointer to the owning // driver object diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 94e5272..3eb9dda 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -64,9 +64,7 @@ namespace connectivity ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time ::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange; - ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange; ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; SQLHANDLE m_aStatementHandle; // ... until freed diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index edd9b32..41845c3 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -47,19 +47,6 @@ namespace connectivity { protected: static const short invalid_scale = -1; - struct Parameter - { - ::com::sun::star::uno::Any aValue; - sal_Int32 nDataType; - - Parameter(const ::com::sun::star::uno::Any& rValue, - sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) - { - } - - }; - - ::std::vector< Parameter> m_aParameters; // Data attributes diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 5ea18fc..9811fa5 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -144,7 +144,6 @@ namespace connectivity SQLRETURN m_nCurrentFetchState; bool m_bWasNull; bool m_bEOF; // after last record - bool m_bLastRecord; bool m_bFreeHandle; bool m_bInserting; bool m_bRowInserted; diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index b4d5bce..73ada50 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -74,7 +74,6 @@ namespace connectivity OConnection* m_pConnection;// The owning Connection object SQLHANDLE m_aStatementHandle; SQLUSMALLINT* m_pRowStatusArray; - ::cppu::OBroadcastHelper& rBHelper; protected: commit 4012390e0549e8cdc48e566608cad2c36e2df44e Author: Noel Grandin <[email protected]> Date: Tue Dec 22 16:23:45 2015 +0200 loplugin:unusedfields in cui Change-Id: I7a1092708881d1d43debf0217a5401c5b65838a5 diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 4d35120..059dcb8 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1522,7 +1522,7 @@ class ColorPicker : protected ::comphelper::OBaseMutex, // Struct for right i public ColorPickerBase { public: - explicit ColorPicker( Reference< XComponentContext > const & xContext ); + explicit ColorPicker(); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; @@ -1541,7 +1541,6 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw (RuntimeException, std::exception) override; private: - Reference< XComponentContext > mxContext; OUString msTitle; const OUString msColorKey; const OUString msModeKey; @@ -1555,9 +1554,9 @@ OUString SAL_CALL ColorPicker_getImplementationName() return OUString( "com.sun.star.cui.ColorPicker" ); } -Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & xContext ) +Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XComponentContext > const & ) { - return static_cast<XWeak*>( new ColorPicker( xContext ) ); + return static_cast<XWeak*>( new ColorPicker ); } Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException ) @@ -1566,9 +1565,8 @@ Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( Runt return seq; } -ColorPicker::ColorPicker( Reference< XComponentContext > const & xContext ) +ColorPicker::ColorPicker() : ColorPickerBase( m_aMutex ) - , mxContext( xContext ) , msColorKey( "Color" ) , msModeKey( "Mode" ) , mnColor( 0 ) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index b3a19ef..e142956 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1174,23 +1174,21 @@ AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordN return new AbstractFmInputRecordNoDialog_Impl( pDlg ); } -AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent, - ::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) +AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent ) { - VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent, xSpl ); + VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent ); return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); } VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - ::Reference< css::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId ) { Dialog* pDlg=nullptr; switch ( nResId ) { case RID_SFXDLG_EDITDICT : - pDlg = VclPtr<SvxEditDictionaryDialog>::Create( pParent, rName, xSpl ); + pDlg = VclPtr<SvxEditDictionaryDialog>::Create( pParent, rName ); break; default: break; diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 482dfc8..c71f014 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -586,11 +586,9 @@ public: const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) override; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) override; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, - css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) override; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) override; virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) override; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index ba780e1..e96ab2c 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -100,9 +100,7 @@ private: VclPtr<CheckBox> m_pMergeAdjacentBordersCB; VclPtr<CheckBox> m_pRemoveAdjcentCellBordersCB; - ImageList aShadowImgLstH; ImageList aShadowImgLst; - ImageList aBorderImgLstH; ImageList aBorderImgLst; long nMinValue; ///< minimum distance diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index f719758..a77cbeb 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -668,11 +668,6 @@ public: } }; -struct SvxIconSelectorToolBoxItem -{ - Image aImg; -}; - class SvxIconSelectorDialog : public ModalDialog { private: diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 1b68443..436669d 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -98,10 +98,7 @@ class SvInsertPlugInDialog : public InsertObjectDialog_Impl { private: VclPtr<Edit> m_pEdFileurl; - VclPtr<PushButton> m_pBtnFileurl; VclPtr<VclMultiLineEdit> m_pEdPluginsOptions; - INetURLObject* m_pURL; - OUString m_aCommands; DECL_LINK_TYPED(BrowseHdl, Button*, void); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 7f4d665..5f97eb9 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -55,17 +55,13 @@ private: VclPtr<CheckBox> pExceptBtn; VclPtr<OKButton> pOKBtn; css::uno::Reference< - css::linguistic2::XSpellChecker1 > xSpell; - css::uno::Reference< css::linguistic2::XDictionary > xNewDic; DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); public: - SvxNewDictionaryDialog( vcl::Window* pParent, - css::uno::Reference< - css::linguistic2::XSpellChecker1 > &xSpl ); + SvxNewDictionaryDialog( vcl::Window* pParent ); virtual ~SvxNewDictionaryDialog(); virtual void dispose() override; @@ -115,13 +111,10 @@ private: OUString sModify; OUString sNew; - DecorationView aDecoView; css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > aDics; //! snapshot copy to work on - css::uno::Reference< - css::linguistic2::XSpellChecker1 > xSpell; short nOld; long nWidth; @@ -149,9 +142,7 @@ private: public: SvxEditDictionaryDialog( vcl::Window* pParent, - const OUString& rName, - css::uno::Reference< - css::linguistic2::XSpellChecker1> &xSpl ); + const OUString& rName ); virtual ~SvxEditDictionaryDialog(); virtual void dispose() override; }; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 929179e..5fe38e7 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -97,12 +97,8 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex // class SvxNewDictionaryDialog ------------------------------------------- -SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent, - Reference< XSpellChecker1 > &xSpl ) : - - ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ), - - xSpell( xSpl ) +SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent ) : + ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ) { get(pNameEdit,"nameedit"); get(pLanguageLB,"language"); @@ -219,14 +215,11 @@ VCL_BUILDER_FACTORY_ARGS(SvxDictEdit, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK) SvxEditDictionaryDialog::SvxEditDictionaryDialog( vcl::Window* pParent, - const OUString& rName, - Reference< XSpellChecker1 > &xSpl ) : + const OUString& rName ) : ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ), sModify (CUI_RESSTR(STR_MODIFY)), - aDecoView ( this), - xSpell ( xSpl ), nOld ( NOACTDICT ), bFirstSelect (true), bDoNothing (false), diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 55f0d2e..98dbbde 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1613,11 +1613,10 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) } else if (m_pLinguDicsNewPB == pBtn) { - uno::Reference< XSpellChecker1 > xSpellChecker1; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 )); + std::unique_ptr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog( this )); DBG_ASSERT(aDlg, "Dialog creation failed!"); uno::Reference< XDictionary > xNewDic; if ( aDlg->Execute() == RET_OK ) @@ -1652,7 +1651,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), xSpellChecker1, RID_SFXDLG_EDITDICT )); + std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), RID_SFXDLG_EDITDICT )); DBG_ASSERT(aDlg, "Dialog creation failed!"); aDlg->Execute(); } diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index fc9c626..ea92dc2 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -39,7 +39,6 @@ private: std::vector<OUString> m_vExtensionPersonaSettings; public: - ::rtl::Reference< SearchAndParseThread > m_rApplyThread; SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxPersonalizationTabPage(); virtual void dispose() override; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index dc5240d..cf39d68 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -343,11 +343,9 @@ public: const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags )=0; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, - css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) = 0; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) = 0; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0; virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) = 0; commit a008a234252d94b0f644d020ea75ade551fbc01a Author: Noel Grandin <[email protected]> Date: Tue Dec 22 16:09:14 2015 +0200 loplugin:unusedfields in dbaccess Change-Id: I5f38bf33deaec17203e1bdcd3a61085266e42501 diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index e705edd..5047fbc 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -47,7 +47,6 @@ namespace dbaccess css::uno::Sequence<sal_Bool> m_aNullable; css::uno::Sequence<sal_Bool> m_aSignedFlags; css::uno::Sequence<sal_Int32> m_aColumnTypes; - ORowSetRow m_aInsertRow; OUString m_aComposedTableName; sal_Int32 m_nMaxRows; bool m_bInserted; diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index ab1137a..c8e9552 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -90,7 +90,6 @@ namespace dbaccess css::uno::Reference< css::container::XNameAccess> m_xConnectionTables; css::uno::Reference< css::container::XNameAccess> m_xConnectionQueries; css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - css::uno::Reference< css::container::XNameAccess> m_xColumns; css::uno::Reference< css::uno::XComponentContext> m_aContext; css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index a3170a2..219fef7 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -431,8 +431,7 @@ namespace dbmm { public: explicit DrawPageIterator( const Reference< XModel >& _rxDocument ) - :m_xDocument( _rxDocument ) - ,m_nPageCount( 0 ) + :m_nPageCount( 0 ) ,m_nCurrentPage( 0 ) { Reference< XDrawPageSupplier > xSingle( _rxDocument, UNO_QUERY ); @@ -471,7 +470,6 @@ namespace dbmm } private: - const Reference< XModel > m_xDocument; Reference< XDrawPage > m_xSinglePage; Reference< XDrawPages > m_xMultiPages; sal_Int32 m_nPageCount; diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 8cc1187..3f97629 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -108,7 +108,6 @@ class ODBExport : public SvXMLExport mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - mutable rtl::Reference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; Reference<XPropertySet> m_xDataSource; ::dbaccess::ODsnTypeCollection m_aTypeCollection; diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index f06cbb4..349125c 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -39,7 +39,6 @@ namespace dbaxml { protected: mutable ::std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; - mutable ::std::unique_ptr<XMLPropertyHandler> m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 8a0f5d0..d0d6ce3 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -46,7 +46,6 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport ,const OUString& _sCollectionServiceName ,const OUString& _sComponentServiceName) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) - ,m_xParentContainer(_xParentContainer) ,m_sCollectionServiceName(_sCollectionServiceName) ,m_sComponentServiceName(_sComponentServiceName) { diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index f21b4f7..b56fab4 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -29,7 +29,6 @@ namespace dbaxml class ODBFilter; class OXMLHierarchyCollection : public SvXMLImportContext { - css::uno::Reference< css::container::XNameAccess > m_xParentContainer; css::uno::Reference< css::container::XNameAccess > m_xContainer; css::uno::Reference< css::beans::XPropertySet > m_xTable; OUString m_sName; diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 650c400..32df1c1 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -63,7 +63,6 @@ private: TPropertyNameMap m_aQuerySettings; TPropertyNameMap m_aTablesSettings; TInfoSequence m_aInfoSequence; - Reference< XComponent > m_xSrcDoc; mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 4d3f18e..57920e6 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -75,7 +75,6 @@ namespace dbaui SharedConnection m_xConnection; ///< dest conn std::shared_ptr<IUpdateHelper> m_pUpdateHelper; - css::uno::Reference< css::sdbc::XResultSet > m_xResultSet; css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; ///< a number formatter working with the connection's NumberFormatsSupplier css::uno::Reference< css::uno::XComponentContext> m_xContext; css::util::Date m_aNullDate; diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 17710da..1e14c3f 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -135,7 +135,6 @@ namespace dbaui // </properties> OUString m_sDataSourceName; // the data source we're working for DataSourceHolder m_aDataSource; - Reference< XModel > m_xDocument; Reference< XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier sal_Int32 m_nDocStartNumber; bool m_bSuspended; // is true when the controller was already suspended diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 6471131..3af7c69 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -63,8 +63,6 @@ namespace dbaui VclPtr< ::svt::ListBoxControl> m_pTableCell; VclPtr< ::svt::ListBoxControl> m_pOrderCell; - OTableFieldDescRef m_pEmptyEntry; // default entry in the list may reference more than once - sal_Int32 m_nMaxColumns; // maximum number of columns in a Select-Statement OUString m_aFunctionStrings; commit 004803c0d8ac227e80afe4fba9ab8d0ea085f05d Author: Noel Grandin <[email protected]> Date: Tue Dec 22 16:02:46 2015 +0200 loplugin:unusedfields in desktop Change-Id: Ic816a7faf4d357d16c13f67533b3b409a531d14c diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 787eb7e..6d53692 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -65,22 +65,6 @@ enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE }; -class SelectedPackage: public salhelper::SimpleReferenceObject { -public: - SelectedPackage() {} - explicit SelectedPackage( const css::uno::Reference< css::deployment::XPackage> &xPackage) - : m_xPackage( xPackage ) - {} - - virtual ~SelectedPackage(); - -private: - SelectedPackage(SelectedPackage &) = delete; - void operator =(SelectedPackage &) = delete; - - css::uno::Reference< css::deployment::XPackage> m_xPackage; -}; - } // namespace dp_gui #endif diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 5c2e7f3..70c8eed 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1620,8 +1620,6 @@ sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException, } -SelectedPackage::~SelectedPackage() {} - } //namespace dp_gui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index e095a34..55d0ece 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -246,7 +246,6 @@ public: class UpdateRequiredDialogService : public ::cppu::WeakImplHelper< css::ui::dialogs::XExecutableDialog > { css::uno::Reference< css::uno::XComponentContext > const m_xComponentContext; - css::uno::Reference< css::awt::XWindow > m_xParent; public: UpdateRequiredDialogService( css::uno::Sequence< css::uno::Any > const & args, css::uno::Reference< css::uno::XComponentContext> const & xComponentContext ); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 5b97ad9..dcc0177 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -96,8 +96,6 @@ private: void removeTempDownloads(); UpdateInstallDialog & m_dialog; - cssu::Reference< css::deployment::XUpdateInformationProvider > - m_updateInformation; // guarded by Application::GetSolarMutex(): cssu::Reference< css::task::XAbortChannel > m_abort; @@ -208,7 +206,6 @@ UpdateInstallDialog::UpdateInstallDialog( "UpdateInstallDialog","desktop/ui/updateinstalldialog.ui"), m_thread(new Thread(xCtx, *this, aVecUpdateData)), - m_xComponentContext(xCtx), m_bError(false), m_bNoEntry(true), m_sInstalling(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_INSTALLING)), diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 65fc9c5..026693e 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -90,7 +90,6 @@ private: { return m_xExtensionManager; } rtl::Reference< Thread > m_thread; - css::uno::Reference< css::uno::XComponentContext > m_xComponentContext; css::uno::Reference< css::deployment::XExtensionManager > m_xExtensionManager; //Signals that an error occurred during download and installation bool m_bError; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 9455da2..cc7d3bd 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -75,7 +75,6 @@ protected: struct LicenseDialogImpl : public ModalDialog { - cssu::Reference<cssu::XComponentContext> m_xComponentContext; VclPtr<FixedText> m_pFtHead; VclPtr<FixedImage> m_pArrow1; VclPtr<FixedImage> m_pArrow2; @@ -95,7 +94,6 @@ struct LicenseDialogImpl : public ModalDialog LicenseDialogImpl( vcl::Window * pParent, - css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & sExtensionName, const OUString & sLicenseText); virtual ~LicenseDialogImpl() { disposeOnce(); } @@ -204,11 +202,9 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) LicenseDialogImpl::LicenseDialogImpl( vcl::Window * pParent, - cssu::Reference< cssu::XComponentContext > const & xContext, const OUString & sExtensionName, const OUString & sLicenseText) : ModalDialog(pParent, "LicenseDialog", "desktop/ui/licensedialog.ui") - , m_xComponentContext(xContext) , m_bLicenseRead(false) { get(m_pFtHead, "head"); @@ -321,11 +317,8 @@ sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception) sal_Int16 LicenseDialog::solar_execute() { - VclPtr<LicenseDialogImpl> dlg( - VclPtr<LicenseDialogImpl>::Create( - - VCLUnoHelper::GetWindow(m_parent), - m_xComponentContext, m_sExtensionName, m_sLicenseText)); + ScopedVclPtrInstance<LicenseDialogImpl> dlg( + VCLUnoHelper::GetWindow(m_parent), m_sExtensionName, m_sLicenseText); return dlg->Execute(); } diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index ebc3cb5..de58573 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -36,7 +36,6 @@ class BaseCommandEnv css::ucb::XProgressHandler > { protected: - css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler; void handle_(bool approve, bool abort, diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 7568201..79aebdd 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -114,8 +114,6 @@ namespace migration css::task::XInteractionHandler, css::ucb::XProgressHandler > { - css::uno::Reference< css::uno::XComponentContext > m_xContext; - css::uno::Reference< css::task::XInteractionHandler> m_forwardHandler; public: virtual ~TmpRepositoryCommandEnv(); TmpRepositoryCommandEnv(); diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx index dbf9e75..c396fc5 100644 --- a/desktop/source/splash/unxsplash.cxx +++ b/desktop/source/splash/unxsplash.cxx @@ -29,9 +29,8 @@ using namespace com::sun::star; namespace desktop { - UnxSplashScreen::UnxSplashScreen( const uno::Reference< uno::XComponentContext >& xCtx ) - : m_xCtx( xCtx ), - m_pOutFd( nullptr ) + UnxSplashScreen::UnxSplashScreen() + : m_pOutFd( nullptr ) { } @@ -143,14 +142,14 @@ using namespace desktop; // get service instance... static uno::Reference< uno::XInterface > m_xINSTANCE; -uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception ) +uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > & ) throw( uno::Exception ) { static osl::Mutex m_aMutex; if ( !m_xINSTANCE.is() ) { osl::MutexGuard guard( m_aMutex ); if ( !m_xINSTANCE.is() ) - m_xINSTANCE = static_cast<cppu::OWeakObject*>(new UnxSplashScreen( xCtx )); + m_xINSTANCE = static_cast<cppu::OWeakObject*>(new UnxSplashScreen); } return m_xINSTANCE; diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index 38e804a..4935777 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -39,12 +39,11 @@ private: static UnxSplashScreen *m_pINSTANCE; static osl::Mutex m_aMutex; - css::uno::Reference< css::uno::XComponentContext > m_xCtx; FILE *m_pOutFd; public: - explicit UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx ); + explicit UnxSplashScreen(); // XStatusIndicator virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException, std::exception ) override; diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index ad32334..e47e958 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -79,8 +79,6 @@ private: sal_Int32 m_nNoBorderResizeReact; sal_Int32 m_nNoResizeReact; - css::uno::Reference< css::ui::XDockingAreaAcceptor > m_xCachedDocAreaAcc; - css::uno::Sequence< css::uno::Any > m_aOutplaceFrameProps; commit fb93ed9f6f84ed393e4619eb653a70e1799dc261 Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:53:31 2015 +0200 loplugin:unusedfields in eventattacher Change-Id: I40c69865661cdca856118cab7c43cbb0eadfdc74 diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index ef72e0b..01fd76a 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -76,7 +76,6 @@ public: virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override; private: - Reference< XIdlReflection > m_xCoreReflection; Reference< XAllListener > m_xAllListener; Reference< XIdlClass > m_xListenerType; Any m_Helper; @@ -449,7 +448,6 @@ private: throw (CannotConvertException, RuntimeException); EventAttacherImpl * m_pEA; - Reference< XInterface > m_xEAHold; OUString m_EventMethod; Reference< XAllListener > m_AllListener; }; @@ -458,7 +456,6 @@ private: FilterAllListenerImpl::FilterAllListenerImpl( EventAttacherImpl * pEA_, const OUString& EventMethod_, const Reference< XAllListener >& AllListener_ ) : m_pEA( pEA_ ) - , m_xEAHold( *pEA_ ) , m_EventMethod( EventMethod_ ) , m_AllListener( AllListener_ ) { commit 167269f2feae3d6367ddeca2a0c32c32656eced3 Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:52:23 2015 +0200 loplugin:unusedfields in extensions Change-Id: I89d33ea8be97f32c090c8fbf739cbf5e150b12c4 diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 74cfcb2..5e5b712 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -46,8 +46,6 @@ namespace bib css::uno::Reference< css::frame::XController > m_xController; css::uno::Reference< css::frame::XFrame > m_xToolBarRef; - css::uno::Reference< css::frame::XFrame > m_xGridRef; - css::uno::Reference< css::awt::XWindow > m_xGridWin; BibDataManager* pDatMan; VclPtr<BibToolBar> pToolBar; diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index 01100a0..74648ec 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -67,9 +67,6 @@ class BibBookContainer: public BibSplitWindow css::uno::Reference< css::frame::XFrame > xTopFrameRef; css::uno::Reference< css::frame::XFrame > xBottomFrameRef; - css::uno::Reference< css::awt::XWindow > xTopPeerRef; - css::uno::Reference< css::awt::XWindow > xBottomPeerRef; - VclPtr<BibWindowContainer> pTopWin; VclPtr<BibWindowContainer> pBottomWin; HdlBibModul pBibMod; diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 224152d..80caa4e 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -83,7 +83,6 @@ class BibDataManager private: css::uno::Reference< css::form::XForm > m_xForm; css::uno::Reference< css::awt::XControlModel > m_xGridModel; - css::uno::Reference< css::beans::XPropertySet > m_xSourceProps; css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xParser; css::uno::Reference< css::form::runtime::XFormController > m_xFormCtrl; css::uno::Reference< css::frame::XDispatch > m_xFormDispatch; diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 117d54c..5d2c0ab 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -119,9 +119,6 @@ class BibGeneralPage: public BibTabPage xCtrlContnr; css::uno::Reference< css::form::XBoundComponent > - xCurrentBoundComponent; - - css::uno::Reference< css::form::XBoundComponent > xLBModel; css::uno::Reference< css::sdbc::XRowSetListener > diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 164eee6..8137d25 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -111,9 +111,7 @@ class BibToolBar: public ToolBox css::uno::Reference< css::frame::XController > xController; Idle aIdle; ImageList aImgLst; - ImageList aImgLstHC; ImageList aBigImgLst; - ImageList aBigImgLstHC; VclPtr<FixedText> aFtSource; VclPtr<ListBox> aLBSource; VclPtr<FixedText> aFtQuery; diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 82e37cf..600e408 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -280,7 +280,6 @@ private: { osl::MutexGuard aGuard(m_aMutex); m_xProvider.clear(); }; osl::Mutex m_aMutex; - osl::Module m_aModule; protected: osl::Condition& m_aCondition; commit a0b25939c403618abaedd10bf55a8e83fb8e94ea Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:49:26 2015 +0200 loplugin:unusedfields in filter Change-Id: Ic35cff139f5f180ff93fe7b1ecbd15de6c474821 diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 1f62536..2bf04cc 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -26,9 +26,8 @@ namespace filter{ namespace config{ -ConfigFlush::ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) +ConfigFlush::ConfigFlush() : BaseLock ( ) - , m_xSMGR (xSMGR ) , m_lListener(m_aLock) { } @@ -122,9 +121,9 @@ css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames() } -css::uno::Reference< css::uno::XInterface > ConfigFlush::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) +css::uno::Reference< css::uno::XInterface > ConfigFlush::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) { - ConfigFlush* pNew = new ConfigFlush(xSMGR); + ConfigFlush* pNew = new ConfigFlush; return css::uno::Reference< css::uno::XInterface >(static_cast< css::util::XRefreshable* >(pNew), css::uno::UNO_QUERY); } diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 413561c..e5bde60 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -50,10 +50,6 @@ class ConfigFlush : public BaseLock protected: - /** @short reference to an uno service manager, which can be used - to create own needed services. */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - /** @short holds all listener, which are registered at this instance. */ ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; @@ -67,7 +63,7 @@ class ConfigFlush : public BaseLock /** @short standard ctor. */ - explicit ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + ConfigFlush(); diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index 94f02c5..f2d9a82 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -37,9 +37,8 @@ using namespace css::uno; using namespace css::beans; using namespace css::lang; -GraphicExportDialog::GraphicExportDialog( const Reference< XComponentContext >& rxContext ) - : mxContext( rxContext ) - , meFieldUnit(FUNIT_NONE) +GraphicExportDialog::GraphicExportDialog( const Reference< XComponentContext >& ) + : meFieldUnit(FUNIT_NONE) , mbExportSelection( false ) { } diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx index 2e1726e..36869af 100644 --- a/filter/source/graphic/GraphicExportDialog.hxx +++ b/filter/source/graphic/GraphicExportDialog.hxx @@ -45,7 +45,6 @@ class GraphicExportDialog : public cppu::WeakImplHelper Sequence<PropertyValue> maMediaDescriptor; Sequence<PropertyValue> maFilterDataSequence; Reference<XComponent> mxSourceDocument; - Reference<XComponentContext> mxContext; OUString maDialogTitle; FieldUnit meFieldUnit; diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx index 678479e..86f0d49 100644 --- a/filter/source/graphic/GraphicExportFilter.cxx +++ b/filter/source/graphic/GraphicExportFilter.cxx @@ -23,9 +23,8 @@ #include <svl/outstrm.hxx> #include <svtools/DocumentToGraphicRenderer.hxx> -GraphicExportFilter::GraphicExportFilter( const Reference<XComponentContext>& rxContext ) - : mxContext( rxContext ) - , mExportSelection(false) +GraphicExportFilter::GraphicExportFilter( const Reference<XComponentContext>& ) + : mExportSelection(false) , mTargetWidth(0) , mTargetHeight(0) {} diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index 1579937..b0ae945 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -41,8 +41,6 @@ class GraphicExportFilter : public cppu::WeakImplHelper < XFilter, XExporter, XInitialization > { Reference<XComponent> mxDocument; - Reference<XComponentContext> mxContext; - Reference<task::XStatusIndicator> mxStatusIndicator; Reference<io::XOutputStream> mxOutputStream; void gatherProperties( const Sequence<PropertyValue>& rDescriptor ); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index f4d916e..cd2587b 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -74,7 +74,6 @@ class ImpPDFTabLinksPage; class ImpPDFTabDialog : public SfxTabDialog { private: - css::uno::Reference< css::uno::XComponentContext> mxContext; FilterConfigItem maConfigItem; FilterConfigItem maConfigI18N; diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index b37cf15..3f2ad46 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -92,8 +92,6 @@ private: bool mbCanCopyOrExtract; bool mbCanExtractForAccessibility; - SvtGraphicFill maCacheFill; - //--->i56629 bool mbExportRelativeFsysLinks; sal_Int32 mnDefaultLinkAction; diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx index de723ed..c70bd7e 100644 --- a/filter/source/placeware/exporter.hxx +++ b/filter/source/placeware/exporter.hxx @@ -46,7 +46,6 @@ private: css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::drawing::XGraphicExportFilter > mxGraphicExporter; - css::uno::Reference< css::task::XInteractionHandler > mxInteractionHandler; }; #endif diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 5b88b84..1f1553d 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -40,7 +40,6 @@ class SVGDialog : public ::svt::OGenericUnoDialog, { private: - ::std::unique_ptr< ResMgr > mapResMgr; css::uno::Sequence< css::beans::PropertyValue > maMediaDescriptor; css::uno::Sequence< css::beans::PropertyValue > maFilterData; css::uno::Reference< css::lang::XComponent > mxSrcDoc; diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 86ff3a5..8061a58 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -912,8 +912,8 @@ Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Referenc return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr )); } -T602ImportFilterDialog::T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ) : - mxMSF( r ), mpResMgr( nullptr ) {} +T602ImportFilterDialog::T602ImportFilterDialog() : + mpResMgr( nullptr ) {} T602ImportFilterDialog::~T602ImportFilterDialog() { @@ -1192,10 +1192,10 @@ Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( return aRet; } -Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & ) throw( Exception ) { - return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog( rSMgr )); + return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog); } } diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index d0d9d93..798a93d 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -96,7 +96,6 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < css::beans::XPropertyAccess > { - css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; css::lang::Locale meLocale; ResMgr *mpResMgr; bool OptionsDlg(); @@ -138,7 +137,7 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < css::uno::RuntimeException, std::exception) override; public: - explicit T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); + explicit T602ImportFilterDialog(); }; diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index 7d83103..632565f 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -116,8 +116,7 @@ bool IsHTMLStream( const uno::Reference<io::XInputStream>& xInStream ) } -PlainTextFilterDetect::PlainTextFilterDetect(const uno::Reference<uno::XComponentContext>& xCxt) : - mxCxt(xCxt) {} +PlainTextFilterDetect::PlainTextFilterDetect() {} PlainTextFilterDetect::~PlainTextFilterDetect() {} @@ -234,10 +233,10 @@ uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL -com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(css::uno::XComponentContext* component, - css::uno::Sequence<css::uno::Any> const &) +com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(css::uno::XComponentContext* , + css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(new PlainTextFilterDetect(component)); + return cppu::acquire(new PlainTextFilterDetect); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 343432b..200d3cd 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -32,11 +32,9 @@ class PlainTextFilterDetect : public cppu::WeakImplHelper< css::lang::XInitialization, css::lang::XServiceInfo> { - css::uno::Reference<css::uno::XComponentContext> mxCxt; - public: - explicit PlainTextFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); + PlainTextFilterDetect(); virtual ~PlainTextFilterDetect(); // XExtendedFilterDetection commit 5b339db1ab3ba8c3e657e70a5727fc83cc044e6d Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:41:24 2015 +0200 loplugin:unusedfields in forms Change-Id: I875c07dcfc9fd9537ced1facd88ac712a7dacbbd diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 0c0b347..2beb4cb 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -256,7 +256,6 @@ ODatabaseForm::ODatabaseForm(const Reference<XComponentContext>& _rxContext) ,OPropertyChangeListener(m_aMutex) ,m_aLoadListeners(m_aMutex) ,m_aRowSetApproveListeners(m_aMutex) - ,m_aRowSetListeners(m_aMutex) ,m_aSubmitListeners(m_aMutex) ,m_aErrorListeners(m_aMutex) ,m_aResetListeners( *this, m_aMutex ) @@ -295,7 +294,6 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource ) ,IPropertyBagHelperContext() ,m_aLoadListeners( m_aMutex ) ,m_aRowSetApproveListeners( m_aMutex ) - ,m_aRowSetListeners( m_aMutex ) ,m_aSubmitListeners( m_aMutex ) ,m_aErrorListeners( m_aMutex ) ,m_aResetListeners( *this, m_aMutex ) diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 469116b..570747f 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -162,7 +162,6 @@ class ODatabaseForm :public OFormComponents // listener administration ::cppu::OInterfaceContainerHelper m_aLoadListeners; ::cppu::OInterfaceContainerHelper m_aRowSetApproveListeners; - ::cppu::OInterfaceContainerHelper m_aRowSetListeners; ::cppu::OInterfaceContainerHelper m_aSubmitListeners; ::cppu::OInterfaceContainerHelper m_aErrorListeners; ResetListeners m_aResetListeners; diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 5cb32bd..f1a364b 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -85,9 +85,6 @@ namespace frm :UnoControl() ,m_aTextListeners( *this ) ,m_xContext( _rxORB ) -#if HAVE_FEATURE_DBCONNECTIVITY - ,m_aParser( _rxORB ) -#endif ,m_nControlClass( FormComponentType::TEXTFIELD ) ,m_bFilterList( false ) ,m_bMultiLine( false ) diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index de256f3..b82af06 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -64,16 +64,12 @@ namespace frm css::uno::Reference< css::beans::XPropertySet > m_xField; css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; css::uno::Reference< css::sdbc::XConnection > m_xConnection; - css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; css::uno::Reference< css::awt::XWindow > m_xMessageParent; typedef std::unordered_map< OUString, OUString, OUStringHash > MapString2String; MapString2String m_aDisplayItemToValueItem; OUString m_aText; -#if HAVE_FEATURE_DBCONNECTIVITY - ::connectivity::OSQLParser m_aParser; -#endif sal_Int16 m_nControlClass; // which kind of control do we use? bool m_bFilterList : 1; bool m_bMultiLine : 1; diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index c107469..927c0ab 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -109,7 +109,6 @@ class CSubmission protected: INetURLObject m_aURLObj; - css::uno::Reference< css::xml::xpath::XXPathObject > m_aXPathObject; css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment; css::uno::Reference< css::io::XInputStream > m_aResultStream; css::uno::Reference< css::uno::XComponentContext > m_xContext; commit 03ef7e11d8d93061eb6b99897aac67c2ce8a5951 Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:38:00 2015 +0200 loplugin:unusedfields in fpicker Change-Id: Ia5d9211a668c25c9891ed69902fe1a4fbb2d8483 diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 938e2a8..9bd9724 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -415,9 +415,8 @@ void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) // class SvtFilePicker -SvtFilePicker::SvtFilePicker( const Reference < XMultiServiceFactory >& xFactory ) - :OCommonPicker( xFactory ) - ,m_pFilterList ( nullptr ) +SvtFilePicker::SvtFilePicker() + :m_pFilterList ( nullptr ) ,m_pElemList ( nullptr ) ,m_bMultiSelection ( false ) ,m_nServiceType ( TemplateDescription::FILEOPEN_SIMPLE ) @@ -1147,16 +1146,14 @@ OUString SvtFilePicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance( - const Reference< XComponentContext >& rxContext) throw( Exception ) + const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new SvtFilePicker( xServiceManager ) ); + return Reference< XInterface >( *new SvtFilePicker ); } // SvtRemoteFilePicker -SvtRemoteFilePicker::SvtRemoteFilePicker( const Reference < XMultiServiceFactory >& xFactory ) - :SvtFilePicker( xFactory ) +SvtRemoteFilePicker::SvtRemoteFilePicker() { } @@ -1214,10 +1211,9 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance( - const Reference< XComponentContext >& rxContext) throw( Exception ) + const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new SvtRemoteFilePicker( xServiceManager ) ); + return Reference< XInterface >( *new SvtRemoteFilePicker ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 25fad32..da1d91e 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -82,7 +82,7 @@ protected: m_xDlgClosedListener; public: - SvtFilePicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ); + SvtFilePicker(); virtual ~SvtFilePicker(); @@ -231,7 +231,7 @@ protected: class SvtRemoteFilePicker : public SvtFilePicker { public: - SvtRemoteFilePicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ); + SvtRemoteFilePicker(); virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) override; diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index ecb48a4..9238632 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -36,8 +36,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -SvtFolderPicker::SvtFolderPicker( const Reference < XMultiServiceFactory >& _rxFactory ) - :SvtFolderPicker_Base( _rxFactory ) +SvtFolderPicker::SvtFolderPicker() { } @@ -184,11 +183,10 @@ OUString SvtFolderPicker::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& rxContext ) +Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new SvtFolderPicker( xServiceManager ) ); + return Reference< XInterface >( *new SvtFolderPicker ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 2452aa6..155f5a3 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -49,7 +49,7 @@ private: DECL_LINK_TYPED( DialogClosedHdl, Dialog&, void ); public: - SvtFolderPicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ); + SvtFolderPicker(); virtual ~SvtFolderPicker(); diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index e560f58..f47c956 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -46,10 +46,9 @@ namespace svt using namespace ::comphelper; - OCommonPicker::OCommonPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory ) + OCommonPicker::OCommonPicker() :OCommonPicker_Base( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) - ,m_xORB( _rxFactory ) ,m_pDlg( nullptr ) ,m_nCancelEvent( nullptr ) ,m_bExecuting( false ) diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index f8e50a4..6e61216 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -58,8 +58,6 @@ namespace svt ,public ::comphelper::OPropertyArrayUsageHelper< OCommonPicker > { private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xORB; - // <properties> OUString m_sHelpURL; css::uno::Reference< css::awt::XWindow > m_xWindow; @@ -85,7 +83,7 @@ namespace svt inline ::cppu::OBroadcastHelper& GetBroadcastHelper() { return OCommonPicker_Base::rBHelper; } public: - OCommonPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory ); + OCommonPicker(); protected: virtual ~OCommonPicker(); diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 9469078..75aab4d 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -78,8 +78,6 @@ private: ::utl::OConfigurationNode m_aConfiguration; ::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction; - css::uno::Reference< css::ui::dialogs::XDialogClosedListener > - m_xListener; bool m_bInExecuteAsync; bool m_bHasFilename; css::uno::Reference < css::uno::XComponentContext > commit 278f58c68b31faedb800a72aa0b44a7332f04a61 Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:34:12 2015 +0200 loplugin:unusedfields in framework Change-Id: Ic6cfbe9f0c7589804b7ffddac0350c188d974c3d diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index bff67bd..e19923a 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -79,13 +79,6 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper< css::util::XS virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter) throw (css::uno::RuntimeException, std::exception) override; - // variables - // should be private every time - - private: - - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// reference to global servicemanager - }; } // namespace framework diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index 999728c..79b3883 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -49,8 +49,6 @@ private: void operator =(UriAbbreviation &) = delete; virtual ~UriAbbreviation() {} - - css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace framework diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index 565478b..a6db494 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -28,15 +28,11 @@ namespace framework struct CommandInfo { CommandInfo() : nId( 0 ), - nImageInfo( 0 ), - bMirrored( false ), - bRotated( false ) {} + nImageInfo( 0 ) {} sal_uInt16 nId; ::std::vector< sal_uInt16 > aIds; sal_Int16 nImageInfo; - bool bMirrored : 1, - bRotated : 1; }; typedef BaseHash< CommandInfo > CommandToInfoMap; diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 2bec201..79fddf0 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -44,13 +44,7 @@ namespace framework { using svt::PopupMenuControllerBase::disposing; - struct ExecuteInfo - { - css::uno::Reference< css::frame::XDispatch > xDispatch; - }; css::uno::Reference< css::uno::XComponentContext > m_xContext; - css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; - css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; public: MacrosMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index f99c385..90f66ed 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -170,7 +170,6 @@ class ToolBarManager : public ToolbarManager_Base css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; css::uno::Reference< css::frame::XFrame > m_xFrame; - css::uno::Reference< css::container::XNameAccess > m_xUICommandLabels; ToolBarControllerMap m_aControllerMap; osl::Mutex m_mutex; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 5939bee..38fbb1d 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -28,8 +28,7 @@ using namespace ::com::sun::star; // constructor -MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) +MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& ) { } diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index 2491471..f9c81d7 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -43,8 +43,7 @@ DEFINE_INIT_SERVICE ( UriAbbreviation, } ) -UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & context) : - m_xContext(context) +UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & ) { } commit 1dbe54fd2e0c776c1f11c20bdb029fab14fc61ad Author: Noel Grandin <[email protected]> Date: Tue Dec 22 15:29:45 2015 +0200 loplugin:unusedfields in /include Change-Id: Ia406e727890a365cc89831c96140cad8240f9b61 diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 6f72410..896a562 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -41,9 +41,8 @@ using namespace com::sun::star::linguistic2; EditSpellWrapper::EditSpellWrapper( vcl::Window* _pWin, - Reference< XSpellChecker1 > &xChecker, bool bIsStart, bool bIsAllRight, EditView* pView ) : - SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight ) + SvxSpellWrapper( _pWin, bIsStart, bIsAllRight ) { SAL_WARN_IF( !pView, "editeng", "One view has to be abandoned!" ); // Keep IgnoreList, delete ReplaceList... diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 9fe8798..fb37d85 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -54,8 +54,6 @@ protected: public: EditSpellWrapper( vcl::Window* pWin, - css::uno::Reference< - css::linguistic2::XSpellChecker1 > &xChecker, bool bIsStart, bool bIsAllRight, EditView* pView ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f6d5aee..1f8bf52 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1499,7 +1499,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc ) bIsStart = true; EditSpellWrapper* pWrp = new EditSpellWrapper( Application::GetDefDialogParent(), - xSpeller, bIsStart, false, pEditView ); + bIsStart, false, pEditView ); pWrp->SpellDocument(); delete pWrp; diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 64a07c9..031d405 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -144,13 +144,11 @@ SvxSpellWrapper::~SvxSpellWrapper() --------------------------------------------------------------------*/ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, - Reference< XSpellChecker1 > &xSpellChecker, const bool bStart, const bool bIsAllRight, const bool bOther, const bool bRevAllow ) : pWin ( pWn ), - xSpell ( xSpellChecker ), - mpTextObj( nullptr), + mpTextObj ( nullptr), bOtherCntnt ( bOther ), bDialog ( false ), bHyphen ( false ), diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f9d14e8..f416298 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1882,9 +1882,8 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, } if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) ) { - uno::Reference< io::XInputStream > xIStrm = new utl::OSeekableInputStreamWrapper(*pDest ); uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() ); - PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind ); + PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, eAktPageKind ); css::uno::Reference< css::drawing::XShape > xShape; if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) ) pRet = GetSdrObjectFromXShape( xShape ); diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 3210fba..5f47f56 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -155,7 +155,6 @@ namespace connectivity css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::i18n::XCharacterClassification> m_xCharClass; static css::uno::Reference< css::i18n::XLocaleData4> s_xLocaleData; - css::uno::Reference< css::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale); diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index bde5681..8ca6a22 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -53,8 +53,6 @@ private: css::uno::Reference< css::uno::XInterface > xLast; // result of last spelling/hyphenation attempt css::uno::Reference< - css::linguistic2::XSpellChecker1 > xSpell; - css::uno::Reference< css::linguistic2::XHyphenator > xHyph; SdrObject* mpTextObj; bool bOtherCntnt : 1; // set => Check special sections initially @@ -76,7 +74,6 @@ private: public: SvxSpellWrapper( vcl::Window* pWn, - css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpellChecker, const bool bStart = false, const bool bIsAllRight = false, const bool bOther = false, const bool bRevAllow = true ); SvxSpellWrapper( vcl::Window* pWn, diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index b6eb794..46fef22 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1282,14 +1282,12 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage() override; PptPageKind ePageKind; const SdrPowerPointImport* mpPPTImporter; - css::uno::Reference< css::io::XInputStream > mxInStrm; public: - PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, css::uno::Reference< css::io::XInputStream >& rxInStrm, const css::uno::Reference< css::frame::XModel >& rxModel, PptPageKind ePKind ) : + PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, const css::uno::Reference< css::frame::XModel >& rxModel, PptPageKind ePKind ) : SvxMSConvertOCXControls ( rxModel ), ePageKind ( ePKind ), - mpPPTImporter ( pPPTImporter ), - mxInStrm ( rxInStrm ) + mpPPTImporter ( pPPTImporter ) {}; bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 7a14865..3d4e2a2 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -231,11 +231,9 @@ private: AxAlignedInputStream maInStrm; ///< The input stream to read from. ComplexPropVector maLargeProps; ///< Stores info for all used large properties. ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. - AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. - AxFontData maDummyFontData; ///< Dummy font for unsupported properties. StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties. - OUString maDummyString; ///< Dummy string for unsupported properties. - AxArrayString maDummyArrayString; ///< Dummy strings for unsupported ArrayString properties. + OUString maDummyString; ///< Dummy string for unsupported properties. + AxArrayString maDummyArrayString; ///< Dummy strings for unsupported ArrayString properties. sal_Int64 mnPropFlags; ///< Flags specifying existing properties. sal_Int64 mnNextProp; ///< Next property to read. sal_Int64 mnPropsEnd; ///< End position of simple/large properties. diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index d3c22c2..a0a34ff 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -144,7 +144,6 @@ private: AxAlignedOutputStream maOutStrm; ///< The input stream to read from. ComplexPropVector maLargeProps; ///< Stores info for all used large properties. ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. - AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. sal_Int16 mnBlockSize; sal_Int64 mnPropFlagsStart; ///< pos of Prop flags sal_Int64 mnPropFlags; ///< Flags specifying existing properties. diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx index caed737..f6cda40 100644 --- a/include/sfx2/printer.hxx ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
