Kaydet (Commit) b0210c34 authored tarafından Bernhard Widl's avatar Bernhard Widl Kaydeden (comit) Eike Rathke

fdo#43157 convert OSL_ASSERT to assert in sc/source/filter

Change-Id: I3d6d3da69ed7539dacf7eaf82fa7633f85619b39
Reviewed-on: https://gerrit.libreoffice.org/39366Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
üst 42c8000e
...@@ -141,14 +141,14 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, ...@@ -141,14 +141,14 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ ) for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ )
{ {
OSL_ASSERT(aOS.getLength() == 0); SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
aOS.append(pSpecDataType_LF); aOS.append(pSpecDataType_LF);
aOS.append(pKeyBOT); aOS.append(pKeyBOT);
aOS.append('\n'); aOS.append('\n');
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear()); rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
for( nColCnt = rRange.aStart.Col() ; nColCnt <= nEndCol ; nColCnt++ ) for( nColCnt = rRange.aStart.Col() ; nColCnt <= nEndCol ; nColCnt++ )
{ {
OSL_ASSERT(aOS.getLength() == 0); SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
bool bWriteStringData = false; bool bWriteStringData = false;
ScRefCellValue aCell(*pDoc, ScAddress(nColCnt, nRowCnt, nTab)); ScRefCellValue aCell(*pDoc, ScAddress(nColCnt, nRowCnt, nTab));
...@@ -196,7 +196,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, ...@@ -196,7 +196,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
// sc/source/ui/docsh.cxx:ScDocShell::AsciiSave() // sc/source/ui/docsh.cxx:ScDocShell::AsciiSave()
// In fact we should create a common method if this would be // In fact we should create a common method if this would be
// needed just one more time.. // needed just one more time..
OSL_ASSERT(aOS.getLength() == 0); SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
OUString aTmpStr = aString; OUString aTmpStr = aString;
aOS.append(pStringData); aOS.append(pStringData);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet); rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet);
...@@ -257,7 +257,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, ...@@ -257,7 +257,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
aPrgrsBar.SetState( nRowCnt ); aPrgrsBar.SetState( nRowCnt );
} }
OSL_ASSERT(aOS.getLength() == 0); SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
aOS.append(pSpecDataType_LF); aOS.append(pSpecDataType_LF);
aOS.append(pKeyEOD); aOS.append(pKeyEOD);
aOS.append('\n'); aOS.append('\n');
......
...@@ -717,7 +717,7 @@ void XclImpAutoFilterData::ReadAutoFilter( ...@@ -717,7 +717,7 @@ void XclImpAutoFilterData::ReadAutoFilter(
} }
else else
{ {
OSL_ASSERT(eConn == SC_OR); SAL_WARN_IF(eConn != SC_OR, "sc.filter", "eConn should be SC_AND or SC_OR");
// Import only when both conditions are for simple equality, else // Import only when both conditions are for simple equality, else
// import only the 1st condition due to conflict with the ordering of // import only the 1st condition due to conflict with the ordering of
// conditions. #i39464#. // conditions. #i39464#.
......
...@@ -262,7 +262,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons ...@@ -262,7 +262,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons
void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, const OUString& sValue) void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, const OUString& sValue)
{ {
OSL_ASSERT(rCell.meType == CELLTYPE_VALUE); assert(rCell.meType == CELLTYPE_VALUE);
SetValueAttributes(rCell.mfValue, sValue); SetValueAttributes(rCell.mfValue, sValue);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true);
...@@ -270,7 +270,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, cons ...@@ -270,7 +270,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, cons
void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell) void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell)
{ {
OSL_ASSERT(rCell.meType == CELLTYPE_STRING); assert(rCell.meType == CELLTYPE_STRING);
rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true);
...@@ -284,7 +284,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell) ...@@ -284,7 +284,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell)
void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell) void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell)
{ {
OSL_ASSERT(rCell.meType == CELLTYPE_EDIT); assert(rCell.meType == CELLTYPE_EDIT);
OUString sString; OUString sString;
if (rCell.mpEditText) if (rCell.mpEditText)
...@@ -307,7 +307,7 @@ void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell) ...@@ -307,7 +307,7 @@ void ScChangeTrackingExportHelper::WriteEditCell(const ScCellValue& rCell)
void ScChangeTrackingExportHelper::WriteFormulaCell(const ScCellValue& rCell, const OUString& sValue) void ScChangeTrackingExportHelper::WriteFormulaCell(const ScCellValue& rCell, const OUString& sValue)
{ {
OSL_ASSERT(rCell.meType == CELLTYPE_FORMULA); assert(rCell.meType == CELLTYPE_FORMULA);
ScFormulaCell* pFormulaCell = rCell.mpFormula; ScFormulaCell* pFormulaCell = rCell.mpFormula;
OUString sAddress; OUString sAddress;
......
...@@ -466,7 +466,7 @@ private: ...@@ -466,7 +466,7 @@ private:
else else
{ {
// Multi-item condition. // Multi-item condition.
OSL_ASSERT(rItems.size() > 1); SAL_WARN_IF(rItems.size() <= 1, "sc.filter", "rItems should have more than 1 element");
// Store the 1st value for backward compatibility. // Store the 1st value for backward compatibility.
const ScQueryEntry::Item& rItem = rItems.front(); const ScQueryEntry::Item& rItem = rItems.front();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment