diff options
86 files changed, 38 insertions, 272 deletions
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index 417160ac9d60..6cf7ee356a52 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -135,7 +135,6 @@ private: glm::vec3 maDefaultCameraPosition; glm::vec3 maDefaultCameraDirection; - glm::vec3 maStepDirection; float mnMaxX; float mnMaxY; float mnDistance; diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 5339eb17bca5..0487008d0e9f 100644 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -131,7 +131,6 @@ private: #if 0 GLint m_RenderProID; #endif - glm::vec4 m_ClearColor; GLuint m_VertexBuffer; diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx index d87c40e92a17..f7d76103e4e8 100644 --- a/compilerplugins/clang/unusedfields.cxx +++ b/compilerplugins/clang/unusedfields.cxx @@ -180,7 +180,7 @@ bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl ) // unwrap array types while (type->isArrayType()) type = type->getAsArrayTypeUnsafe()->getElementType(); - +/* if( CXXRecordDecl* recordDecl = type->getAsCXXRecordDecl() ) { bool warn_unused = recordDecl->hasAttr<WarnUnusedAttr>(); @@ -196,7 +196,7 @@ bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl ) if (!warn_unused) return true; } - +*/ definitionSet.insert(niceName(canonicalDecl)); return true; } diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index c0e93f126295..be6178b43b07 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -86,7 +86,6 @@ Connection::Connection(FirebirdDriver* _pDriver) , m_bIsEmbedded(false) , m_xEmbeddedStorage(nullptr) , m_bIsFile(false) - , m_sUser() , m_bIsAutoCommit(false) , m_bIsReadOnly(false) , m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ) @@ -408,7 +407,6 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( OUString sSqlStatement (transformPreparedStatement( _sSql )); Reference< XPreparedStatement > xReturn = new OPreparedStatement(this, - m_aTypeInfo, sSqlStatement); m_aStatements.push_back(WeakReferenceHelper(xReturn)); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 6cd5d699357b..f1954ad37078 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -124,12 +124,9 @@ namespace connectivity /** We are using an external (local) file */ bool m_bIsFile; - /* REMOTE CONNECTION DATA */ - ::rtl::OUString m_sUser; - /* CONNECTION PROPERTIES */ - bool m_bIsAutoCommit; - bool m_bIsReadOnly; + bool m_bIsAutoCommit; + bool m_bIsReadOnly; sal_Int32 m_aTransactionIsolation; isc_db_handle m_aDBHandle; diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index fbc2faea8719..a29c822c5b33 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -51,10 +51,8 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS OPreparedStatement::OPreparedStatement( Connection* _pConnection, - const TTypeInfoVector& _TypeInfo, const OUString& sql) :OStatementCommonBase(_pConnection) - ,m_aTypeInfo(_TypeInfo) ,m_sSqlStatement(sql) ,m_pOutSqlda(nullptr) ,m_pInSqlda(nullptr) diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index e08236b0f15c..e0711a7ecaf6 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -48,24 +48,6 @@ namespace connectivity public OPreparedStatement_Base { protected: - 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; - - TTypeInfoVector m_aTypeInfo; // Hashtable containing an entry - // for each row returned by - // DatabaseMetaData.getTypeInfo. - ::rtl::OUString m_sSqlStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; @@ -105,7 +87,6 @@ namespace connectivity DECLARE_SERVICE_INFO(); // a constructor, which is required for returning objects: OPreparedStatement( Connection* _pConnection, - const TTypeInfoVector& _TypeInfo, const ::rtl::OUString& sql); //XInterface diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 069402ac1558..718533e6315a 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -47,8 +47,7 @@ OStatementCommonBase::OStatementCommonBase(Connection* _pConnection) : OStatementCommonBase_Base(m_aMutex), OPropertySetHelper(OStatementCommonBase_Base::rBHelper), m_pConnection(_pConnection), - m_aStatementHandle( 0 ), - rBHelper(OStatementCommonBase_Base::rBHelper) + m_aStatementHandle( 0 ) { } diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index e849b341ba91..1a7ccc0fdc5c 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -58,8 +58,6 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; - ::rtl::Reference<Connection> m_pConnection; ISC_STATUS_ARRAY m_statusVector; @@ -103,7 +101,6 @@ namespace connectivity public: - ::cppu::OBroadcastHelper& rBHelper; explicit OStatementCommonBase(Connection* _pConnection); using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index 7e461132af7a..ba34a19914c4 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -132,15 +132,6 @@ namespace connectivity return s_pProps; } - class OBase_Mutex - { - public: - ::osl::Mutex m_aMutex; - }; - - - - } } #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_SUBCOMPONENT_HXX diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index fd101a20e249..007302fb2053 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -43,7 +43,6 @@ namespace connectivity // Data attributes - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; MorkDriver* m_pDriver; // Pointer to the owning // driver object OColumnAlias m_aColumnAlias; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index df22af3b012b..430c01f2d2f2 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -43,9 +43,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedState OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql) :OCommonStatement(_pConnection) - ,m_nNumParams(0) ,m_sSqlStatement(sql) - ,m_bPrepared(false) ,m_pResultSet() { } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 186b32fce139..9e7e7f60d3a9 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -44,27 +44,10 @@ namespace connectivity public OPreparedStatement_BASE { protected: - 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 - sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement - OUString m_sSqlStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; - bool m_bPrepared; ::rtl::Reference< OResultSet > m_pResultSet; ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns OValueRow m_aParameterRow; diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 03d702808346..904026dfe423 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -170,7 +170,6 @@ namespace connectivity typedef std::vector< MQueryHelperResultEntry* > resultsArray; mutable ::osl::Mutex m_aMutex; - ::osl::Condition m_aCondition; resultsArray m_aResults; sal_uInt32 m_nIndex; bool m_bHasMore; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index b0e2f3e2713e..134e6839b01f 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -108,7 +108,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv ,m_pKeySet(nullptr) ,m_nNewRow(0) ,m_nUpdatedRow(0) - ,m_RowStates(0) ,m_bIsReadOnly(TRISTATE_INDET) { //m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords()); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 7335995418d1..142c375c52de 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -241,7 +241,6 @@ protected: ::rtl::Reference<OKeySet> m_pKeySet; sal_Int32 m_nNewRow; //inserted row sal_Int32 m_nUpdatedRow; //updated row - sal_Int32 m_RowStates; TriState m_bIsReadOnly; inline void resetParameters() { m_nParamIndex = 0; } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 5cfa0dc2425c..416b381b35a4 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -81,7 +81,6 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection ) ,m_pConnection(_pConnection) ,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) ) ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) ) - ,rBHelper(OCommonStatement_IBASE::rBHelper) { m_xDBMetaData = _pConnection->getMetaData(); m_pParseTree = nullptr; diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 8ff6831b3723..abe436069687 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -76,8 +76,6 @@ namespace connectivity // for this Statement - ::std::list< OUString> m_aBatchList; - OTable* m_pTable; OConnection* m_pConnection; // The owning Connection object @@ -93,8 +91,6 @@ namespace connectivity ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; - ::cppu::OBroadcastHelper& rBHelper; - protected: // OPropertyArrayUsageHelper diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 98bf332c5997..3920be3b3934 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -715,9 +715,7 @@ Statics & getStatics() defTypeInfoMetaData[i].scale, defTypeInfoMetaData[i].isCurrency, defTypeInfoMetaData[i].isNullable, - defTypeInfoMetaData[i].isAutoIncrement, - defTypeInfoMetaData[i].isReadOnly, - defTypeInfoMetaData[i].isSigned ) ); + defTypeInfoMetaData[i].isAutoIncrement ) ); } p = &statics; diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index 505eceafd8f2..2b4a75bc393e 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -61,9 +61,7 @@ struct ColumnMetaData sal_Int32 _scale, bool _isCurrency, bool _isNullable, - bool _isAutoIncrement, - bool _isReadOnly, - bool _isSigned ) : + bool _isAutoIncrement ) : columnName( _columnName ), tableName( _tableName ), schemaTableName( _schemaTableName ), @@ -73,9 +71,7 @@ struct ColumnMetaData scale( _scale ), isCurrency( _isCurrency ), isNullable( _isNullable ), - isAutoIncrement( _isAutoIncrement ), - isReadOnly( _isReadOnly ), - isSigned( _isSigned ) + isAutoIncrement( _isAutoIncrement ) {} OUString columnName; @@ -88,21 +84,10 @@ struct ColumnMetaData bool isCurrency; bool isNullable; bool isAutoIncrement; - bool isReadOnly; - bool isSigned; }; typedef std::vector< ColumnMetaData > ColumnMetaDataVector; -struct TypeDetails -{ - sal_Int32 dataType; - sal_Int32 minScale; - sal_Int32 maxScale; // in case nothing is given in getTypeInfo - bool isAutoIncrement; - bool isSearchable; -}; - typedef std::unordered_map < OUString, diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 034dbb4cb40b..58a57fce4201 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -54,8 +54,6 @@ namespace connectivity ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by - OUString m_aFilenameExtension; OFileDriver* m_pDriver; // Pointer to the owning // driver object diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 2eb5df821aa6..41ba413e7f60 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -147,10 +147,6 @@ private: RECT_POINT m_eRP; bool m_bObjSelected; - XLineStyleItem m_aXLStyle; - XLineWidthItem m_aXWidth; - XLineDashItem m_aXDash; - XLineColorItem m_aXColor; XLineAttrSetItem m_aXLineAttr; SfxItemSet& m_rXLSet; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 65992f56815a..c86511d3ff64 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -98,10 +98,6 @@ SvxLineTabPage::SvxLineTabPage m_eRP( RP_LT ), m_bObjSelected( false ), - m_aXLStyle ( drawing::LineStyle_DASH ), - m_aXWidth ( 1 ), - m_aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ), - m_aXColor ( OUString(), COL_LIGHTRED ), m_aXLineAttr ( rInAttrs.GetPool() ), m_rXLSet ( m_aXLineAttr.GetItemSet() ), m_pnLineEndListState( nullptr ), diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 437fb0a5d6f6..ce177087a227 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -228,7 +228,6 @@ void Migration::migrateSettingsIfNecessary() } MigrationImpl::MigrationImpl() - : m_vrVersions(new strings_v) { } diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index bb8a731217b5..9f35cae5afe2 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -173,8 +173,6 @@ class MigrationImpl { private: - strings_vr m_vrVersions; - migrations_available m_vMigrationsAvailable; // list of all available migrations migrations_vr m_vrMigrations; // list of all migration specs from config install_info m_aInfo; // info about the version being migrated diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index c9aef52f4294..7b7fc46b56cd 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -332,7 +332,6 @@ public: private: css::uno::Reference< css::text::XText > mxText; - ESelection maSelection; }; @@ -343,8 +342,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( const ESelection& rSel, const OUString& rFileName, const css::uno::Reference< css::xml::sax::XDocumentHandler > & xHandler) -: SvXMLExport( xContext, "", rFileName, xHandler, (static_cast<frame::XModel*>(new SvxSimpleUnoModel())), FUNIT_CM ), - maSelection( rSel ) +: SvXMLExport( xContext, "", rFileName, xHandler, (static_cast<frame::XModel*>(new SvxSimpleUnoModel())), FUNIT_CM ) { SvxEditEngineSource aEditSource( pEditEngine ); diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index 638f3ad12ee9..2258c6c3da51 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -428,7 +428,6 @@ class DXFHatchEntity : public DXFBasicEntity public: - DXFVector aElevationPoint; sal_Int32 nFlags; // 70 (solid fill = 1, pattern fill = 0) sal_Int32 nAssociativityFlag; // 71 (associative = 1, non-associative = 0) sal_Int32 nBoundaryPathCount; // 91 diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx index 9339d475021a..3bd0af6d08b9 100644 --- a/forms/source/xforms/submission/serialization.hxx +++ b/forms/source/xforms/submission/serialization.hxx @@ -39,7 +39,6 @@ class CSerialization { protected: css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment; - std::map<OUString, OUString> m_properties; public: virtual ~CSerialization() {} diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index d416cf220631..8be1b4a49889 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -30,7 +30,6 @@ class L10N_DLLPUBLIC IndexerPreProcessor { private: - fs::path m_fsIndexBaseDir; fs::path m_fsCaptionFilesDirName; fs::path m_fsContentFilesDirName; @@ -82,7 +81,6 @@ private: std::string extensionPath; std::string extensionDestination; bool bExtensionMode; - fs::path indexDirName; fs::path indexDirParentName; IndexerPreProcessor* m_pIndexerPreProcessor; bool m_bUseLangRoot; diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 7d4cfe53b880..fb7425e3dd03 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -41,7 +41,6 @@ IndexerPreProcessor::IndexerPreProcessor ( const fs::path& fsIndexBaseDir, const fs::path& idxCaptionStylesheet, const fs::path& idxContentStylesheet ) - : m_fsIndexBaseDir( fsIndexBaseDir ) { m_fsCaptionFilesDirName = fsIndexBaseDir / "caption"; fs::create_directory( m_fsCaptionFilesDirName ); diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 0c385f70821a..3bf5e0c7a3f1 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -92,7 +92,6 @@ public: // list of used types while writing SvMetaTypeMemberList aUsedTypes; OString aIFaceName; - SvIdentifier aStructSlotId; void StartNewFile( const OUString& rName ); void SetExportFile( const OUString& rName ) diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index b8dfa9d08016..b6e67e7fa11a 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -23,13 +23,6 @@ #include <slot.hxx> #include <object.hxx> -struct SvNamePos -{ - SvGlobalName aUUId; - SvNamePos( const SvGlobalName & rName ) - : aUUId( rName ) {} -}; - class SvMetaModule : public SvMetaExtern { SvMetaClassMemberList aClassList; diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index fee2a5a8df55..25bca906274d 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -89,7 +89,6 @@ class SvMetaType : public SvMetaExtern SvBOOL aIn; // input parameter SvBOOL aOut; // return parameter Svint aCall0, aCall1; - Svint aSbxDataType; SvIdentifier aSvName; SvIdentifier aSbxName; SvIdentifier aOdlName; diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index f683458790d9..47c2882a4668 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -222,7 +222,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase& #define CTOR \ : aCall0( CALL_VALUE, false ) \ , aCall1( CALL_VALUE, false ) \ - , aSbxDataType( 0, false ) \ , pAttrList( nullptr ) \ , nType( TYPE_BASE ) \ , bIsItem( false ) \ diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index 90d2b72ebd01..47d7687146a0 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -50,12 +50,11 @@ class SfxBroadcaster; struct SbxParamInfo { const OUString aName; // Name of the parameter - SbxBaseRef aTypeRef; // Object, if object type SbxDataType eType; // Data type SbxFlagBits nFlags; // Flag-Bits sal_uInt32 nUserData; // IDs etc. - SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n, SbxBase* b = nullptr ) - : aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {} + SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n ) + : aName( s ), eType( t ), nFlags( n ), nUserData( 0 ) {} ~SbxParamInfo() {} }; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index cfd27ddba410..b6eb794f0a37 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -104,7 +104,6 @@ struct SdHyperlinkEntry sal_Int32 nEndPos; OUString aConvSubString; - ESelection aESelection; }; // Helper class for reading the PPT InteractiveInfoAtom diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 2baa43c95f6a..15dea984ccec 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -97,7 +97,6 @@ struct SfxChildWinContextFactory { SfxChildWinContextCtor pCtor; // Factory method sal_uInt16 nContextId; // Idenifier for SfxInterface - SfxChildWinInfo aInfo; // Configuration SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID ) : pCtor(pTheCtor) diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 4aefe3b478bb..c94a7de5a345 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -420,7 +420,6 @@ private: sal_Int32 m_nLineHeight; sal_Int32 m_nScrollPos; - SvtSysLocale m_aSysLocale; std::vector< CustomPropertyLine* > m_aCustomPropertiesLines; CustomPropertyLine* m_pCurrentLine; SvNumberFormatter m_aNumberFormatter; diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx index 98e5360d16c1..0286be1445d5 100644 --- a/include/sot/storinfo.hxx +++ b/include/sot/storinfo.hxx @@ -31,7 +31,6 @@ class SvStorageInfo { friend class SotStorage; OUString aName; - SvGlobalName aClassName; sal_uLong nSize; bool bStream; bool bStorage; diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index ef8956f8b8b4..455be97b809f 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -167,7 +167,6 @@ class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet // Handles all Ranges. Ranges are automatically modified by putting items. { - SfxVoidItem aDefault; sal_uInt16 nFree; public: diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 5046f638e7d8..b5e4290ceabf 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -217,7 +217,6 @@ public: }; private: - vcl::Font m_aDefaultFont; Link<sal_uInt16,int> m_aMasterStateProvider; Link<sal_uInt16,bool> m_aMasterSlotExecutor; diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 5d39bdb91220..ec17a589bd6d 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -35,13 +35,12 @@ protected: SdrDragMethod* mpCurrentSdrDragMethod; SdrUndoGeoObj* mpInsPointUndo; Rectangle maDragLimit; - OUString maInsPointUndoStr; - SdrMarkList maFollowingEdges; // If nodes are dragged, all edges should follow as Xor + OUString maInsPointUndoStr; SdrHdlKind meDragHdl; - sal_uIntPtr mnDragXorPolyLimit; - sal_uIntPtr mnDragXorPointLimit; - sal_uInt16 mnDetailedEdgeDraggingLimit; + sal_uIntPtr mnDragXorPolyLimit; + sal_uIntPtr mnDragXorPointLimit; + sal_uInt16 mnDetailedEdgeDraggingLimit; bool mbFramDrag : 1; // currently frame dragging bool mbDragSpecial : 1; // currently Special Obj-dragging diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 9f94e60abc52..49029ceee764 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -143,7 +143,6 @@ protected: // All windows this view is displayed on SdrPaintWindowVector maPaintWindows; - MapMode maActualMapMode; Size maGridBig; // FIXME: We need to get rid of this eventually Size maGridFin; // FIXME: We need to get rid of this eventually SdrDragStat maDragStat; diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index ae9e98f3bc58..3650ed0d357b 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -119,7 +119,6 @@ namespace stoc_connector void completeConnectionString(); ::osl::ConnectorSocket m_socket; - ::osl::SocketAddr m_addr; oslInterlockedCount m_nStatus; OUString m_sDescription; diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 241e6fff206f..d6d786347478 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -54,7 +54,6 @@ class SpellCheckerDispatcher : typedef std::shared_ptr< LangSvcEntries_Spell > LangSvcEntries_Spell_Ptr_t; typedef std::map< LanguageType, LangSvcEntries_Spell_Ptr_t > SpellSvcByLangMap_t; SpellSvcByLangMap_t aSvcMap; - LinguOptions aOpt; css::uno::Reference< css::linguistic2::XLinguProperties > xPropSet; css::uno::Reference< css::linguistic2::XSearchableDictionaryList > xDicList; diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index ebb5c7014efe..ea1f8c39a0e9 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -104,8 +104,6 @@ namespace connectivity // of all the Statement objects // for this Connection - SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation - rtl::OUString m_aURL; // URL of connection rtl::OUString m_sUser; // the user name MysqlCDriver& m_rDriver; // Pointer to the owning driver object sql::Driver* cppDriver; diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index d7d22f40a27d..517b7a32e12e 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -101,7 +101,6 @@ public: typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid; typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: - ::std::unique_ptr< TStringPair > m_aAutoIncrement; TSectionsGrid m_aSectionsGrid; TPropertyStyleMap m_aAutoStyleNames; diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 1bf99cca2a9b..105c0e547475 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -74,7 +74,6 @@ private: mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pGroupsElemTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pGroupElemTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pSectionElemTokenMap; mutable ::std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index de4c11597485..d994763a3a20 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -343,7 +343,7 @@ public: virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0; virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ) = 0; + int nId ) = 0; virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0; diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 346621455788..9a919cbabc17 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -38,13 +38,10 @@ public: const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); -private: - XclFunctionProvider maFuncProv; /// Excel function data provider. }; XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : - XclImpRoot( rRoot ), - maFuncProv( rRoot ) + XclImpRoot( rRoot ) { } diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 36dcbdcbedf2..eb0011c5e209 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -139,7 +139,6 @@ private: ScDocument& mrDoc; std::unique_ptr<ScConditionalFormat> mpCurrentFormat; - std::unique_ptr<ScFormatEntry> mpCurrentEntry; condformat::ScFormatEntryType meEntryType; }; @@ -197,9 +196,6 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet ScOrcusSheetProperties maProperties; ScOrcusConditionalFormat maConditionalFormat; - typedef std::map<size_t, ScRangeData*> SharedFormulaContainer; - SharedFormulaContainer maSharedFormulas; - int mnCellCount; void cellInserted(); diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index dbf575aa9c07..b26efe01daa2 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -55,8 +55,6 @@ class QProToSc : public ConverterBase { private: TokenId mnAddToken; - TokenId mnSubToken; - TokenId mn0Token; SvStream& maIn; public: diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index 67685c8f9c93..43ddb9aa0dab 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -41,7 +41,6 @@ private: RichStringRef mxString; /// Processed string. RichStringPortionRef mxPortion; /// Processed portion in the string. RichStringPhoneticRef mxPhonetic; /// Processed phonetic text portion. - FontRef mxFont; /// Processed font of the portion. }; template< typename ParentType > diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index c517901aa198..a7a2540006f1 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -632,13 +632,13 @@ AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( } AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ) + int nId ) { VclPtr<ScCondFormatManagerDlg> pDlg; switch( nId ) { case RID_SCDLG_COND_FORMAT_MANAGER: - pDlg = VclPtr<ScCondFormatManagerDlg>::Create( pParent, pDoc, pFormatList, rPos ); + pDlg = VclPtr<ScCondFormatManagerDlg>::Create( pParent, pDoc, pFormatList ); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 40ef31749c9b..014057e5d3d3 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -409,7 +409,7 @@ public: virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) override; virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ) override; + int nId ) override; virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) override; diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index e3afe8807db4..30c213b43d41 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -102,11 +102,10 @@ void ScCondFormatManagerWindow::setColSizes() SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } -ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): +ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList): ModalDialog(pParent, "CondFormatManager", "modules/scalc/ui/condformatmanager.ui"), mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr), mpDoc(pDoc), - maPos(rPos), mbModified(false) { SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("CONTAINER"); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 64cae06eb11c..c5ce73de1693 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -61,7 +61,6 @@ private: VclPtr<SvxAcceptChgCtr> m_pAcceptChgCtr; ScViewData* pViewData; ScDocument* pDoc; - ScRangeName aLocalRangeName; VclPtr<SvxTPFilter> pTPFilter; VclPtr<SvxTPView> pTPView; VclPtr<SvxRedlinTable> pTheView; // #i48648 now SvHeaderTabListBox diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 003746475f08..013f71622a04 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -47,7 +47,7 @@ public: class ScCondFormatManagerDlg : public ModalDialog { public: - ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); + ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList); virtual ~ScCondFormatManagerDlg(); virtual void dispose() override; @@ -65,7 +65,6 @@ private: VclPtr<ScCondFormatManagerWindow> m_pCtrlManager; ScDocument* mpDoc; - ScAddress maPos; DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 1b9220a8e5a0..b53d51edf9cf 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -54,8 +54,6 @@ private: ScViewData* pViewData; ScDocument* pDoc; - ScRangeName aLocalRangeName; - ScRangeList aRangeList; ScChangeViewSettings aChangeViewSet; void Init(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 1eff56088626..9afd0aa1ae42 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -85,7 +85,6 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui"), pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), - aLocalRangeName ( *(pDoc->GetRangeName()) ), aStrInsertCols (SC_RESSTR(STR_CHG_INSERT_COLS)), aStrInsertRows (SC_RESSTR(STR_CHG_INSERT_ROWS)), aStrInsertTabs (SC_RESSTR(STR_CHG_INSERT_TABS)), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 020066d7c99f..dd8f2fc98e9f 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -44,7 +44,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl: "modules/scalc/ui/showchangesdialog.ui") , pViewData(ptrViewData) , pDoc(ptrViewData->GetDocument()) - , aLocalRangeName(*(pDoc->GetRangeName())) { m_pFilterCtr = VclPtr<SvxTPFilter>::Create(get<VclContainer>("box")); get(m_pHighlightBox, "showchanges"); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 4c332daaeeca..e4c790b7bb93 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2438,7 +2438,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() ); std::unique_ptr<AbstractScCondFormatManagerDlg> pDlg(pFact->CreateScCondFormatMgrDlg( - pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER)); + pTabViewShell->GetDialogParent(), pDoc, pList, RID_SCDLG_COND_FORMAT_MANAGER)); short nRet = pDlg->Execute(); if(nRet == RET_OK && pDlg->CondFormatsChanged()) { diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index c5f53c9a1251..51a434477f49 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -647,8 +647,6 @@ ParagraphObj::ParagraphObj(const css::uno::Reference< css::beans::XPropertySet > : PropStateValue() , SOParagraph() , mvPortions() - , maMapModeSrc(MAP_100TH_MM) - , maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 )) , mnTextSize(0) , mbFirstParagraph(false) , mbLastParagraph(false) @@ -677,8 +675,6 @@ ParagraphObj::ParagraphObj(css::uno::Reference< css::text::XTextContent > & rXTe : PropStateValue() , SOParagraph() , mvPortions() - , maMapModeSrc(MAP_100TH_MM) - , maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 )) , mnTextSize(0) , mbIsBullet(false) , mbFirstParagraph( aParaFlags.bFirstParagraph ) diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 3439774b9e0d..28ac497d6b63 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -178,8 +178,6 @@ class ParagraphObj : public PropStateValue, public SOParagraph friend struct PPTExParaSheet; std::vector<std::unique_ptr<PortionObj> > mvPortions; - MapMode maMapModeSrc; - MapMode maMapModeDest; protected: diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index aec82e55b6ab..3eb1e7498529 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -77,7 +77,6 @@ MasterPagesSelector::MasterPagesSelector ( mrDocument(rDocument), mrBase(rBase), mnDefaultClickAction(SID_TP_APPLY_TO_ALL_SLIDES), - maPreviewUpdateQueue(), maCurrentItemList(), maTokenToValueSetIndex(), maLockedMasterPages(), diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 8242b361e20a..e5de7fa02f4a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -116,11 +116,6 @@ protected: clicked over a master page. */ sal_uInt16 mnDefaultClickAction; - /** Pages with pointers in this queue have their previews updated - eventually. Filled by InvalidatePreview() and operated upon by - UpdatePreviews(). - */ - ::std::queue<sal_uInt16> maPreviewUpdateQueue; SdPage* GetSelectedMasterPage(); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b445211a7093..09006a895054 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -341,8 +341,6 @@ private: Size maPresSize; AnimationMode meAnimationMode; OUString maCharBuffer; - Pointer maOldPointer; - Pointer maPencil; VclPtr< ::sd::Window> mpOldActiveWindow; Link<StarBASIC*,bool> maStarBASICGlobalErrorHdl; unsigned long mnChildMask; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index b03821cb7f39..0a2a382e8276 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -112,8 +112,7 @@ SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet); } // end of anonymous namespace SlotManager::SlotManager (SlideSorter& rSlideSorter) - : mrSlideSorter(rSlideSorter), - maCommandQueue() + : mrSlideSorter(rSlideSorter) { } diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 814a17d40652..e6aed91ccb48 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -78,9 +78,6 @@ private: /// The controller for which we manage the slot calls. SlideSorter& mrSlideSorter; - typedef ::std::queue<Command*> CommandQueue; - CommandQueue maCommandQueue; - /** Called by FuTemporary to show the slide show. */ void ShowSlideShow (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 8f26b7bb002a..be7e18bfa334 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -58,9 +58,6 @@ private: with a different map mode or by a call to Invalidate(). */ SharedFontPointer maFont; - /** The map mode for which maFont was created. - */ - MapMode maMapMode; FontProvider(); virtual ~FontProvider(); diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index bf5736b7a9b2..f3c42508cf2d 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -63,8 +63,7 @@ FontProvider& FontProvider::Instance() } FontProvider::FontProvider() - : maFont(), - maMapMode() + : maFont() { } diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 8425180fadd9..9038a974b395 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -79,7 +79,6 @@ PresenterTextView::PresenterTextView ( rInvalidator)), mnLeftOffset(0), mnTopOffset(0), - maInvalidator(rInvalidator), mbIsFormatPending(false), mnCharacterCount(-1), maTextChangeBroadcaster() diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index f301007d4127..955f9728da6f 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -264,7 +264,6 @@ private: SharedPresenterTextCaret mpCaret; double mnLeftOffset; double mnTopOffset; - const ::std::function<void (const css::awt::Rectangle&)> maInvalidator; bool mbIsFormatPending; sal_Int32 mnCharacterCount; ::std::function<void ()> maTextChangeBroadcaster; diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index 48dc741b9cd0..8b2bc42437a7 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -34,23 +34,20 @@ namespace slideshow { namespace internal { - Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds, - Dummy ) : + Layer::Layer( Dummy ) : maViewEntries(), maBounds(), maNewBounds(), - maMaxBounds( rMaxLayerBounds ), mbBoundsDirty(false), mbBackgroundLayer(true), mbClipSet(false) { } - Layer::Layer( const basegfx::B2DRange& rMaxLayerBounds ) : + Layer::Layer() : maViewEntries(), maBounds(), maNewBounds(), - maMaxBounds( rMaxLayerBounds ), mbBoundsDirty(false), mbBackgroundLayer(false), mbClipSet(false) @@ -264,15 +261,14 @@ namespace slideshow return maUpdateAreas.overlaps( rShape->getUpdateArea() ); } - LayerSharedPtr Layer::createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds ) + LayerSharedPtr Layer::createBackgroundLayer() { - return LayerSharedPtr(new Layer( rMaxLayerBounds, - BackgroundLayer )); + return LayerSharedPtr(new Layer( BackgroundLayer )); } - LayerSharedPtr Layer::createLayer( const basegfx::B2DRange& rMaxLayerBounds ) + LayerSharedPtr Layer::createLayer( ) { - return LayerSharedPtr( new Layer( rMaxLayerBounds ) ); + return LayerSharedPtr( new Layer ); } } diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 666fa5227e58..8de60eaebdd8 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -70,26 +70,16 @@ namespace slideshow This method will create a layer without a ViewLayer, i.e. one that displays directly on the background. - - @param rMaxLayerBounds - Maximal bounds of this layer, in user - coordinates. This layer will never be larger or extend - outside these bounds. */ - static ::boost::shared_ptr< Layer > createBackgroundLayer( const basegfx::B2DRange& rMaxLayerBounds ); + static ::boost::shared_ptr< Layer > createBackgroundLayer(); /** Create non-background layer This method will create a layer in front of the background, to contain shapes that should appear in front of animated objects. - - @param rMaxLayerBounds - Maximal bounds of this layer, in user - coordinates. This layer will never be larger or extend - outside these bounds. */ - static ::boost::shared_ptr< Layer > createLayer( const basegfx::B2DRange& rMaxLayerBounds ); + static ::boost::shared_ptr< Layer > createLayer(); @@ -227,30 +217,19 @@ namespace slideshow ViewLayer, i.e. one that displays directly on the background. - @param rMaxLayerBounds - Maximal bounds of this layer, in user - coordinates. This layer will never be larger or extend - outside these bounds. - @param eFlag Dummy parameter, to disambiguate from normal layer constructor */ - Layer( const basegfx::B2DRange& rMaxLayerBounds, - Dummy eFlag ); + Layer( Dummy eFlag ); /** Create non-background layer This constructor will create a layer in front of the background, to contain shapes that should appear in front of animated objects. - - @param rMaxLayerBounds - Maximal bounds of this layer, in user - coordinates. This layer will never be larger or extend - outside these bounds. */ - explicit Layer( const basegfx::B2DRange& rMaxLayerBounds ); + explicit Layer(); struct ViewEntry { @@ -274,7 +253,6 @@ namespace slideshow basegfx::B2DPolyRange maUpdateAreas; basegfx::B2DRange maBounds; basegfx::B2DRange maNewBounds; - const basegfx::B2DRange maMaxBounds; // maBounds is clipped against this bool mbBoundsDirty; // true, if view layers need resize bool mbBackgroundLayer; // true, if this // layer is the diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 7fb3fb0fac49..22a248c7549a 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -86,9 +86,7 @@ namespace slideshow maLayers.reserve(4); // create initial background layer - maLayers.push_back( - Layer::createBackgroundLayer( - maPageBounds )); + maLayers.push_back( Layer::createBackgroundLayer() ); // init views for( const auto& rView : mrViews ) @@ -700,8 +698,7 @@ namespace slideshow { OSL_ASSERT( mbActive ); - LayerSharedPtr pLayer( Layer::createLayer( - maPageBounds )); + LayerSharedPtr pLayer( Layer::createLayer() ); // create ViewLayers for all registered views, and add to // newly created layer. diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 352019f1c57c..23492d5c16be 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1601,7 +1601,6 @@ void SfxItemSet::dumpAsXml(xmlTextWriterPtr pWriter) const SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool ) : SfxItemSet(rPool, nullptr), - aDefault(0), nFree(nInitCount) { // Initially no Items @@ -1614,7 +1613,6 @@ SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool ) SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy) : SfxItemSet(rCopy), - aDefault(0), nFree(0) { } @@ -1625,7 +1623,6 @@ SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy) */ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy) : SfxItemSet(rCopy), - aDefault(0), nFree(0) { } diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index dc12c7603bb0..93ca0dab715b 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -55,9 +55,6 @@ class SvtHelpOptions_Impl : public utl::ConfigItem OUString aSystem; OUString sHelpStyleSheet; - typedef std::map <OUString, sal_Int32> MapString2Int; - MapString2Int aURLIgnoreCounters; - static Sequence< OUString > GetPropertyNames(); virtual void ImplCommit() override; diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index d4380badcd4f..13178e423019 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -244,7 +244,6 @@ class SVTXRoadmap : public SVTXRoadmap_Base private: ItemListenerMultiplexer maItemListeners; - RMItemData CurRMItemData; static RMItemData GetRMItemData( const css::container::ContainerEvent& _rEvent ); protected: diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 002990df6143..e0e2df0d9b1f 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -132,7 +132,6 @@ class SW_DLLPUBLIC SwFltControlStack : private ::boost::noncopyable Entries m_Entries; sal_uLong nFieldFlags; - vcl::KeyCode aEmptyKeyCode; // fuer Bookmarks private: bool bHasSdOD; diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index b6e3f4f11586..fdfabd949982 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -178,8 +178,7 @@ SwXMLTextParagraphExport::SwXMLTextParagraphExport( sGraphicObjectProtocol( "vnd.sun.star.GraphicObject:" ), aAppletClassId( SO3_APPLET_CLASSID ), aPluginClassId( SO3_PLUGIN_CLASSID ), - aIFrameClassId( SO3_IFRAME_CLASSID ), - aOutplaceClassId( SO3_OUT_CLASSID ) + aIFrameClassId( SO3_IFRAME_CLASSID ) { } diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 83140ac61188..e714994fbf38 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -38,7 +38,6 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport const SvGlobalName aAppletClassId; const SvGlobalName aPluginClassId; const SvGlobalName aIFrameClassId; - const SvGlobalName aOutplaceClassId; static SwNoTextNode *GetNoTextNode( const css::uno::Reference < css::beans::XPropertySet >& rPropSet ); diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx index 320d2276edf2..f03b7835ef20 100644 --- a/sw/source/uibase/inc/formedt.hxx +++ b/sw/source/uibase/inc/formedt.hxx @@ -39,24 +39,6 @@ class SwIdxFormDlg : public SvxStandardDialog { void Apply() override; - VclPtr<ListBox> m_aEntryLB; - VclPtr<OKButton> m_aOKBtn; - VclPtr<CancelButton> m_aCancelBT; - VclPtr<FixedText> m_aLevelFT; - VclPtr<Edit> m_aEntryED; - VclPtr<PushButton> m_aEntryBT; - VclPtr<PushButton> m_aTabBT; - VclPtr<PushButton> m_aPageBT; - VclPtr<PushButton> m_aJumpBT; - VclPtr<FixedLine> m_aEntryFL; - VclPtr<FixedText> m_aLevelFT2; - VclPtr<ListBox> m_aLevelLB; - VclPtr<FixedText> m_aTemplateFT; - VclPtr<ListBox> m_aParaLayLB; - VclPtr<PushButton> m_aStdBT; - VclPtr<PushButton> m_aAssignBT; - VclPtr<FixedLine> m_aFormatFL; - public: SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); virtual ~SwIdxFormDlg(); diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index adb0de9d9a22..786402c4daf9 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -105,9 +105,6 @@ public: class TextUndoSetAttribs: public TextUndo { -private: - TextSelection maSelection; - public: TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel ); virtual ~TextUndoSetAttribs(); diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx index d2c10d637ef3..d80edc99e1f8 100644 --- a/vcl/source/gdi/impanmvw.hxx +++ b/vcl/source/gdi/impanmvw.hxx @@ -43,7 +43,6 @@ private: Size maSzPix; Size maDispSz; Size maRestSz; - MapMode maMap; vcl::Region maClip; VclPtr<VirtualDevice> mpBackground; VclPtr<VirtualDevice> mpRestore; diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 101fd356c7f2..313f8cd470bd 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -40,7 +40,6 @@ private: ImageList maImgList; Bitmap maWheelBmp; - CommandScrollData maCommandScrollData; Point maLastMousePos; Point maCenter; Timer* mpTimer; |