mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address b0210c34dc nitpicks, tdf#43157 follow-up

Browse Source 
Change-Id: I3c70225f4d19ea85a54026e8eb78ba729acd6dfd
This commit is contained in:
Eike Rathke
2017-07-18 13:29:12 +02:00
parent 41dc56df37
commit 6959aff406
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sc/source/filter/dif/difexp.cxx
View File

@@ -141,14 +141,14 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ )
{
SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
assert( aOS.isEmpty() && "aOS should be empty");
aOS.append(pSpecDataType_LF);
aOS.append(pKeyBOT);
aOS.append('\n');
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
for( nColCnt = rRange.aStart.Col() ; nColCnt <= nEndCol ; nColCnt++ )
{
SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
assert( aOS.isEmpty() && "aOS should be empty");
bool bWriteStringData = false;
ScRefCellValue aCell(*pDoc, ScAddress(nColCnt, nRowCnt, nTab));
@@ -196,7 +196,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
// sc/source/ui/docsh.cxx:ScDocShell::AsciiSave()
// In fact we should create a common method if this would be
// needed just one more time..
SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
assert( aOS.isEmpty() && "aOS should be empty");
OUString aTmpStr = aString;
aOS.append(pStringData);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet);
@@ -257,7 +257,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
aPrgrsBar.SetState( nRowCnt );
}
SAL_WARN_IF(!aOS.isEmpty(), "sc.filter", "aOS should be empty");
assert( aOS.isEmpty() && "aOS should be empty");
aOS.append(pSpecDataType_LF);
aOS.append(pKeyEOD);
aOS.append('\n');

2
sc/source/filter/excel/excimp8.cxx
View File

@@ -717,7 +717,7 @@ void XclImpAutoFilterData::ReadAutoFilter(
}
else
{
SAL_WARN_IF(eConn != SC_OR, "sc.filter", "eConn should be SC_AND or SC_OR");
assert( eConn == SC_OR && "eConn should be SC_AND or SC_OR");
// Import only when both conditions are for simple equality, else
// import only the 1st condition due to conflict with the ordering of
// conditions. #i39464#.

2
sc/source/filter/xml/XMLExportDatabaseRanges.cxx
View File

@@ -466,7 +466,7 @@ private:
else
{
// Multi-item condition.
SAL_WARN_IF(rItems.size() <= 1, "sc.filter", "rItems should have more than 1 element");
assert( rItems.size() > 1 && "rItems should have more than 1 element");
// Store the 1st value for backward compatibility.
const ScQueryEntry::Item& rItem = rItems.front();