diff options
54 files changed, 93 insertions, 222 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 58e683438814..b47c3a864104 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1390,11 +1390,8 @@ void StarBASIC::QuitAndExitApplication() void StarBASIC::Stop() { SbiInstance* p = GetSbData()->pInst; - while( p ) - { + if( p ) p->Stop(); - p = p->pNext; - } } bool StarBASIC::IsRunning() diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 198f14eb9420..8d24420bdd4d 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3715,17 +3715,13 @@ static SbUnoServiceCtor* pFirstCtor = nullptr; void clearUnoServiceCtors() { SbUnoServiceCtor* pCtor = pFirstCtor; - while( pCtor ) - { + if( pCtor ) pCtor->SbxValue::Clear(); - pCtor = pCtor->pNext; - } } SbUnoServiceCtor::SbUnoServiceCtor( const OUString& aName_, Reference< XServiceConstructorDescription > const & xServiceCtorDesc ) : SbxMethod( aName_, SbxOBJECT ) , m_xServiceCtorDesc( xServiceCtorDesc ) - , pNext(nullptr) { } diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 2ecc75c8e9c9..70f210d16de3 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -118,7 +118,6 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm ) aRtlSyms( aGblStrings, SbRTL, this ), aGen( *pm, this, 1024 ) { - eCurExpr = SbSYMBOL; eEndTok = NIL; pProc = nullptr; pStack = nullptr; diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index 8b16d4c94e25..9d2553f67b1b 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -69,7 +69,6 @@ public: SbiSymPool aRtlSyms; // Runtime-Library SbiCodeGen aGen; // Code-Generator SbiSymPool* pPool; - SbiExprType eCurExpr; short nBase; // OPTION BASE-value bool bText; // OPTION COMPARE TEXT bool bExplicit; // true: OPTION EXPLICIT diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 8278f76cbd7f..5a1e8c211d24 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -154,7 +154,6 @@ class SbiInstance ComponentVector_t ComponentVector; public: SbiRuntime* pRun; // Call-Stack - SbiInstance* pNext; // instances chain // #31460 new concept for StepInto/Over/Out, // explanation see runtime.cxx at SbiInstance::CalcBreakCallLevel() diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index e1d64f4b6739..9ec617a7230a 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -268,8 +268,6 @@ class SbUnoServiceCtor : public SbxMethod css::uno::Reference< css::reflection::XServiceConstructorDescription > m_xServiceCtorDesc; - SbUnoServiceCtor* pNext; - public: SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > const & xServiceCtorDesc ); diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 4f3fd377d0b7..1fba86622b5b 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -322,7 +322,6 @@ SbiInstance::SbiInstance( StarBASIC* p ) , bReschedule(true) , bCompatibility(false) , pRun(nullptr) - , pNext(nullptr) , nCallLvl(0) , nBreakCallLvl(0) { diff --git a/compilerplugins/clang/singlevalfields.py b/compilerplugins/clang/singlevalfields.py index eb5a7b043efd..38fc119bbbe8 100755 --- a/compilerplugins/clang/singlevalfields.py +++ b/compilerplugins/clang/singlevalfields.py @@ -52,12 +52,20 @@ for fieldInfo, assignValues in fieldAssignDict.iteritems(): continue # ignore things which are representations of on-disk structures if containingClass in ["SEPr", "WW8Dop", "BmpInfoHeader", "BmpFileHeader", "Exif::ExifIFD", - "sw::WW8FFData", "FFDataHeader", "INetURLHistory_Impl::head_entry", "ImplPPTParaPropSet", "SvxSwAutoFormatFlags"]: + "sw::WW8FFData", "FFDataHeader", "INetURLHistory_Impl::head_entry", "ImplPPTParaPropSet", "SvxSwAutoFormatFlags", + "T602ImportFilter::T602ImportFilter::format602struct", "DataNode"]: + continue + if v2.startswith("hwpfilter/source"): + continue + # ignore things which are representations of structures from external code + if v2.startswith("desktop/unx/source/splashx.c"): continue # Windows-only - if containingClass in ["SfxAppData_Impl", "sfx2::ImplDdeItem", "SvFileStream", "DdeService", "DdeTopic", "DdeItem", "DdeConnection", "connectivity::sdbcx::OUser", "connectivity::sdbcx::OGroup", "connectivity::sdbcx::OCatalog"]: + if containingClass in ["SfxAppData_Impl", "sfx2::ImplDdeItem", "SvFileStream", + "DdeService", "DdeTopic", "DdeItem", "DdeConnection", "connectivity::sdbcx::OUser", "connectivity::sdbcx::OGroup", "connectivity::sdbcx::OCatalog", + "cairocanvas::SpriteHelper"]: continue - if v2.startswith("include/svl/svdde.hxx"): + if v2.startswith("include/svl/svdde.hxx") or v2.startswith("embeddedobj/source/inc/oleembobj.hxx"): continue # Some of our supported compilers don't do constexpr, which means o3tl::typed_flags can't be 'static const' if containingClass in ["WaitWindow_Impl"]: diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index d5d210181394..858de8e37678 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -457,7 +457,6 @@ void ODbaseTable::fillColumns() ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConnection) : ODbaseTable_BASE(_pTables,_pConnection) , m_pMemoStream(nullptr) - , m_bWriteableMemo(false) { // initialize the header memset(&m_aHeader, 0, sizeof(m_aHeader)); @@ -477,7 +476,6 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne SchemaName, CatalogName) , m_pMemoStream(nullptr) - , m_bWriteableMemo(false) { memset(&m_aHeader, 0, sizeof(m_aHeader)); m_eEncoding = getConnection()->getTextEncoding(); @@ -530,7 +528,6 @@ void ODbaseTable::construct() m_pMemoStream = createStream_simpleError( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::READWRITE | StreamMode::NOCREATE | StreamMode::SHARE_DENYWRITE); if ( !m_pMemoStream ) { - m_bWriteableMemo = false; m_pMemoStream = createStream_simpleError( aURL.GetMainURL(INetURLObject::NO_DECODE), StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYNONE); } if (m_pMemoStream) diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index a183dd3670a8..e6e27410ae97 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -70,10 +70,7 @@ void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rVa } MQueryHelper::MQueryHelper(const OColumnAlias& _ca) - :m_nIndex( 0 ) - ,m_bHasMore( true ) - ,m_bAtEnd( false ) - ,m_rColumnAlias( _ca ) + :m_rColumnAlias( _ca ) ,m_aError() { m_aResults.clear(); @@ -99,7 +96,6 @@ void MQueryHelper::append(MQueryHelperResultEntry* resEnt) { if ( resEnt != nullptr ) { m_aResults.push_back( resEnt ); - m_bAtEnd = false; } } @@ -115,9 +111,6 @@ void MQueryHelper::clear_results() void MQueryHelper::reset() { - m_nIndex = 0; - m_bHasMore = true; - m_bAtEnd = false; clear_results(); m_aError.reset(); } diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 907c8fdd42dc..2fffac10fcd3 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -166,9 +166,6 @@ namespace connectivity mutable ::osl::Mutex m_aMutex; resultsArray m_aResults; - sal_uInt32 m_nIndex; - bool m_bHasMore; - bool m_bAtEnd; void append(MQueryHelperResultEntry* resEnt ); void clear_results(); OColumnAlias m_rColumnAlias; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index de5d0c9113cd..f00ab70d5c27 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -74,12 +74,10 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv ,m_xStatement(*pStmt) ,m_xMetaData(nullptr) ,m_nRowPos(0) - ,m_nOldRowPos(0) ,m_bWasNull(false) ,m_nFetchSize(0) ,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE) ,m_nFetchDirection(FetchDirection::FORWARD) - ,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE) ,m_pSQLIterator( _pSQLIterator ) ,m_pParseTree( _pSQLIterator->getParseTree() ) ,m_aQueryHelper(pStmt->getOwnConnection()->getColumnAlias()) @@ -88,7 +86,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv ,m_nParamIndex(0) ,m_bIsAlwaysFalseQuery(false) ,m_pKeySet(nullptr) - ,m_nNewRow(0) ,m_nUpdatedRow(0) ,m_bIsReadOnly(TRISTATE_INDET) { @@ -647,7 +644,7 @@ void OResultSet::getFastPropertyValue( switch(nHandle) { case PROPERTY_ID_RESULTSETCONCURRENCY: - rValue <<= (sal_Int32)m_nResultSetConcurrency; + rValue <<= (sal_Int32)ResultSetConcurrency::UPDATABLE; break; case PROPERTY_ID_RESULTSETTYPE: rValue <<= m_nResultSetType; @@ -1758,8 +1755,6 @@ void SAL_CALL OResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno: SAL_INFO("connectivity.mork", "in, m_nRowPos = " << m_nRowPos); // m_RowStates = RowStates_Inserted; updateRow(); - m_nOldRowPos = 0; - m_nNewRow = 0; //m_aQueryHelper.setRowStates(getCurrentCardNumber(),m_RowStates); SAL_INFO("connectivity.mork", "out, m_nRowPos = " << m_nRowPos); } @@ -1790,7 +1785,7 @@ void SAL_CALL OResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, cs SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); if (rowInserted()) { - m_nRowPos = m_nOldRowPos; + m_nRowPos = 0; fetchCurrentRow(); } } diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index d46e15c353f5..cfdf6f4e53f3 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -77,12 +77,10 @@ namespace connectivity css::uno::Reference< css::uno::XInterface> m_xStatement; css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; sal_uInt32 m_nRowPos; - sal_uInt32 m_nOldRowPos; bool m_bWasNull; sal_Int32 m_nFetchSize; sal_Int32 m_nResultSetType; sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; std::shared_ptr< ::connectivity::OSQLParseTreeIterator > @@ -232,7 +230,6 @@ protected: sal_Int32 m_nParamIndex; bool m_bIsAlwaysFalseQuery; ::rtl::Reference<OKeySet> m_pKeySet; - sal_Int32 m_nNewRow; //inserted row sal_Int32 m_nUpdatedRow; //updated row TriState m_bIsReadOnly; inline void resetParameters() { m_nParamIndex = 0; } diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx index 93c7177a181b..9a4b89526c00 100644 --- a/connectivity/source/drivers/mork/MorkParser.cxx +++ b/connectivity/source/drivers/mork/MorkParser.cxx @@ -50,6 +50,7 @@ const char *MorkMagicHeader = "// <!-- <mdb:mork:z v=\"1.4\"/> -->"; const char *MorkDictColumnMeta = "<(a=c)>"; +static const int defaultScope_ = 0x80; MorkParser::MorkParser() : columns_(), @@ -60,8 +61,6 @@ MorkParser::MorkParser() : morkData_(), morkPos_(0), nextAddValueId_(0x7fffffff), - defaultScope_(0x80), - defaultListScope_(0x81), defaultTableId_(1), nowParsing_(NPValues) { @@ -616,7 +615,7 @@ void MorkParser::retrieveLists(std::set<std::string>& lists) << ( ( int ) TableIter->first < 0 ? "-" : " " ) << TableIter->first << std::endl; #endif - MorkRowMap* rows = getRows( defaultListScope_, &TableIter->second ); + MorkRowMap* rows = getRows( 0x81/*defaultListScope*/, &TableIter->second ); if (!rows) return; for ( MorkRowMap::Map::const_iterator RowIter = rows->map.begin(); RowIter != rows->map.end(); ++RowIter ) diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index 0d3993351f5e..6b5088c04ff8 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -138,8 +138,6 @@ protected: // Data unsigned morkPos_; int nextAddValueId_; - int defaultScope_; - int defaultListScope_; int defaultTableId_; // Indicates entity is being parsed diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index ea3b1de07349..4eca0ab340ea 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -50,7 +50,7 @@ OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver) ,m_aConnectionHandle(nullptr) ,m_pDriverHandleCopy(_pDriverHandle) ,m_nStatementCount(0) - ,m_bClosed(true) + ,m_bClosed(false) ,m_bUseCatalog(false) ,m_bUseOldDateFormat(false) ,m_bParameterSubstitution(false) diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 859181de4094..35077933b84e 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_bFreeHandle(false) ,m_bInserting(false) ,m_bRowInserted(false) ,m_bRowDeleted(false) @@ -184,8 +183,6 @@ void OResultSet::disposing() ::osl::MutexGuard aGuard(m_aMutex); releaseBuffer(); - if(m_bFreeHandle) - m_pStatement->getOwnConnection()->freeStatementHandle(m_aStatementHandle); m_xStatement.clear(); m_xMetaData.clear(); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 89de976b0592..9ea84719f800 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -277,7 +277,7 @@ Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sq MutexGuard guard( m_refMutex->mutex ); checkClosed(); - OString byteSql = OUStringToOString( sql, m_settings.encoding ); + OString byteSql = OUStringToOString( sql, ConnectionSettings::encoding ); PreparedStatement *stmt = new PreparedStatement( m_refMutex, this, &m_settings, byteSql ); Reference< XPreparedStatement > ret = stmt; @@ -366,7 +366,7 @@ OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::ex OUString(), 1, Any() ); } char * p = PQdb(m_settings.pConnection ); - return OUString( p, strlen(p) , m_settings.encoding ); + return OUString( p, strlen(p) , ConnectionSettings::encoding ); } void Connection::setTransactionIsolation( sal_Int32 ) @@ -524,7 +524,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) nColon = url.indexOf( ':' , 1+ nColon ); if( nColon != -1 ) { - o = OUStringToOString( url.getStr()+nColon+1, m_settings.encoding ); + o = OUStringToOString( url.getStr()+nColon+1, ConnectionSettings::encoding ); } } { @@ -540,7 +540,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) OUString errorMessage; if ( err != nullptr) { - errorMessage = OUString( err, strlen(err), m_settings.encoding ); + errorMessage = OUString( err, strlen(err), ConnectionSettings::encoding ); free(err); } else @@ -564,7 +564,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) } } } - properties2arrays( args , tc, m_settings.encoding, keywords, values ); + properties2arrays( args , tc, ConnectionSettings::encoding, keywords, values ); keywords.push_back(nullptr, SAL_NO_ACQUIRE); values.push_back(nullptr, SAL_NO_ACQUIRE); @@ -679,7 +679,7 @@ bool isLog(ConnectionSettings *settings, LogLevel nLevel) void log(ConnectionSettings *settings, LogLevel nLevel, const OUString &logString) { - log(settings, nLevel, OUStringToOString(logString, settings->encoding ).getStr()); + log( settings, nLevel, OUStringToOString( logString, ConnectionSettings::encoding ).getStr() ); } void log(ConnectionSettings *settings, LogLevel nLevel, const char *str) { diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index f4c24ed9f5fd..cfb4cccf1b9c 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -98,7 +98,6 @@ class Views; struct ConnectionSettings { ConnectionSettings() : - encoding( RTL_TEXTENCODING_UTF8), pConnection(nullptr), maxNameLen(0), maxIndexKeys(0), @@ -108,7 +107,7 @@ struct ConnectionSettings logFile( nullptr ), m_nLogLevel(LogLevel::Info) {} - rtl_TextEncoding encoding; + static const rtl_TextEncoding encoding = RTL_TEXTENCODING_UTF8; PGconn *pConnection; sal_Int32 maxNameLen; sal_Int32 maxIndexKeys; diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 860ffe4324da..d809da7e3eb1 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -218,7 +218,7 @@ void PreparedStatement::checkColumnIndex( sal_Int32 parameterIndex ) buf.append( ", got " ); buf.append( parameterIndex ); buf.append( ", statement '" ); - buf.append( OStringToOUString( m_stmt, m_pSettings->encoding ) ); + buf.append( OStringToOUString( m_stmt, ConnectionSettings::encoding ) ); buf.append( "')" ); throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any () ); } @@ -287,7 +287,7 @@ void PreparedStatement::raiseSQLException( const char * errorMsg ) OUStringBuffer buf(128); buf.append( "pq_driver: "); buf.append( - OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); + OUString( errorMsg, strlen(errorMsg) , ConnectionSettings::encoding ) ); buf.append( " (caused by statement '" ); buf.appendAscii( m_executedStatement.getStr() ); buf.append( "')" ); @@ -521,7 +521,7 @@ void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) checkColumnIndex( parameterIndex ); OStringBuffer buf( 20 ); buf.append( "'" ); - OString y = OUStringToOString( x, m_pSettings->encoding ); + OString y = OUStringToOString( x, ConnectionSettings::encoding ); buf.ensureCapacity( y.getLength() * 2 + 2 ); int len = PQescapeString( const_cast<char*>(buf.getStr())+1, y.getStr() , y.getLength() ); buf.setLength( 1 + len ); diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index 1e7ed65b4989..e569b88da9c7 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -121,7 +121,7 @@ Any ResultSet::getValue( sal_Int32 columnIndex ) ret <<= OUString( PQgetvalue( m_result, m_row , columnIndex -1 ) , PQgetlength( m_result, m_row , columnIndex -1 ) , - (*m_ppSettings)->encoding ); + ConnectionSettings::encoding ); } return ret; @@ -160,7 +160,7 @@ sal_Int32 ResultSet::findColumn( const OUString& columnName ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); sal_Int32 res = PQfnumber( m_result, - OUStringToOString( columnName, (*m_ppSettings)->encoding ).getStr()); + OUStringToOString( columnName, ConnectionSettings::encoding ).getStr()); /* PQfnumber return -1 for not found, which is what we want * other than that we use col number as 1-based not 0-based */ if(res >= 0) diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index c2e64df1efcc..2a256a70fe14 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -144,7 +144,7 @@ ResultSetMetaData::ResultSetMetaData( & ( m_colDesc[col].precision ), & ( m_colDesc[col].scale ) ); char *name = PQfname( pResult, col ); - m_colDesc[col].name = OUString( name, strlen(name) , (*m_ppSettings)->encoding ); + m_colDesc[col].name = OUString( name, strlen(name) , ConnectionSettings::encoding ); m_colDesc[col].typeOid = PQftype( pResult, col ); m_colDesc[col].type = css::sdbc::DataType::LONGVARCHAR; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index f6394fd6b27c..5aaef394e089 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -243,7 +243,7 @@ void Statement::raiseSQLException( OUStringBuffer buf(128); buf.append( "pq_driver: "); buf.append( - OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); + OUString( errorMsg, strlen(errorMsg), ConnectionSettings::encoding ) ); buf.append( " (caused by statement '" ); buf.append( sql ); buf.append( "')" ); @@ -294,9 +294,9 @@ static void raiseSQLException( buf.append( "]" ); } buf.append( - OUString( errorMsg, strlen(errorMsg) , pSettings->encoding ) ); + OUString( errorMsg, strlen(errorMsg) , ConnectionSettings::encoding ) ); buf.append( " (caused by statement '" ); - buf.append( OStringToOUString( sql, pSettings->encoding ) ); + buf.append( OStringToOUString( sql, ConnectionSettings::encoding ) ); buf.append( "')" ); OUString error = buf.makeStringAndClear(); log(pSettings, LogLevel::Error, error); @@ -351,7 +351,7 @@ static std::vector< OUString > lookupKeys( { OStringBuffer buf( 128 ); buf.append( "Can't offer updateable result set because table " ); - buf.append( OUStringToOString(name, pSettings->encoding) ); + buf.append( OUStringToOString(name, ConnectionSettings::encoding) ); buf.append( " is duplicated, add schema to resolve ambiguity" ); log(pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); } @@ -368,7 +368,7 @@ static std::vector< OUString > lookupKeys( { OStringBuffer buf( 128 ); buf.append( "Can't offer updateable result set ( table " ); - buf.append( OUStringToOString(table, pSettings->encoding) ); + buf.append( OUStringToOString(table, ConnectionSettings::encoding) ); buf.append( " is unknown)" ); log(pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); } @@ -415,7 +415,7 @@ static std::vector< OUString > lookupKeys( { OStringBuffer buf( 128 ); buf.append( "Can't offer updateable result set ( table " ); - buf.append( OUStringToOString(table, pSettings->encoding) ); + buf.append( OUStringToOString(table, ConnectionSettings::encoding) ); buf.append( " does not have a primary key)" ); log(pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); } @@ -454,8 +454,8 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) // in case it was a single insert, extract the name of the table, // otherwise the table name is empty *(data->pLastTableInserted) = - extractTableFromInsert( OStringToOUString( cmd, pSettings->encoding ) ); - if (isLog(pSettings, LogLevel::Sql)) + extractTableFromInsert( OStringToOUString( cmd, ConnectionSettings::encoding ) ); + if( isLog( pSettings, LogLevel::Sql ) ) { OStringBuffer buf( 128 ); buf.append( "executed command '" ); @@ -472,7 +472,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) buf.append( *(data->pLastOidInserted) ); buf.append( ", diagnosedTable=" ); buf.append( - OUStringToOString( *data->pLastTableInserted, pSettings->encoding ) ); + OUStringToOString( *data->pLastTableInserted, ConnectionSettings::encoding ) ); } log(pSettings, LogLevel::Sql, buf.makeStringAndClear().getStr()); } @@ -490,7 +490,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) tokenizeSQL( cmd, vec ); OUString sourceTable = OStringToOUString( - extractSingleTableFromSelect( vec ), pSettings->encoding ); + extractSingleTableFromSelect( vec ), ConnectionSettings::encoding ); if( data->concurrency == css::sdbc::ResultSetConcurrency::UPDATABLE ) @@ -513,7 +513,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) if( -1 == PQfnumber( result, OUStringToOString( sourceTableKeys[i] , - pSettings->encoding ).getStr()) ) + ConnectionSettings::encoding ).getStr()) ) { break; } @@ -539,11 +539,11 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) { OStringBuffer buf( 128 ); buf.append( "can't support updateable resultset for table " ); - buf.append( OUStringToOString( schema, pSettings->encoding ) ); + buf.append( OUStringToOString( schema, ConnectionSettings::encoding ) ); buf.append( "." ); - buf.append( OUStringToOString( table, pSettings->encoding ) ); + buf.append( OUStringToOString( table, ConnectionSettings::encoding ) ); buf.append( ", because resultset does not contain a part of the primary key ( column " ); - buf.append( OUStringToOString( sourceTableKeys[i], pSettings->encoding ) ); + buf.append( OUStringToOString( sourceTableKeys[i], ConnectionSettings::encoding ) ); buf.append( " is missing )" ); aReason = buf.makeStringAndClear(); } @@ -552,9 +552,9 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) OStringBuffer buf( 128 ); buf.append( "can't support updateable resultset for table " ); - buf.append( OUStringToOString( schema, pSettings->encoding ) ); + buf.append( OUStringToOString( schema, ConnectionSettings::encoding ) ); buf.append( "." ); - buf.append( OUStringToOString( table, pSettings->encoding ) ); + buf.append( OUStringToOString( table, ConnectionSettings::encoding ) ); buf.append( ", because resultset table does not have a primary key " ); aReason = buf.makeStringAndClear(); } @@ -580,7 +580,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) new FakedUpdateableResultSet( data->refMutex, data->owner, data->ppSettings,result, schema, table, - OStringToOUString( aReason, pSettings->encoding) ); + OStringToOUString( aReason, ConnectionSettings::encoding) ); } } @@ -751,13 +751,13 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( for( int i = 0 ; i < keyColumnNames.getLength() ; i ++ ) { OUString value; - OString columnName = OUStringToOString( keyColumnNames[i], pConnectionSettings->encoding ); + OString columnName = OUStringToOString( keyColumnNames[i], ConnectionSettings::encoding ); String2StringMap::const_iterator ii = namedValues.begin(); for( ; ii != namedValues.end() ; ++ii ) { if( columnName.equalsIgnoreAsciiCase( ii->first ) ) { - value = OStringToOUString( ii->second , pConnectionSettings->encoding ); + value = OStringToOUString( ii->second , ConnectionSettings::encoding ); break; } } diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 4e6df8b0fdf2..53a75134d0be 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -96,7 +96,7 @@ OUString concatQualified( const OUString & a, const OUString &b) static inline OString iOUStringToOString( const OUString& str, ConnectionSettings *settings) { OSL_ENSURE(settings, "pgsql-sdbc: OUStringToOString got NULL settings"); - return OUStringToOString( str, settings->encoding ); + return OUStringToOString( str, ConnectionSettings::encoding ); } OString OUStringToOString( const OUString& str, ConnectionSettings *settings) { @@ -118,7 +118,7 @@ void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, Connect // (X/Open SQL CLI, March 1995, ISBN: 1-85912-081-4, X/Open Document Number: C451) // 22018 is for "Invalid character value" and seems to be the best match. // We have no good XInterface Reference to pass here, so just give NULL - throw SQLException(OUString(errstr, strlen(errstr), settings->encoding), + throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding), nullptr, OUString("22018"), -1, @@ -164,7 +164,7 @@ static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString { char *errstr = PQerrorMessage(settings->pConnection); // Implementation-defined SQLACCESS error - throw SQLException(OUString(errstr, strlen(errstr), settings->encoding), + throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding), nullptr, OUString("22018"), -1, diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index ca28001d07c1..64033eb9d647 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -92,14 +92,13 @@ css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGRe const OUString &table, const std::vector< OUString > &primaryKey ) { - ConnectionSettings *pSettings = *ppSettings; sal_Int32 columnCount = PQnfields( result ); sal_Int32 rowCount = PQntuples( result ); std::vector< OUString > columnNames( columnCount ); for( int i = 0 ; i < columnCount ; i ++ ) { char * name = PQfname( result, i ); - columnNames[i] = OUString( name, strlen(name), pSettings->encoding ); + columnNames[i] = OUString( name, strlen(name), ConnectionSettings::encoding ); } std::vector< std::vector< Any > > data( rowCount ); @@ -115,7 +114,7 @@ css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGRe char * val = PQgetvalue( result, row, col ); aRow[col] = makeAny( - OUString( val, strlen( val ) , (*ppSettings)->encoding ) ); + OUString( val, strlen( val ), ConnectionSettings::encoding ) ); } } data[row] = aRow; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 512554a53ad7..cfb4bc5af733 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -284,10 +284,10 @@ void Columns::refresh() { OStringBuffer buf; buf.append( "sdbcx.Columns get refreshed for table " ); - buf.append( OUStringToOString( m_schemaName, m_pSettings->encoding ) ); + buf.append( OUStringToOString( m_schemaName, ConnectionSettings::encoding ) ); buf.append( "." ); - buf.append( OUStringToOString( m_tableName, m_pSettings->encoding ) ); - log(m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); + buf.append( OUStringToOString( m_tableName, ConnectionSettings::encoding ) ); + log( m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr() ); } osl::MutexGuard guard( m_refMutex->mutex ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index 5446e5da2132..b8b4738a045a 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -109,8 +109,8 @@ void IndexColumns::refresh() { OStringBuffer buf; buf.append( "sdbcx.IndexColumns get refreshed for index " ); - buf.append( OUStringToOString( m_indexName, m_pSettings->encoding ) ); - log(m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); + buf.append( OUStringToOString( m_indexName, ConnectionSettings::encoding ) ); + log( m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr() ); } osl::MutexGuard guard( m_refMutex->mutex ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index cb46da6fb30a..b5f2c871eff0 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -98,10 +98,10 @@ void Indexes::refresh() { OStringBuffer buf; buf.append( "sdbcx.Indexes get refreshed for table " ); - buf.append( OUStringToOString( m_schemaName, m_pSettings->encoding ) ); + buf.append( OUStringToOString( m_schemaName, ConnectionSettings::encoding ) ); buf.append( "." ); - buf.append( OUStringToOString( m_tableName,m_pSettings->encoding ) ); - log(m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); + buf.append( OUStringToOString( m_tableName, ConnectionSettings::encoding ) ); + log( m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr() ); } osl::MutexGuard guard( m_refMutex->mutex ); diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index 75ee394352fa..e5e1ddb748c8 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -95,10 +95,10 @@ void KeyColumns::refresh() { OStringBuffer buf; buf.append( "sdbcx.KeyColumns get refreshed for table " ); - buf.append( OUStringToOString( m_schemaName, m_pSettings->encoding ) ); + buf.append( OUStringToOString( m_schemaName, ConnectionSettings::encoding ) ); buf.append( "." ); - buf.append( OUStringToOString( m_tableName, m_pSettings->encoding ) ); - log(m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr()); + buf.append( OUStringToOString( m_tableName, ConnectionSettings::encoding ) ); + log( m_pSettings, LogLevel::Info, buf.makeStringAndClear().getStr() ); } osl::MutexGuard guard( m_refMutex->mutex ); diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index f1d5de67dafe..ddfbdbca7d56 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -113,9 +113,9 @@ void Keys::refresh() if (isLog(m_pSettings, LogLevel::Info)) { OString buf( "sdbcx.Keys get refreshed for table " + - OUStringToOString( m_schemaName, m_pSettings->encoding ) + - "." + OUStringToOString( m_tableName,m_pSettings->encoding )); - log(m_pSettings, LogLevel::Info, buf.getStr()); + OUStringToOString( m_schemaName, ConnectionSettings::encoding ) + + "." + OUStringToOString( m_tableName, ConnectionSettings::encoding )); + log( m_pSettings, LogLevel::Info, buf.getStr() ); } osl::MutexGuard guard( m_refMutex->mutex ); diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 24492cecb995..3711aed8b473 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -93,7 +93,6 @@ namespace connectivity DBFMemoHeader m_aMemoHeader; SvStream* m_pMemoStream; rtl_TextEncoding m_eEncoding; - bool m_bWriteableMemo; void alterColumn(sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet>& descriptor , diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index ef117aadf1f2..d6ac6f43835c 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_bFreeHandle; bool m_bInserting; bool m_bRowInserted; bool m_bRowDeleted; diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index e16fe7c2217d..d05dd2f04e67 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -387,14 +387,12 @@ namespace cppcanvas sal_Int32 parts; sal_Int32 *combineMode; sal_Int32 initialState; - EMFPPath *initialPath; float ix, iy, iw, ih; EMFPRegion () : parts(0) , combineMode(nullptr) , initialState(0) - , initialPath(nullptr) , ix(0.0) , iy(0.0) , iw(0.0) @@ -408,10 +406,6 @@ namespace cppcanvas delete [] combineMode; combineMode = nullptr; } - if (initialPath) { - delete initialPath; - initialPath = nullptr; - } } void Read (SvStream& s) diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 781f3443ea8e..718d59e9be81 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -443,7 +443,6 @@ class IconLBoxString : public SvLBoxString { Image* m_pMacroImg; Image* m_pComponentImg; - int m_nxImageOffset; public: IconLBoxString( const OUString& sText, Image* pMacroImg, Image* pComponentImg ); @@ -458,7 +457,6 @@ IconLBoxString::IconLBoxString( const OUString& sText, , m_pMacroImg( pMacroImg ) , m_pComponentImg( pComponentImg ) { - m_nxImageOffset = 20; } @@ -486,7 +484,7 @@ void IconLBoxString::Paint(const Point& aPos, SvTreeListBox& /*aDevice*/, vcl::R } Point aPnt(aPos); - aPnt.X() += m_nxImageOffset; + aPnt.X() += 20; rRenderContext.DrawText(aPnt, aPureMethod); } } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 3cceae8a9a74..554a9dc0103c 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -90,8 +90,6 @@ SFTreeListBox::SFTreeListBox(vcl::Window* pParent) WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | WB_HASLINES | WB_HASLINESATROOT | WB_TABSTOP ); SetNodeDefaultImages(); - - nMode = 0xFF; // everything } VCL_BUILDER_FACTORY(SFTreeListBox) diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 77244c35e06a..7486f7a1f066 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -702,7 +702,6 @@ enum class ColorModel CMYK // can be extend with more models, e.g. HSV }; -struct SvxColorTabPageShadow; class SvxColorTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -713,8 +712,6 @@ private: VclPtr<Window> mpTopDlg; - SvxColorTabPageShadow *pShadow; - PaletteManager maPaletteManager; VclPtr<ListBox> m_pSelectPalette; VclPtr<SvxColorValueSet> m_pValSetColorList; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 83401e460c7b..6b7e70b771c3 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -44,9 +44,8 @@ class SvxNumberingPreview : public vcl::Window const SvxNumRule* pActNum; vcl::Font aStdFont; long nPageWidth; - const OUString* pOutlineNames; bool bPosition; - sal_uInt16 nActLevel; + sal_uInt16 nActLevel; protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 94732fcf6d9f..428d6d831170 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -47,7 +47,6 @@ class SFTreeListBox : public SvTreeListBox { friend class SvxScriptOrgDialog; private: - sal_uInt16 nMode; Image m_hdImage; Image m_libImage; Image m_macImage; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 59e5d892c188..b971d05839ca 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2369,7 +2369,6 @@ SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits) : Window(pParent, nWinBits) , pActNum(nullptr) , nPageWidth(0) - , pOutlineNames(nullptr) , bPosition(false) , nActLevel(SAL_MAX_UINT16) { @@ -2633,30 +2632,20 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan nTextOffset = nTextOffset + nXStep; nPreNum++; } - if (pOutlineNames) + //#i5153# the selected rectangle(s) should be black + if (0 != (nActLevel & (1<<nLevel))) { - //#i5153# outline numberings still use the style names as text - pVDev->SetFont(aStdFont); - sMsg = pOutlineNames[nLevel]; - pVDev->DrawText(Point(nXStart + nTextOffset, nYStart), sMsg); + pVDev->SetFillColor( aBlackColor ); + pVDev->SetLineColor( aBlackColor ); } else { - //#i5153# the selected rectangle(s) should be black - if (0 != (nActLevel & (1<<nLevel))) - { - pVDev->SetFillColor( aBlackColor ); - pVDev->SetLineColor( aBlackColor ); - } - else - { - //#i5153# unselected levels are gray - pVDev->SetFillColor( aLineColor ); - pVDev->SetLineColor( aLineColor ); - } - Rectangle aRect1(Point(nXStart + nTextOffset, nYStart + nTopOffset), Size(nWidth, nRectHeight)); - pVDev->DrawRect(aRect1); + //#i5153# unselected levels are gray + pVDev->SetFillColor( aLineColor ); + pVDev->SetLineColor( aLineColor ); } + Rectangle aRect1(Point(nXStart + nTextOffset, nYStart + nTopOffset), Size(nWidth, nRectHeight)); + pVDev->DrawRect(aRect1); } } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index c2428bfbc27c..870854f7c428 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -52,27 +52,10 @@ using namespace com::sun::star; -struct SvxColorTabPageShadow -{ - PageType nUnknownType; - sal_Int32 nUnknownPos; - bool bIsAreaTP; - ChangeType nChangeType; - SvxColorTabPageShadow() - : nUnknownType( PageType::Unknown ) - , nUnknownPos( LISTBOX_ENTRY_NOTFOUND ) - , bIsAreaTP( false ) - , nChangeType( ChangeType::NONE ) - { - } -}; - - SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XPropertyListType::Color ) , mpTopDlg( GetParentDialog() ) - , pShadow ( new SvxColorTabPageShadow() ) , rOutAttrs ( rInAttrs ) // All the horrific pointers we store and should not , pnColorListState( nullptr ) @@ -188,8 +171,6 @@ SvxColorTabPage::~SvxColorTabPage() void SvxColorTabPage::dispose() { - delete pShadow; - pShadow = nullptr; mpTopDlg.clear(); m_pSelectPalette.clear(); m_pValSetColorList.clear(); diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index 807502c1a8a0..96e35954d9ef 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -49,7 +49,6 @@ void Interceptor::DisconnectDocHolder() Interceptor::Interceptor( DocumentHolder* pDocHolder ) : m_pDocHolder( pDocHolder ), - m_pDisposeEventListeners(nullptr), m_pStatCL(nullptr) { m_aInterceptedURL[0] = ".uno:Save"; @@ -58,12 +57,10 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder ) m_aInterceptedURL[3] = ".uno:CloseWin"; m_aInterceptedURL[4] = ".uno:CloseFrame"; m_aInterceptedURL[5] = ".uno:SaveAs"; - } Interceptor::~Interceptor() { - delete m_pDisposeEventListeners; delete m_pStatCL; } diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx index c71f441daeb6..35ad43fda01c 100644 --- a/embeddedobj/source/inc/intercept.hxx +++ b/embeddedobj/source/inc/intercept.hxx @@ -140,7 +140,6 @@ private: static css::uno::Sequence< OUString > m_aInterceptedURL; - comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; StatusChangeListenerContainer* m_pStatCL; }; diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx index bb81feb8d53a..d25c7f030041 100644 --- a/extensions/source/bibliography/loadlisteneradapter.cxx +++ b/extensions/source/bibliography/loadlisteneradapter.cxx @@ -62,7 +62,6 @@ namespace bib OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp ) :m_xComponent( _rxComp ) ,m_pListener( nullptr ) - ,m_nLockCount( 0 ) ,m_bListening( false ) { OSL_ENSURE( m_xComponent.is(), "OComponentAdapterBase::OComponentAdapterBase: invalid component!" ); @@ -166,35 +165,35 @@ namespace bib void SAL_CALL OLoadListenerAdapter::loaded( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { - if ( !locked() && getLoadListener( ) ) + if ( getLoadListener( ) ) getLoadListener( )->_loaded( _rEvent ); } void SAL_CALL OLoadListenerAdapter::unloading( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { - if ( !locked() && getLoadListener( ) ) + if ( getLoadListener( ) ) getLoadListener( )->_unloading( _rEvent ); } void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { - if ( !locked() && getLoadListener( ) ) + if ( getLoadListener( ) ) getLoadListener( )->_unloaded( _rEvent ); } void SAL_CALL OLoadListenerAdapter::reloading( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { - if ( !locked() && getLoadListener( ) ) + if ( getLoadListener( ) ) getLoadListener( )->_reloading( _rEvent ); } void SAL_CALL OLoadListenerAdapter::reloaded( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { - if ( !locked() && getLoadListener( ) ) + if ( getLoadListener( ) ) getLoadListener( )->_reloaded( _rEvent ); } diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index 1b84c65f14f5..8aa5165d18bf 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -59,7 +59,6 @@ namespace bib private: css::uno::Reference< css::lang::XComponent > m_xComponent; OComponentListener* m_pListener; - sal_Int32 m_nLockCount; bool m_bListening : 1; // impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster @@ -90,10 +89,6 @@ namespace bib virtual void SAL_CALL acquire( ) throw () = 0; virtual void SAL_CALL release( ) throw () = 0; - // helper - /// get the lock count - sal_Int32 locked() const { return m_nLockCount; } - /// dispose the object - stop listening and such void dispose(); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index ee909bb948ca..cce464e2faff 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -109,8 +109,7 @@ private: GDIMetaFile* pAMTF; // only created if Graphics is not a Metafile ScopedVclPtrInstance<VirtualDevice> pVDev; - double nBoundingX1; // this represents the bounding box - double nBoundingX2; + double nBoundingX2; // this represents the bounding box double nBoundingY2; StackMember* pGDIStack; @@ -242,7 +241,6 @@ PSWriter::PSWriter() , pMTF(nullptr) , pAMTF(nullptr) , pVDev() - , nBoundingX1(0) , nBoundingX2(0) , nBoundingY2(0) , pGDIStack(nullptr) @@ -401,7 +399,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter pMTF = pAMTF; } pVDev->SetMapMode( pMTF->GetPrefMapMode() ); - nBoundingX1 = 0; nBoundingX2 = pMTF->GetPrefSize().Width(); nBoundingY2 = pMTF->GetPrefSize().Height(); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 6e2c7bda28c5..dcfaca68b635 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -168,9 +168,7 @@ struct SvxMSDffBLIPInfos : public std::vector<SvxMSDffBLIPInfo> {}; void Impl_OlePres::Write( SvStream & rStm ) { WriteClipboardFormat( rStm, SotClipboardFormatId::GDIMETAFILE ); - rStm.WriteInt32( nJobLen + 4 ); // a TargetDevice that's always empty - if( nJobLen ) - rStm.WriteBytes(pJob, nJobLen); + rStm.WriteInt32( 4 ); // a TargetDevice that's always empty rStm.WriteUInt32( nAspect ); rStm.WriteInt32( -1 ); //L-Index always -1 rStm.WriteInt32( nAdvFlags ); diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx index d4afde6df34d..ee1767c5c05e 100644 --- a/filter/source/msfilter/viscache.hxx +++ b/filter/source/msfilter/viscache.hxx @@ -32,8 +32,6 @@ class Impl_OlePres GDIMetaFile * pMtf; sal_uInt32 nAdvFlags; - sal_Int32 nJobLen; - sal_uInt8* pJob; Size aSize; // Groesse in 100TH_MM public: explicit Impl_OlePres( SotClipboardFormatId nF ) @@ -41,12 +39,9 @@ public: , nAspect( ASPECT_CONTENT ) , pMtf( nullptr ) , nAdvFlags( 0x2 ) // in Dokument gefunden - , nJobLen( 0 ) - , pJob( nullptr ) {} ~Impl_OlePres() { - delete pJob; delete pMtf; } void SetMtf( const GDIMetaFile & rMtf ) diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index e1df97f839e5..4b9e7723255f 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -278,8 +278,8 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property xImporter->setTargetDocument(mxDoc); char fs[32], fs2[32]; - sprintf(fs, "%ipt", ini.fontsize); - sprintf(fs2,"%ipt", 2*ini.fontsize); + sprintf(fs, "%ipt", inistruct::fontsize); + sprintf(fs2,"%ipt", 2*inistruct::fontsize); mpAttrList = new SvXMLAttributeList; @@ -485,7 +485,6 @@ void T602ImportFilter::Reset602() ini.xcode = KAM; ini.ruscode = false; ini.reformatpars= false; - ini.fontsize = 10; fst.nowfnt = fst.oldfnt = standard; fst.uline = fst.olduline = false; diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index f9ccc0526af0..d8dbbdd3439f 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -75,7 +75,7 @@ struct inistruct tcode xcode; // KAM encoding set - forced bool ruscode; // false Russian tables turned on bool reformatpars; // false Reformat paragraphs (whitespaces and line breaks) - sal_Int16 fontsize; // font size in points + static const sal_Int16 fontsize = 10; // font size in points inistruct() : showcomm( true ) @@ -83,7 +83,6 @@ struct inistruct , xcode ( KAM ) , ruscode ( false ) , reformatpars ( false ) - , fontsize (10) { }; }; diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 104b485570a0..20c62780f6b8 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -205,7 +205,6 @@ private: css::uno::Reference< css::embed::XStorage > m_xUserConfigStorage; bool m_bReadOnly; bool m_bModified; - bool m_bConfigRead; bool m_bDisposed; OUString m_aXMLPostfix; OUString m_aPropUIName; @@ -852,7 +851,6 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( , m_xUserConfigStorage( nullptr ) , m_bReadOnly( true ) , m_bModified( false ) - , m_bConfigRead( false ) , m_bDisposed( false ) , m_aXMLPostfix( ".xml" ) , m_aPropUIName( "UIName" ) @@ -951,7 +949,6 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (css::uno::RuntimeEx m_xDefaultConfigStorage.clear(); m_xUserConfigStorage.clear(); m_xUserRootCommit.clear(); - m_bConfigRead = false; m_bModified = false; m_bDisposed = true; aGuard.clear(); diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 1acce8f794a3..da0684fd93fc 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -170,22 +170,9 @@ public: Stringtable *appl_helptexts; xmlDocPtr appl_doc; - HashSet *default_hidlist; - Hashtable *default_keywords; - Stringtable *default_helptexts; - xmlDocPtr default_doc; - StreamTable() : - appl_hidlist(nullptr), appl_keywords(nullptr), appl_helptexts(nullptr), appl_doc(nullptr), - default_hidlist(nullptr), default_keywords(nullptr), default_helptexts(nullptr), default_doc(nullptr) + appl_hidlist(nullptr), appl_keywords(nullptr), appl_helptexts(nullptr), appl_doc(nullptr) {} - void dropdefault() - { - delete default_hidlist; - delete default_keywords; - delete default_helptexts; - if (default_doc) xmlFreeDoc(default_doc); - } void dropappl() { delete appl_hidlist; @@ -196,7 +183,6 @@ public: ~StreamTable() { dropappl(); - dropdefault(); } }; diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index dcf195b77d86..66ad44bbc055 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -412,8 +412,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx addBookmark( pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB); const HashSet *hidlist = streamTable.appl_hidlist; - if (!hidlist) - hidlist = streamTable.default_hidlist; if (hidlist && !hidlist->empty()) { // now iterate over all elements of the hidlist @@ -436,8 +434,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx // now the keywords const Hashtable *anchorToLL = streamTable.appl_keywords; - if (!anchorToLL) - anchorToLL = streamTable.default_keywords; if (anchorToLL && !anchorToLL->empty()) { std::string fakedHid = URLEncoder::encode(documentPath); @@ -463,8 +459,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx // and last the helptexts const Stringtable *helpTextHash = streamTable.appl_helptexts; - if (!helpTextHash) - helpTextHash = streamTable.default_helptexts; if (helpTextHash && !helpTextHash->empty()) { Stringtable::const_iterator aEnd = helpTextHash->end(); @@ -486,8 +480,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx { // now the indexing xmlDocPtr document = streamTable.appl_doc; - if (!document) - document = streamTable.default_doc; if (document) { std::string temp = module; diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 10e41022ae23..102a08882343 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -101,7 +101,7 @@ class SvTokenStream sal_uLong nLine, nColumn; int nBufPos; int c; // next character - sal_uInt16 nTabSize; // length of tabulator + static const sal_uInt16 nTabSize = 4; // length of tabulator OString aStrTrue; OString aStrFalse; sal_uLong nMaxPos; diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index 9774991793a7..1626b203119c 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -77,7 +77,6 @@ void SvTokenStream::InitCtor() aStrFalse = OString("FALSE"); nLine = nColumn = 0; nBufPos = 0; - nTabSize = 4; nMaxPos = 0; c = GetNextChar(); FillTokenList(); |