[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/filter/dif/difexp.cxx                  |    8 ++++----
 sc/source/filter/excel/excimp8.cxx               |    2 +-
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6959aff40692cc02c99efb6781091263f8a25a84
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jul 18 13:29:12 2017 +0200

    Address b0210c34dcaa5fc44956078ffa1dfe734d379224 nitpicks, tdf#43157 follow-up
    
    Change-Id: I3c70225f4d19ea85a54026e8eb78ba729acd6dfd

diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 27bda9ea9fda..2a4117a42d45 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -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');
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 69d450a747e8..f18b81aaffdd 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -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#.
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 2a6e94905e71..9321cdb3b231 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -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();