diff options
Diffstat (limited to 'sc/source/filter/xml')
-rw-r--r-- | sc/source/filter/xml/XMLCellRangeSourceContext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLConsolidationContext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLTableSourceContext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlcoli.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmldrani.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 12 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlrowi.cxx | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 74587169d7da..2ccc32306f76 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -81,7 +81,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( { double fTime; if (::sax::Converter::convertDuration( fTime, aIter.toString() )) - pCellRangeSource->nRefresh = std::max( (sal_Int32)(fTime * 86400.0), (sal_Int32)0 ); + pCellRangeSource->nRefresh = std::max( static_cast<sal_Int32>(fTime * 86400.0), sal_Int32(0) ); } break; } diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 0e929223284a..cfdbe34a18db 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -83,7 +83,7 @@ void SAL_CALL ScXMLConsolidationContext::endFastElement( sal_Int32 /*nElement*/ aConsParam.nTab = aTargetAddr.Tab(); aConsParam.eFunction = eFunction; - sal_uInt16 nCount = (sal_uInt16) std::min( ScRangeStringConverter::GetTokenCount( sSourceList ), (sal_Int32)0xFFFF ); + sal_uInt16 nCount = static_cast<sal_uInt16>(std::min( ScRangeStringConverter::GetTokenCount( sSourceList ), sal_Int32(0xFFFF) )); ScArea** ppAreas = nCount ? new ScArea*[ nCount ] : nullptr; if( ppAreas ) { diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 4970fa00e510..5efbe6ef4157 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -66,7 +66,7 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, case XML_ELEMENT( TABLE, XML_REFRESH_DELAY ): double fTime; if (::sax::Converter::convertDuration( fTime, aIter.toString() )) - nRefresh = std::max( (sal_Int32)(fTime * 86400.0), (sal_Int32)0 ); + nRefresh = std::max( static_cast<sal_Int32>(fTime * 86400.0), sal_Int32(0) ); break; } } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 6e3e823c6ae8..a9033196ecbc 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -120,7 +120,7 @@ void SAL_CALL ScXMLTableColContext::endFastElement( sal_Int32 /*nElement*/ ) if ( nSheet != pStyle->GetLastSheet() ) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData(); - pSheetData->AddColumnStyle( sStyleName, ScAddress( (SCCOL)nCurrentColumn, 0, nSheet ) ); + pSheetData->AddColumnStyle( sStyleName, ScAddress( static_cast<SCCOL>(nCurrentColumn), 0, nSheet ) ); pStyle->SetLastSheet(nSheet); } } diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index c6d1dde218e3..e513d4e8c0f7 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -177,7 +177,7 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, { double fTime; if (::sax::Converter::convertDuration( fTime, aIter.toString() )) - nRefresh = std::max( (sal_Int32)(fTime * 86400.0), (sal_Int32)0 ); + nRefresh = std::max( static_cast<sal_Int32>(fTime * 86400.0), sal_Int32(0) ); } break; } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 0781246233e7..e9c6a22916f4 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -648,7 +648,7 @@ void ScXMLExport::ExportMeta_() uno::Sequence<beans::NamedValue> stats { - { "TableCount", uno::makeAny((sal_Int32)nTableCount) }, + { "TableCount", uno::makeAny(static_cast<sal_Int32>(nTableCount)) }, { "CellCount", uno::makeAny(nCellCount) }, { "ObjectCount", uno::makeAny(nShapesCount) } }; @@ -1819,7 +1819,7 @@ void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset xDestStream->writeBytes( aOutSeq ); } - rNewStart = (sal_Int32)xDestSeek->getPosition(); + rNewStart = static_cast<sal_Int32>(xDestSeek->getPosition()); if ( nStartOffset > nSourceStreamPos ) lcl_SkipBytesInBlocks( xSourceStream, nStartOffset - nSourceStreamPos ); @@ -1834,7 +1834,7 @@ void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset } nSourceStreamPos = nEndOffset; - rNewEnd = (sal_Int32)xDestSeek->getPosition(); + rNewEnd = static_cast<sal_Int32>(xDestSeek->getPosition()); } } } @@ -1913,7 +1913,7 @@ void ScXMLExport::ExportContent_() { sal_Int32 nStartOffset = -1; sal_Int32 nEndOffset = -1; - if (pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) && !pDoc->GetChangeTrack()) + if (pSheetData && pDoc && pDoc->IsStreamValid(static_cast<SCTAB>(nTable)) && !pDoc->GetChangeTrack()) pSheetData->GetStreamPos( nTable, nStartOffset, nEndOffset ); if ( nStartOffset >= 0 && nEndOffset >= 0 && xSourceStream.is() ) @@ -3572,7 +3572,7 @@ void ScXMLExport::WriteAreaLink( const ScMyCell& rMyCell ) if( rAreaLink.nRefresh ) { ::sax::Converter::convertDuration( sValue, - (double)rAreaLink.nRefresh / 86400 ); + static_cast<double>(rAreaLink.nRefresh) / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sValue.makeStringAndClear() ); } SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, true, true ); @@ -3920,7 +3920,7 @@ void ScXMLExport::WriteTableSource() { OUStringBuffer sBuffer; ::sax::Converter::convertDuration( sBuffer, - (double)nRefresh / 86400 ); + static_cast<double>(nRefresh) / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sBuffer.makeStringAndClear() ); } SvXMLElementExport aSourceElem(*this, XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, true, true); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 0a7f0a44efa8..b521ebedb7a7 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1459,7 +1459,7 @@ void ScXMLImport::SetStyleToRanges() { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetModel())->GetSheetSaveData(); pSheetData->AddCellStyle( sPrevStyleName, - ScAddress( (SCCOL)rRange.StartColumn, (SCROW)rRange.StartRow, (SCTAB)rRange.Sheet ) ); + ScAddress( static_cast<SCCOL>(rRange.StartColumn), static_cast<SCROW>(rRange.StartRow), static_cast<SCTAB>(rRange.Sheet) ) ); pStyle->SetLastSheet(rRange.Sheet); } } @@ -1935,7 +1935,7 @@ sal_Int32 ScXMLImport::GetByteOffset() uno::Reference<xml::sax::XLocator> xLocator = GetLocator(); uno::Reference<io::XSeekable> xSeek( xLocator, uno::UNO_QUERY ); //! should use different interface if ( xSeek.is() ) - nOffset = (sal_Int32)xSeek->getPosition(); + nOffset = static_cast<sal_Int32>(xSeek->getPosition()); return nOffset; } diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index b2bfd33eb71f..7f958d459f4d 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -69,7 +69,7 @@ ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, break; case XML_ELEMENT( TABLE, XML_NUMBER_ROWS_REPEATED ): { - nRepeatedRows = std::max( it.toInt32(), (sal_Int32) 1 ); + nRepeatedRows = std::max( it.toInt32(), sal_Int32(1) ); nRepeatedRows = std::min( nRepeatedRows, MAXROWCOUNT ); } break; @@ -175,7 +175,7 @@ void SAL_CALL ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/) if ( nSheet != pStyle->GetLastSheet() ) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData(); - pSheetData->AddRowStyle( sStyleName, ScAddress( 0, (SCROW)nFirstRow, nSheet ) ); + pSheetData->AddRowStyle( sStyleName, ScAddress( 0, static_cast<SCROW>(nFirstRow), nSheet ) ); pStyle->SetLastSheet(nSheet); } } |