diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-13 18:20:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-13 18:21:36 +0100 |
commit | d1c9e5ee53f8609092ea026639c8f28afec1d36a (patch) | |
tree | 192f7722bd0598614a08dd8e5ed13c08da44ca97 | |
parent | 8289bc767ecc88cf07da60ab6a8b850f5c2e7eb4 (diff) |
tdf#43157: Fix format string violations in OSL_TRACE etc.
...for a 32-bit build, similar to what ee11e221d2108212619e1bbe7f029e7d9afdba32
"tdf#43157: Fix format string violations in OSL_TRACE etc." did for a 64-bit
build
Change-Id: I05dd79ede3e66cb9ab7a33792319eb34b34c82dd
38 files changed, 268 insertions, 149 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index b8933b11b9eb..08fc825797ce 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1066,7 +1066,9 @@ SbModule* StarBASIC::MakeModule32( const OUString& rName, const OUString& rSrc ) SbModule* StarBASIC::MakeModule32( const OUString& rName, const ModuleInfo& mInfo, const OUString& rSrc ) { - OSL_TRACE("create module %s type mInfo %d", OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType ); + SAL_INFO( + "basic", + "create module " << rName << " type mInfo " << mInfo.ModuleType); SbModule* p = NULL; switch ( mInfo.ModuleType ) { diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 87210f04bb65..405f9bc7dd1a 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -82,7 +82,9 @@ namespace cairocanvas ENSURE_OR_THROW( mpSurfaceProvider.is(), "CanvasBitmap::CanvasBitmap(): Invalid surface or device" ); - OSL_TRACE( "bitmap size: %dx%d", rSize.getX(), rSize.getY() ); + SAL_INFO( + "canvas.cairo", + "bitmap size: " << rSize.getX() << "x" << rSize.getY()); mpBufferSurface = mpSurfaceProvider->createSurface( rSize, bHasAlpha ? CAIRO_CONTENT_COLOR_ALPHA : CAIRO_CONTENT_COLOR ); mpBufferCairo = mpBufferSurface->getCairo(); diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 50d79ff23d64..fab8b1b0e754 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -85,7 +85,9 @@ namespace cairocanvas void DeviceHelper::setSize( const ::basegfx::B2ISize& rSize ) { - OSL_TRACE("DeviceHelper::setSize(): device size %d x %d", rSize.getX(), rSize.getY() ); + SAL_INFO( + "canvas.cairo", + "device size " << rSize.getX() << " x " << rSize.getY()); if( !mpRefDevice ) return; // disposed diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index ceba72a0ac4b..672c8bb44fa3 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -114,7 +114,9 @@ namespace cairocanvas void SpriteDeviceHelper::setSize( const ::basegfx::B2ISize& rSize ) { - OSL_TRACE("SpriteDeviceHelper::setSize(): device size %d x %d", rSize.getX(), rSize.getY() ); + SAL_INFO( + "canvas.cairo", + "device size " << rSize.getX() << " x " << rSize.getY()); if( !mpSpriteCanvas ) return; // disposed diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 70b4a803c6ef..045ba71cce0e 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -302,7 +302,10 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( for( tNumberformatFrequency::const_iterator aIt = aKeyMap.begin(); aIt != aKeyMap.end(); ++aIt ) { - OSL_TRACE( "NumberFormatKey %d appears %d times", (*aIt).first, (*aIt).second ); + SAL_INFO( + "chart2.tools", + "NumberFormatKey " << (*aIt).first << " appears " + << (*aIt).second << " times"); // all values must at least be 1 if( (*aIt).second > nMaxFreq ) { diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 0501736208b9..911a6258fa36 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -1019,7 +1019,10 @@ void AreaChart::createShapes() //... todo - OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< area chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); + SAL_INFO( + "chart2", + "skipped points: " << nSkippedPoints << " created points: " + << nCreatedPoints); } } //namespace chart diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 168fab66eedb..e5cbbe40915a 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -923,7 +923,10 @@ void BarChart::createShapes() /* @todo remove series shapes if empty */ - OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< bar chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); + SAL_INFO( + "chart2", + "skipped points: " << nSkippedPoints << " created points: " + << nCreatedPoints); } } //namespace chart diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index d79d38218f6a..cce9a3349989 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -398,7 +398,10 @@ void BubbleChart::createShapes() }//next x slot }//next z slot }//next category - OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< area chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); + SAL_INFO( + "chart2", + "skipped points: " << nSkippedPoints << " created points: " + << nCreatedPoints); } } //namespace chart diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 83f64b5edef7..add296150c6b 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -696,7 +696,7 @@ void OEvoabResultSet::construct( const QueryData& _rData ) } } m_nLength = m_pVersionHelper->getNumContacts(); - OSL_TRACE( "Query return %d records", m_nLength ); + SAL_INFO("connectivity.evoab2", "Query return " << m_nLength << " records"); m_nIndex = -1; // create our meta data (need the EBookQuery for this) diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 47312759551d..9b5dde21488c 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -384,7 +384,9 @@ ORowSetValue& x) ::osl::MutexGuard aGuard( m_aMutex ); checkAndResizeParameters(parameterIndex); - OSL_TRACE("setParameter( %d, '%s')", parameterIndex, OUtoCStr(x) ); + SAL_INFO( + "connectivity.mork", + "setParameter(" << parameterIndex << ", '" << x.getString() << "')"); (m_aParameterRow->get())[parameterIndex] = x; } diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 02d08956a158..b33cb54c3383 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -250,7 +250,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::getRow, return = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "return = " << m_nRowPos); return m_nRowPos; } @@ -327,7 +327,7 @@ sal_uInt32 OResultSet::currentRowCount() bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) { - OSL_TRACE("fetchCurrentRow, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return fetchRow(getCurrentCardNumber()); } @@ -363,7 +363,7 @@ bool OResultSet::pushCard(sal_uInt32 /*cardNumber*/) throw(SQLException, Runtime bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLException, RuntimeException) { - OSL_TRACE("fetchRow, cardNumber = %u", cardNumber ); + SAL_INFO("connectivity.mork", "cardNumber = " << cardNumber); if (!bForceReload) { // Check whether we've already fetched the row... @@ -559,7 +559,6 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio { SAL_WARN("connectivity.mork", "OResultSet::rowDeleted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::rowDeleted, m_RowStates=%u",m_RowStates ); return sal_True;//return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ; } @@ -567,7 +566,6 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti { SAL_WARN("connectivity.mork", "OResultSet::rowInserted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::rowInserted,m_RowStates=%u",m_RowStates ); return sal_True;//return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted); } @@ -575,7 +573,6 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio { SAL_WARN("connectivity.mork", "OResultSet::rowUpdated() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("In/Out: OResultSet::rowUpdated,m_RowStates=%u",m_RowStates ); return sal_True;// return ((m_RowStates & RowStates_Updated) == RowStates_Updated) ; } @@ -752,7 +749,9 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchStr } // XXX - Now we know name, what's value???? m_nParamIndex ++; - OSL_TRACE("Parameter name [%d]: %s", m_nParamIndex,OUtoCStr(aParameterName) ); + SAL_INFO( + "connectivity.mork", + "Parameter name [" << m_nParamIndex << "]: " << aParameterName); if ( m_aParameterRow.is() ) { OSL_ENSURE( m_nParamIndex < (sal_Int32)m_aParameterRow->get().size() + 1, "More parameters than values found" ); @@ -1079,9 +1078,8 @@ void OResultSet::fillRowData() for (sal_Int32 i = 1; aIter != m_xColumns->get().end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; -#if OSL_DEBUG_LEVEL > 0 - OSL_TRACE("Query Columns : (%d) %s", i, OUtoCStr(sName) ); -#endif + SAL_INFO( + "connectivity.mork", "Query Columns : (" << i << ") " << sName); m_aAttributeStrings.push_back( sName ); } @@ -1120,11 +1118,9 @@ void OResultSet::fillRowData() //determine whether the address book is readonly determineReadOnly(); -#if OSL_DEBUG_LEVEL > 0 - OSL_TRACE( "executeQuery returned %d", rv ); + SAL_INFO("connectivity.mork", "executeQuery returned " << rv); OSL_TRACE( "\tOUT OResultSet::fillRowData()" ); -#endif } @@ -1149,7 +1145,7 @@ static bool matchRow( OValueRow& row1, OValueRow& row2 ) sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) { - OSL_TRACE("In/Out: OResultSet::getRowForCardNumber, nCardNum = %u", nCardNum ); + SAL_INFO("connectivity.mork", "nCardNum = " << nCardNum); if ( m_pKeySet.is() ) { @@ -1158,7 +1154,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) { if (nCardNum == (m_pKeySet->get())[nPos]) { - OSL_TRACE("In/Out: OResultSet::getRowForCardNumber, return = %u", nPos+1 ); + SAL_INFO("connectivity.mork", "return = " << nPos+1); return nPos+1; } } @@ -1282,7 +1278,10 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep { const ORowSetValue& value = getValue(nRow, *aIter); - OSL_TRACE( "Adding Value: (%d,%d) : %s", nRow, *aIter,OUtoCStr( value )); + SAL_INFO( + "connectivity.mork", + "Adding Value: (" << nRow << "," << *aIter + << ") : " << value.getString()); pKeyValue->pushKey(new ORowSetValueDecorator(value)); } @@ -1406,9 +1405,10 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column -#if OSL_DEBUG_LEVEL > 0 - OSL_TRACE("Set Col Mapping: %d -> %d", nSelectColumnPos, nTableColumnPos ); -#endif + SAL_INFO( + "connectivity.mork", + "Set Col Mapping: " << nSelectColumnPos << " -> " + << nTableColumnPos); _rColMapping[nSelectColumnPos] = nTableColumnPos; } @@ -1451,7 +1451,9 @@ bool OResultSet::validRow( sal_uInt32 nRow) #endif if (m_aQueryHelper.checkRowAvailable( nRow ) == false) { - OSL_TRACE("validRow(%u): return False", nRow); + SAL_INFO( + "connectivity.mork", + "validRow(" << nRow << "): return False"); return false; } @@ -1465,12 +1467,10 @@ bool OResultSet::validRow( sal_uInt32 nRow) if (( nRow == 0 ) || ( nRow > (sal_uInt32)nNumberOfRecords && m_aQueryHelper.queryComplete()) ){ - OSL_TRACE("validRow(%u): return False", nRow); + SAL_INFO("connectivity.mork", "validRow(" << nRow << "): return False"); return false; } -#if OSL_DEBUG_LEVEL > 0 - OSL_TRACE("validRow(%u): return True", nRow); -#endif + SAL_INFO("connectivity.mork", "validRow(" << nRow << "): return True"); return true; } @@ -1507,7 +1507,7 @@ bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) sal_Int32 nRetrievedRows = currentRowCount(); sal_Int32 nCurPos = m_nRowPos; - OSL_TRACE("seekRow: nCurPos = %d", nCurPos ); + SAL_INFO("connectivity.mork", "nCurPos = " << nCurPos); switch( pos ) { case NEXT_POS: OSL_TRACE("seekRow: NEXT"); @@ -1529,18 +1529,19 @@ bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) nCurPos = nRetrievedRows; break; case ABSOLUTE_POS: - OSL_TRACE("seekRow: ABSOLUTE : %d", nOffset); + SAL_INFO("connectivity.mork", "ABSOLUTE : " << nOffset); nCurPos = nOffset; break; case RELATIVE_POS: - OSL_TRACE("seekRow: RELATIVE : %d", nOffset); + SAL_INFO("connectivity.mork", "RELATIVE : " << nOffset); nCurPos += sal_uInt32( nOffset ); break; } if ( nCurPos <= 0 ) { m_nRowPos = 0; - OSL_TRACE("seekRow: return False, m_nRowPos = %u", m_nRowPos ); + SAL_INFO( + "connectivity.mork", "return False, m_nRowPos = " << m_nRowPos); return false; } sal_Int32 nCurCard = nCurPos; @@ -1554,13 +1555,14 @@ bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) if ( nCurCard > nNumberOfRecords) { fillKeySet(nNumberOfRecords); m_nRowPos = static_cast<sal_uInt32>(m_pKeySet->get().size() + 1); - OSL_TRACE("seekRow: return False, m_nRowPos = %u", m_nRowPos ); + SAL_INFO( + "connectivity.mork", "return False, m_nRowPos = " << m_nRowPos); return false; } //Insert new retrieved items for later use fillKeySet(nNumberOfRecords); m_nRowPos = (sal_uInt32)nCurPos; - OSL_TRACE("seekRow: return True, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "return True, m_nRowPos = " << m_nRowPos); fetchCurrentRow(); return true; } @@ -1570,14 +1572,16 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin m_aColMapping = _aColumnMapping; #if OSL_DEBUG_LEVEL > 0 for ( sal_uInt32 i = 0; i < m_aColMapping.size(); i++ ) - OSL_TRACE("Set Mapped: %d -> %d", i, m_aColMapping[i] ); + SAL_INFO( + "connectivity.mork", + "Set Mapped: " << i << " -> " << m_aColMapping[i]); #endif } ::com::sun::star::uno::Any OResultSet::getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { - OSL_TRACE("getBookmark, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); if ( fetchCurrentRow() == false ) { m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); @@ -1589,7 +1593,8 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("moveToBookmark, bookmark = %u", comphelper::getINT32(bookmark) ); + SAL_INFO( + "connectivity.mork", "bookmark = " << comphelper::getINT32(bookmark)); sal_Int32 nCardNum = comphelper::getINT32(bookmark); m_nRowPos = getRowForCardNumber(nCardNum); fetchCurrentRow(); @@ -1598,7 +1603,9 @@ sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("moveRelativeToBookmark, bookmark = %u rows= %u", comphelper::getINT32(bookmark),rows ); + SAL_INFO( + "connectivity.mork", + "bookmark = " << comphelper::getINT32(bookmark) << " rows= " << rows); sal_Int32 nCardNum = comphelper::getINT32(bookmark); m_nRowPos = getRowForCardNumber(nCardNum); return seekRow(RELATIVE_POS,rows ); @@ -1606,7 +1613,7 @@ sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, const ::com::sun::star::uno::Any& rhs ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("compareBookmarks, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); sal_Int32 nFirst=0; sal_Int32 nSecond=0; sal_Int32 nResult=0; @@ -1627,13 +1634,13 @@ sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, c sal_Bool OResultSet::hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("hasOrderedBookmarks, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return sal_True; } sal_Int32 OResultSet::hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("hashBookmark, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return comphelper::getINT32(bookmark); } @@ -1666,7 +1673,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) } void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException) { - OSL_TRACE("updateValue, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); if ( fetchCurrentRow() == false ) { m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); @@ -1686,7 +1693,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { - OSL_TRACE("updateNull, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); if ( fetchCurrentRow() == false ) m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); @@ -1814,13 +1821,13 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("insertRow in, m_nRowPos = %u", m_nRowPos ); + 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); - OSL_TRACE("insertRow out, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "out, m_nRowPos = " << m_nRowPos); } void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) @@ -1846,7 +1853,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE void SAL_CALL OResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); - OSL_TRACE("moveToCurrentRow, m_nRowPos = %u", m_nRowPos ); + SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); if (rowInserted()) { m_nRowPos = m_nOldRowPos; diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 211aa33b480e..dc665eef7294 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -1700,7 +1700,10 @@ bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nO else m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,nFetchOrientation,_nOffset); - OSL_TRACE( __FILE__": OResultSet::move(%d,%d), FetchState = %d",nFetchOrientation,_nOffset,m_nCurrentFetchState); + SAL_INFO( + "connectivity.odbc", + "move(" << nFetchOrientation << "," << _nOffset << "), FetchState = " + << m_nCurrentFetchState); OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this); const bool bSuccess = m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; @@ -1759,7 +1762,9 @@ bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nO sal_Int32 OResultSet::getDriverPos() const { sal_Int32 nValue = getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_ROW_NUMBER); - OSL_TRACE( __FILE__": OResultSet::getDriverPos() = RowNum = %d, RowPos = %d", nValue, m_nRowPos); + SAL_INFO( + "connectivity.odbc", + "RowNum = " << nValue << ", RowPos = " << m_nRowPos); return nValue ? nValue : m_nRowPos; } diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 657374be0a53..dcce17b0a68b 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -500,6 +500,7 @@ certain functionality. @li @c reportdesign @li @c rsc @li @c sax +@li @c scripting @li @c scripting.provider @li @c shell @li @c stoc diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 6c1ce13336d6..e688d2dd4de5 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::drawing; -# define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() - namespace oox { namespace drawingml { CustomShapeProperties::CustomShapeProperties() @@ -96,7 +94,8 @@ CustomShapeProperties::PresetDataMap CustomShapeProperties::maPresetDataMap; static OUString GetConnectorShapeType( sal_Int32 nType ) { - OSL_TRACE("GetConnectorShapeType preset: %d %d", nType, XML_straightConnector1); + SAL_INFO( + "oox.drawingml", "preset: " << nType << " " << XML_straightConnector1); OUString sType; switch( nType ) @@ -115,7 +114,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi { if ( mnShapePresetType >= 0 ) { - OSL_TRACE("preset: %d", mnShapePresetType); + SAL_INFO("oox.drawingml", "preset: " << mnShapePresetType); if (maPresetDataMap.empty()) initializePresetDataMap(); @@ -127,7 +126,10 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi if (sConnectorShapeType.getLength() > 0) { - OSL_TRACE("connector shape: %s (%d)", USS(sConnectorShapeType), mnShapePresetType); + SAL_INFO( + "oox.drawingml", + "connector shape: " << sConnectorShapeType << " (" + << mnShapePresetType << ")"); //const uno::Reference < drawing::XShape > xShape( xPropSet, UNO_QUERY ); Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( xShape, UNO_QUERY ); if( xDefaulter.is() ) { @@ -137,7 +139,9 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi } else if (maPresetDataMap.find(mnShapePresetType) != maPresetDataMap.end()) { - OSL_TRACE("found property map for preset: %d", mnShapePresetType); + SAL_INFO( + "oox.drawingml", + "found property map for preset: " << mnShapePresetType); aPropertyMap = maPresetDataMap[mnShapePresetType]; #ifdef DEBUG diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 3fcd3fe0281c..5618be859e85 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -49,15 +49,12 @@ namespace dgm { void Connection::dump() { - OSL_TRACE("dgm: cnx modelId %s, srcId %s, dstId %s, parTransId %s, presId %s, sibTransId %s, srcOrd %d, dstOrd %d", - OUSTRING_TO_CSTR( msModelId ), - OUSTRING_TO_CSTR( msSourceId ), - OUSTRING_TO_CSTR( msDestId ), - OUSTRING_TO_CSTR( msParTransId ), - OUSTRING_TO_CSTR( msPresId ), - OUSTRING_TO_CSTR( msSibTransId ), - mnSourceOrder, - mnDestOrder ); + SAL_INFO( + "oox.drawingml", + "cnx modelId " << msModelId << ", srcId " << msSourceId << ", dstId " + << msDestId << ", parTransId " << msParTransId << ", presId " + << msPresId << ", sibTransId " << msSibTransId << ", srcOrd " + << mnSourceOrder << ", dstOrd " << mnDestOrder); } void Point::dump() diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 180a61310aa4..c1939a9a15bb 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -361,12 +361,11 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, break; } - OSL_TRACE("Layouting shape %s: (%d,%d,%d,%d)", - OUSTRING_TO_CSTR( rName ), - rShape->getPosition().X, - rShape->getPosition().Y, - rShape->getSize().Width, - rShape->getSize().Height); + SAL_INFO( + "oox.drawingml", + "Layouting shape " << rName << ": (" << rShape->getPosition().X << "," + << rShape->getPosition().Y << "," << rShape->getSize().Width << "," + << rShape->getSize().Height << ")"); } void LayoutNode::accept( LayoutAtomVisitor& rVisitor ) @@ -381,10 +380,11 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI if( aDataNode != rDgm.getData()->getPointsPresNameMap().end() && aDataNode->second.size() > nIdx ) { - OSL_TRACE( "Filling content from %d th layout node named \"%s\", modelId \"%s\"", - nIdx, - OUSTRING_TO_CSTR( msName ), - OUSTRING_TO_CSTR( aDataNode->second.at(nIdx)->msModelId ) ); + SAL_INFO( + "oox.drawingml", + "Filling content from " << nIdx << "th layout node named \"" + << msName << "\", modelId \"" + << aDataNode->second.at(nIdx)->msModelId << "\""); // got the presentation node - now, need the actual data node: const DiagramData::StringMap::const_iterator aNodeName=rDgm.getData()->getPresOfNameMap().find( @@ -413,9 +413,13 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI rShape->getCustomShapeProperties() = aDataNode2->second->mpShape->getCustomShapeProperties(); rShape->setMasterTextListStyle( aDataNode2->second->mpShape->getMasterTextListStyle() ); - OSL_TRACE( "Custom shape with preset type %d added for layout node named \"%s\"", - rShape->getCustomShapeProperties()->getShapePresetType(), - OUSTRING_TO_CSTR( msName ) ); + SAL_INFO( + "oox.drawingml", + "Custom shape with preset type " + << (rShape->getCustomShapeProperties() + ->getShapePresetType()) + << " added for layout node named \"" << msName + << "\""); } // append text with right outline level @@ -452,9 +456,12 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI } else { - OSL_TRACE("ShapeCreationVisitor::visit: no data node name found while processing shape type %d for layout node named \"%s\"", - rShape->getCustomShapeProperties()->getShapePresetType(), - OUSTRING_TO_CSTR( msName ) ); + SAL_INFO( + "oox.drawingml", + "ShapeCreationVisitor::visit: no data node name found while" + " processing shape type " + << rShape->getCustomShapeProperties()->getShapePresetType() + << " for layout node named \"" << msName << "\""); } // TODO(Q1): apply styling & coloring - taking @@ -462,20 +469,32 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI // now, but docs are a bit unclear on this if( !msStyleLabel.isEmpty() ) { - OSL_TRACE("setting style with label %s", - OUSTRING_TO_CSTR( msStyleLabel ) ); + SAL_INFO( + "oox.drawingml", "setting style with label " << msStyleLabel); const DiagramQStyleMap::const_iterator aStyle=rDgm.getStyles().find(msStyleLabel); if( aStyle != rDgm.getStyles().end() ) { rShape->getShapeStyleRefs()[XML_fillRef] = aStyle->second.maFillStyle; - OSL_TRACE("added fill style with id %d", aStyle->second.maFillStyle.mnThemedIdx); + SAL_INFO( + "oox.drawingml", + "added fill style with id " + << aStyle->second.maFillStyle.mnThemedIdx); rShape->getShapeStyleRefs()[XML_lnRef] = aStyle->second.maLineStyle; - OSL_TRACE("added line style with id %d", aStyle->second.maLineStyle.mnThemedIdx); + SAL_INFO( + "oox.drawingml", + "added line style with id " + << aStyle->second.maLineStyle.mnThemedIdx); rShape->getShapeStyleRefs()[XML_effectRef] = aStyle->second.maEffectStyle; - OSL_TRACE("added effect style with id %d", aStyle->second.maEffectStyle.mnThemedIdx); + SAL_INFO( + "oox.drawingml", + "added effect style with id " + << aStyle->second.maEffectStyle.mnThemedIdx); rShape->getShapeStyleRefs()[XML_fontRef] = aStyle->second.maTextStyle; - OSL_TRACE("added fontref style with id %d", aStyle->second.maTextStyle.mnThemedIdx); + SAL_INFO( + "oox.drawingml", + "added fontref style with id " + << aStyle->second.maTextStyle.mnThemedIdx); Color aColor=aStyle->second.maTextStyle.maPhClr; OSL_TRACE("added fontref color with alpha %d", aColor.getTransparency() ); } @@ -501,9 +520,11 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI } else { - OSL_TRACE("ShapeCreationVisitor::visit: no text found while processing shape type %d for layout node named \"%s\"", - rShape->getCustomShapeProperties()->getShapePresetType(), - OUSTRING_TO_CSTR( msName ) ); + SAL_INFO( + "oox.drawingml", + "no text found while processing shape type " + << rShape->getCustomShapeProperties()->getShapePresetType() + << " for layout node named \"" << msName << "\""); } return false; @@ -631,8 +652,11 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom) ShapePtr pCurrShape(rAtom.getShape()); if( pCurrShape ) { - OSL_TRACE("ShapeCreationVisitor::visit: processing shape type %d", - pCurrShape->getCustomShapeProperties()->getShapePresetType() ); + SAL_INFO( + "oox.drawingml", + "processing shape type " + << (pCurrShape->getCustomShapeProperties() + ->getShapePresetType())); // TODO(F3): cloned shape shares all properties by reference, // don't change them! diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 5dd70be2da0c..792de08e2598 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -457,7 +457,7 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet ) Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo (); Sequence< Property > props = info->getProperties (); - OSL_TRACE("dump props, len: %d", props.getLength ()); + SAL_INFO("oox", "dump props, len: " << props.getLength ()); for (int i=0; i < props.getLength (); i++) { OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8); diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 45e7cce8353e..b3f8c72828e7 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -346,7 +346,9 @@ namespace oox { namespace ppt { mnTransitionSubType = TransitionSubType::EIGHTBLADE; break; default: - OSL_TRACE( "OOX: strange number of blades for thw wheel-wipe %d", param1 ); + SAL_INFO( + "oox.ppt", + "strange number of blades for thw wheel-wipe " << param1); if( param1 > 8 ) { mnTransitionSubType = TransitionSubType::EIGHTBLADE; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 11696210d15d..57dccc0bdf64 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -1012,7 +1012,7 @@ namespace oox { namespace ppt { default: nNodeType = AnimationNodeType::CUSTOM; - OSL_TRACE( "OOX: uhandled token %x", aElementToken ); + SAL_INFO("oox.ppt", "uhandled token " << aElementToken); break; } diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 5aa6a5169147..a8aa96640464 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -399,7 +399,10 @@ static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, OUString& rExte OUString aStr; if (!(rInfo.Data >>= aStr)) { - OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i); + SAL_INFO( + "sc.core", + "Data type mismatch for ExternalLinkInfo " + << i); *ppErrRet = NULL; return false; } @@ -413,8 +416,10 @@ static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, OUString& rExte *ppErrRet = NULL; return false; default: - OSL_TRACE( "ScRange::Parse_XL_Header: unhandled ExternalLinkType %d for index %d", - rInfo.Type, i); + SAL_INFO( + "sc.core", + "unhandled ExternalLinkType " << rInfo.Type + << " for index " << i); *ppErrRet = NULL; return false; } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 3f29b50822fa..a0d99dd9549e 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -262,7 +262,11 @@ void ScParameterClassification::Init() pRun->aData.nParam[j] = pRun->aData.nParam[j - pRun->aData.nRepeatLast]; else { - OSL_TRACE( "bad classification: eOp %d, repeated param %d negative offset", pRaw->eOp, j); + SAL_INFO( + "sc.core", + "bad classification: eOp " << +pRaw->eOp + << ", repeated param " << j + << " negative offset"); pRun->aData.nParam[j] = Unknown; } } diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 9445c19f1380..432ff5d3f7d3 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -244,7 +244,8 @@ void XclPCNumGroupInfo::SetScDateType( sal_Int32 nScType ) case ScDPGroupBy::MONTHS: nXclType = EXC_SXNUMGROUP_TYPE_MONTH; break; case ScDPGroupBy::QUARTERS: nXclType = EXC_SXNUMGROUP_TYPE_QUART; break; case ScDPGroupBy::YEARS: nXclType = EXC_SXNUMGROUP_TYPE_YEAR; break; - default: OSL_TRACE( "XclPCNumGroupInfo::SetScDateType - unexpected date type %d", nScType ); + default: + SAL_INFO("sc.filter", "unexpected date type " << nScType); } SetXclDataType( nXclType ); } diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index d1444ff1b723..30ba9eb60365 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -87,11 +87,11 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException) if ( xAddress.Column == aAddress.Column && xAddress.Row == aAddress.Row && xAddress.Sheet == aAddress.Sheet ) { - OSL_TRACE("** terminating search, index is %d", aIndex ); + SAL_INFO("sc.ui", "terminating search, index is " << aIndex); break; } } - OSL_TRACE("** returning index is %d", aIndex ); + SAL_INFO("sc.ui", "returning index is " << aIndex); return aIndex; } diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index fe942f4f909e..6f8cb735854b 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -767,7 +767,9 @@ EventListener::initialize( const Sequence< Any >& aArguments ) throw (Exception, { if ( aArguments.getLength() == 1 ) aArguments[0] >>= m_xModel; - OSL_TRACE("EventListener::initialize() args %d m_xModel %d", aArguments.getLength(), m_xModel.is() ); + SAL_INFO( + "scripting", + "args " << aArguments.getLength() << " m_xModel " << m_xModel.is()); } // XInterface diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index d90d701371b9..f7b770332ea2 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -56,16 +56,16 @@ namespace { SharedPageDescriptor pDescriptor (rModel.GetPageDescriptor(nIndex)); if (pDescriptor) { - OSL_TRACE("%d %d %d %d %p", - nIndex, - pDescriptor->GetPageIndex(), - pDescriptor->GetVisualState().mnPageId, - FromCoreIndex(pDescriptor->GetPage()->GetPageNum()), - pDescriptor->GetPage()); + SAL_INFO( + "sd.sls", + nIndex << " " << pDescriptor->GetPageIndex() << " " + << pDescriptor->GetVisualState().mnPageId << " " + << FromCoreIndex(pDescriptor->GetPage()->GetPageNum()) + << " " << pDescriptor->GetPage()); } else { - OSL_TRACE("%d", nIndex); + SAL_INFO("sd.sls", nIndex); } } @@ -292,7 +292,7 @@ void SlideSorterModel::Resync (void) && maPageDescriptors[nIndex]->GetPage() != GetPage(nIndex)) { - OSL_TRACE("page %d differs", nIndex); + SAL_INFO("sd.sls", "page " << nIndex << " differs"); bIsUpToDate = false; break; } @@ -332,7 +332,10 @@ void SlideSorterModel::ClearDescriptorList (void) { if ( ! iDescriptor->unique()) { - OSL_TRACE("SlideSorterModel::ClearDescriptorList: trying to delete page descriptor that is still used with count %zu", iDescriptor->use_count()); + SAL_INFO( + "sd.sls", + "trying to delete page descriptor that is still used with" + " count " << iDescriptor->use_count()); // No assertion here because that can hang the office when // opening a dialog from here. } diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index f0f6793975f0..75840e78fff7 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -395,8 +395,10 @@ bool checkDocChecksum( const OUString& rInPDFFileURL, bool bRet = false; if( rChkSum.getLength() != 2* RTL_DIGEST_LENGTH_MD5 ) { - OSL_TRACE( "checksum of length %d, expected %d\n", - rChkSum.getLength(), 2*RTL_DIGEST_LENGTH_MD5 ); + SAL_INFO( + "sdext.pdfimport", + "checksum of length " << rChkSum.getLength() << ", expected " + << 2*RTL_DIGEST_LENGTH_MD5); return false; } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 95a0247f02d4..ee0272750f0f 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -145,8 +145,10 @@ namespace slideshow maActionClassVector[ nActionIndex ] = CLASS_SHAPE_START; } } - VERBOSE_TRACE( "Shape text structure: %s at action #%d", - pAct->GetComment().getStr(), nActionIndex ); + SAL_INFO( + "slideshow", + "Shape text structure: " << pAct->GetComment() + << " at action #" << nActionIndex); ++nActionIndex; break; } diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index bea35d22c023..1e777ff178e1 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -657,7 +657,7 @@ void OStorePageBIOS::cleanup_Impl() if (m_ace_head.m_used > 0) { // Report remaining referer count. - OSL_TRACE("store::PageBIOS::cleanup_Impl(): referer count: %d", m_ace_head.m_used); + SAL_INFO("store", "referer count: " << m_ace_head.m_used); for (Ace * ace = m_ace_head.m_next; ace != &m_ace_head; ace = m_ace_head.m_next) { m_ace_head.m_used -= ace->m_used; diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index e4c348f29865..0bfa2200fcf1 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -23,6 +23,7 @@ #include "storcach.hxx" +#include "sal/log.hxx" #include "sal/types.h" #include "sal/macros.h" #include "rtl/alloc.h" @@ -335,8 +336,11 @@ void PageCache_Impl::rescale_Impl (sal_Size new_size) Entry ** old_table = m_hash_table; sal_Size old_size = m_hash_size; - OSL_TRACE("ave chain length: %zu, total entries: %zu [old_size: %zu new_size: %zu]", - m_hash_entries >> m_hash_shift, m_hash_entries, old_size, new_size); + SAL_INFO( + "store", + "ave chain length: " << (m_hash_entries >> m_hash_shift) + << ", total entries: " << m_hash_entries << " [old_size: " + << old_size << " new_size: " << new_size << "]"); memset (new_table, 0, new_bytes); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 6affc60de3f1..9a8c240e13d7 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -391,13 +391,13 @@ namespace accessibility // we just received the focus, also send caret event then UpdateSelection(); - OSL_TRACE("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d received focus", nChild ); + SAL_INFO("svx", "Paragraph " << nChild << " received focus"); } else { maParaManager.SetFocus( -1 ); - OSL_TRACE("AccessibleTextHelper_Impl::SetChildFocus(): Paragraph %d lost focus", nChild ); + SAL_INFO("svx", "Paragraph " << nChild << " lost focus"); if( mbGroupHasFocus ) SetShapeFocus( true ); @@ -412,7 +412,7 @@ namespace accessibility mbGroupHasFocus = true; maParaManager.SetFocus( nNewChild ); - OSL_TRACE("AccessibleTextHelper_Impl::ChangeChildFocus(): Paragraph %d received focus", nNewChild ); + SAL_INFO("svx", "Paragraph " << nNewChild << " received focus"); } void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus ) @@ -554,8 +554,12 @@ namespace accessibility ChangeChildFocus( aSelection.nEndPara ); - OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): focus changed, Object: %p, Paragraph: %d, Last paragraph: %d", - this, aSelection.nEndPara, maLastSelection.nEndPara); + SAL_INFO( + "svx", + "focus changed, Object: " << this + << ", Paragraph: " << aSelection.nEndPara + << ", Last paragraph: " + << maLastSelection.nEndPara); } } @@ -583,8 +587,13 @@ namespace accessibility aOldCursor ); } - OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): caret changed, Object: %p, New pos: %d, Old pos: %d, New para: %d, Old para: %d", - this, aSelection.nEndPos, maLastSelection.nEndPos, aSelection.nEndPara, maLastSelection.nEndPara); + SAL_INFO( + "svx", + "caret changed, Object: " << this << ", New pos: " + << aSelection.nEndPos << ", Old pos: " + << maLastSelection.nEndPos << ", New para: " + << aSelection.nEndPara << ", Old para: " + << maLastSelection.nEndPara); // #108947# Sort new range before calling FireEvent ::std::pair<sal_Int32, sal_Int32> sortedSelection( diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 642d434ec178..deb1e14a24e5 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -638,7 +638,10 @@ void EnhancedCustomShape2d::SetPathSize( sal_Int32 nIndex ) if ( seqSubViewSize.getLength() && nIndex < seqSubViewSize.getLength() ) { nWidth = seqSubViewSize[ nIndex ].Width; nHeight = seqSubViewSize[ nIndex ].Height; - OSL_TRACE("set subpath %d size: %d x %d", nIndex, nWidth, nHeight); + SAL_INFO( + "svx", + "set subpath " << nIndex << " size: " << nWidth << " x " + << nHeight); } if ( nWidth && nHeight ) { @@ -653,7 +656,10 @@ void EnhancedCustomShape2d::SetPathSize( sal_Int32 nIndex ) fYScale = nCoordHeight == 0 ? 0.0 : (double)aLogicRect.GetHeight() / (double)nCoordHeight; if ( bOOXMLShape ) { - OSL_TRACE("ooxml shape, path width: %d height: %d", nCoordWidth, nCoordHeight); + SAL_INFO( + "svx", + "ooxml shape, path width: " << nCoordWidth << " height: " + << nCoordHeight); if ( nCoordWidth == 0 ) fXScale = 1.0; if ( nCoordHeight == 0 ) @@ -806,8 +812,10 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : } catch ( EnhancedCustomShape::ParseError& ) { - OSL_TRACE("error: equation number: %d, parser failed ( %s )", - i, OUStringToOString( seqEquations[ i ], RTL_TEXTENCODING_ASCII_US ).getStr()); + SAL_INFO( + "svx", + "error: equation number: " << i << ", parser failed (" + << seqEquations[i] << ")"); } } } @@ -890,8 +898,10 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) nLevel --; #endif } - OSL_TRACE(" ?%d --> %f (angle: %f)", nIndex, - fNumber, 180.0*fNumber/10800000.0); + SAL_INFO( + "svx", + "?" << nIndex << " --> " << fNumber << " (angle: " + << 180.0*fNumber/10800000.0 << ")"); } return fNumber; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 44d2165416e9..f3656a30d5c1 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -153,7 +153,12 @@ public: } virtual double operator()() const SAL_OVERRIDE { - OSL_TRACE(" $%d --> %f (angle: %f)", mnIndex, mrCustoShape.GetAdjustValueAsDouble( mnIndex ), 180.0*mrCustoShape.GetAdjustValueAsDouble( mnIndex )/10800000.0); + SAL_INFO( + "svx", + "$" << mnIndex << " --> " + << mrCustoShape.GetAdjustValueAsDouble(mnIndex) << " (angle: " + << 180.0*mrCustoShape.GetAdjustValueAsDouble(mnIndex)/10800000.0 + << ")"); return mrCustoShape.GetAdjustValueAsDouble( mnIndex ); } virtual bool isConstant() const SAL_OVERRIDE diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 6a6f5f6ef45d..7bf17cbf5dea 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -47,16 +47,18 @@ namespace SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode(); if(pTxtNode == NULL && rPos.nContent.GetIndex() > 0) { - OSL_TRACE( - "bookmrk.cxx::lcl_FixPosition" - " - illegal position: %d without proper TxtNode", rPos.nContent.GetIndex()); + SAL_INFO( + "sw.core", + "illegal position: " << rPos.nContent.GetIndex() + << " without proper TxtNode"); rPos.nContent.Assign(NULL, 0); } else if(pTxtNode != NULL && rPos.nContent.GetIndex() > pTxtNode->Len()) { - OSL_TRACE( - "bookmrk.cxx::lcl_FixPosition" - " - illegal position: %d is beyond %d", rPos.nContent.GetIndex(), pTxtNode->Len()); + SAL_INFO( + "sw.core", + "illegal position: " << rPos.nContent.GetIndex() + << " is beyond " << pTxtNode->Len()); rPos.nContent.Assign(pTxtNode, pTxtNode->Len()); } } diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index e1133dd430a4..34952f596e86 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -48,7 +48,7 @@ sal_Int32 SwVbaRevision::GetPosition() throw (css::uno::RuntimeException) if( xProps == mxRedlineProps ) { nPos = i; - OSL_TRACE(" SwVbaRevision::SwVbaRevision, the redline position is %d, ", nPos ); + SAL_INFO("sw.ui", "the redline position is " << nPos); break; } } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 1b51690da4d5..8e80a5254359 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2648,7 +2648,10 @@ void SAL_CALL VCLXMultiPage::removeTab( sal_Int32 ID ) throw (uno::RuntimeExcept void SAL_CALL VCLXMultiPage::activateTab( sal_Int32 ID ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { TabControl *pTabControl = getTabControl(); - OSL_TRACE("Attempting to activate tab %d, active tab is %d, numtabs is %d", ID, getActiveTabID(), getWindows().getLength() ); + SAL_INFO( + "toolkit", + "Attempting to activate tab " << ID << ", active tab is " + << getActiveTabID() << ", numtabs is " << getWindows().getLength()); if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL ) throw lang::IndexOutOfBoundsException(); pTabControl->SelectTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ); diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index d793e2026b9a..9a03f66a8c1c 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -122,8 +122,10 @@ struct DocumentHandler // XFastContextHandler virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE { - OSL_TRACE("Seen element: %c with namespace 0x%x", - Element & 0xFFFF, Element & 0xFFFF0000); + SAL_INFO( + "unoxml", + "Seen element: " << (Element & 0xFFFF) << " with namespace " + << (Element & 0xFFFF0000)); } virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index eb9d73d06678..4fbba7c6318d 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -98,7 +98,7 @@ namespace DOM io_rContext.maNamespaces.back().push_back(aNS); - OSL_TRACE("Added with token 0x%x", aIter->second); + SAL_INFO("unoxml", "Added with token " << aIter->second); } } } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 3b60803731f4..fb14bdbd33a9 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -851,7 +851,10 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno OUString sExtension = "." + sToken; OUString &rBase = aSelectedFiles[nIndex]; sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength(); - OSL_TRACE( "idx are %d %d", rBase.lastIndexOf( sExtension ), nExtensionIdx ); + SAL_INFO( + "vcl.gtk", + "idx are " << rBase.lastIndexOf(sExtension) << " " + << nExtensionIdx); if( rBase.lastIndexOf( sExtension ) != nExtensionIdx ) rBase += sExtension; |