diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-09-29 07:17:46 -0700 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-09-30 07:25:45 -0700 |
| commit | edc6d3d9e4b83da913aa3656bec3fe62a8a4af83 (patch) | |
| tree | b33eb04bd1c7fc9921e64d8e20375484bc6589d8 | |
| parent | Remove class ScOutlineDocFunc (diff) | |
| download | binfilter-edc6d3d9e4b83da913aa3656bec3fe62a8a4af83.tar.gz binfilter-edc6d3d9e4b83da913aa3656bec3fe62a8a4af83.zip | |
Remove DBG_BF_ASSERT
| -rw-r--r-- | binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 54 |
1 files changed, 20 insertions, 34 deletions
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx index e3ffccdc9..066ff147c 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx @@ -537,23 +537,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; /*?*/ else /*?*/ OSL_FAIL("Calc3/4: kein Storage"); /*N*/ } -/*N*/ else if (aFltName.EqualsAscii(pFilterXML)) -/*?*/ { DBG_BF_ASSERT(0, "STRIP"); } -/*N*/ else if (aFltName.EqualsAscii(pFilterSc10)) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } -/*N*/ else if (aFltName.EqualsAscii(pFilterLotus)) -/*N*/ { -DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } -/*N*/ else if ( aFltName.EqualsAscii(pFilterExcel4) || aFltName.EqualsAscii(pFilterExcel5) || -/*N*/ aFltName.EqualsAscii(pFilterExcel95) || aFltName.EqualsAscii(pFilterExcel97) || -/*N*/ aFltName.EqualsAscii(pFilterEx4Temp) || aFltName.EqualsAscii(pFilterEx5Temp) || -/*N*/ aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) ) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterAscii)) /*N*/ { /*N*/ SfxItemSet* pSet = rMedium.GetItemSet(); @@ -614,17 +597,8 @@ DBG_BF_ASSERT(0, "STRIP"); /*N*/ bSetColWidths = TRUE; /*N*/ bSetSimpleTextColWidths = TRUE; /*N*/ } -/*N*/ else if (aFltName.EqualsAscii(pFilterDBase)) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterDif)) /*N*/ { -/*?*/ SvStream* pStream = rMedium.GetInStream(); -/*?*/ if (pStream) -/*?*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*?*/ } /*?*/ bSetColWidths = TRUE; /*?*/ bSetSimpleTextColWidths = TRUE; /*N*/ } @@ -653,14 +627,26 @@ DBG_BF_ASSERT(0, "STRIP"); /*?*/ bSetColWidths = TRUE; /*?*/ bSetSimpleTextColWidths = TRUE; /*N*/ } -/*N*/ else if (aFltName.EqualsAscii(pFilterRtf)) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } -/*N*/ else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ)) -/*N*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); -/*N*/ } + else if ( + aFltName.EqualsAscii(pFilterExcel4) + || aFltName.EqualsAscii(pFilterExcel5) + || aFltName.EqualsAscii(pFilterExcel95) + || aFltName.EqualsAscii(pFilterExcel97) + || aFltName.EqualsAscii(pFilterEx4Temp) + || aFltName.EqualsAscii(pFilterEx5Temp) + || aFltName.EqualsAscii(pFilterEx95Temp) + || aFltName.EqualsAscii(pFilterEx97Temp) + || aFltName.EqualsAscii(pFilterXML) + || aFltName.EqualsAscii(pFilterSc10) + || aFltName.EqualsAscii(pFilterLotus) + || aFltName.EqualsAscii(pFilterDBase) + || aFltName.EqualsAscii(pFilterRtf) + || aFltName.EqualsAscii(pFilterHtml) + || aFltName.EqualsAscii(pFilterHtmlWebQ) + ) + { + // Ignore these filters; Don't let the else generate an error + } /*N*/ else /*N*/ { /*N*/ if (!GetError()) |