diff options
author | Eike Rathke <erack@redhat.com> | 2012-10-26 15:46:10 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-10-26 15:57:05 +0200 |
commit | 09908f8da622d5443fb75fabeff87df81472b5e8 (patch) | |
tree | 8515db71ed275e93fc5f6a23bd5a488cd33cd34d /svl | |
parent | 2536fae7b8565b5dd9f09bb3dc015576fafe4031 (diff) |
consistently use SAL_WARN svl.numbers
Change-Id: I16c555e87f8df19a74c8d34f21bce4570c1d756f
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/numbers/zforfind.cxx | 12 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 18 | ||||
-rw-r--r-- | svl/source/numbers/zformat.cxx | 12 |
3 files changed, 21 insertions, 21 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index b2f8d2b0d51e..da2a66f90311 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -886,7 +886,7 @@ bool ImpSvNumberInputScan::GetTimeRef( { nHour = 0; bRet = false; - SAL_WARN( "svl", "ImpSvNumberInputScan::GetTimeRef: bad number index"); + SAL_WARN( "svl.numbers", "ImpSvNumberInputScan::GetTimeRef: bad number index"); } if (nDecPos == 2 && nAnz == 2) // 45.5 nMinute = 0; @@ -1082,7 +1082,7 @@ bool ImpSvNumberInputScan::IsAcceptedDatePattern( sal_uInt16 nStartPatternAt ) else if (!sDateAcceptancePatterns.getLength()) { sDateAcceptancePatterns = pFormatter->GetLocaleData()->getDateAcceptancePatterns(); - SAL_WARN_IF( !sDateAcceptancePatterns.getLength(), "svl", "ImpSvNumberInputScan::IsAcceptedDatePattern: no date acceptance patterns"); + SAL_WARN_IF( !sDateAcceptancePatterns.getLength(), "svl.numbers", "ImpSvNumberInputScan::IsAcceptedDatePattern: no date acceptance patterns"); nAcceptedDatePattern = (sDateAcceptancePatterns.getLength() ? -2 : -1); } @@ -1300,7 +1300,7 @@ DateFormat ImpSvNumberInputScan::GetDateOrder() break; } } - SAL_WARN( "svl", "ImpSvNumberInputScan::GetDateOrder: undefined, falling back to locale's default"); + SAL_WARN( "svl.numbers", "ImpSvNumberInputScan::GetDateOrder: undefined, falling back to locale's default"); return pFormatter->GetLocaleData()->getDateFormat(); } @@ -1379,7 +1379,7 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter, } break; default: - OSL_FAIL( "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" ); + SAL_WARN( "svl.numbers", "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" ); DateFmt = YMD; bFormatTurn = false; } @@ -1550,7 +1550,7 @@ input for the following reasons: default: bHadExact = false; } - SAL_WARN_IF( !bHadExact, "svl", "ImpSvNumberInputScan::GetDateRef: error in exact date order"); + SAL_WARN_IF( !bHadExact, "svl.numbers", "ImpSvNumberInputScan::GetDateRef: error in exact date order"); } else bHadExact = false; @@ -3230,7 +3230,7 @@ bool ImpSvNumberInputScan::IsNumberFormat( break; default: - SAL_WARN( "svl", "Some number recognized but what's it?" ); + SAL_WARN( "svl.numbers", "Some number recognized but what's it?" ); fOutNumber = 0.0; break; } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index db12eda74e33..72367669c349 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -511,7 +511,7 @@ bool SvNumberFormatter::PutEntry(String& rString, sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey(); if (nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET) { - OSL_FAIL("SvNumberFormatter:: Zu viele Formate pro CL"); + SAL_WARN( "svl.numbers", "SvNumberFormatter:: Zu viele Formate pro CL"); delete p_Entry; } else if (!aFTable.insert(make_pair( nPos+1,p_Entry)).second) @@ -829,7 +829,7 @@ String SvNumberFormatter::GetKeyword( LanguageType eLnge, sal_uInt16 nIndex ) if ( nIndex < NF_KEYWORD_ENTRIES_COUNT ) return rTable[nIndex]; - OSL_FAIL("GetKeyword: invalid index"); + SAL_WARN( "svl.numbers", "GetKeyword: invalid index"); return String(); } @@ -2928,7 +2928,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter nNewKey = nPos+1; if (nPos - nCLOffset >= SV_COUNTRY_LANGUAGE_OFFSET) { - OSL_FAIL( + SAL_WARN( "svl.numbers", "SvNumberFormatter:: Zu viele Formate pro CL"); delete pNewEntry; } @@ -3880,7 +3880,7 @@ void NfCurrencyEntry::CompletePositiveFormatString(OUStringBuffer& rStr, } break; default: - OSL_FAIL("NfCurrencyEntry::CompletePositiveFormatString: unknown option"); + SAL_WARN( "svl.numbers", "NfCurrencyEntry::CompletePositiveFormatString: unknown option"); break; } } @@ -4002,7 +4002,7 @@ void NfCurrencyEntry::CompleteNegativeFormatString(OUStringBuffer& rStr, } break; default: - OSL_FAIL("NfCurrencyEntry::CompleteNegativeFormatString: unknown option"); + SAL_WARN( "svl.numbers", "NfCurrencyEntry::CompleteNegativeFormatString: unknown option"); break; } } @@ -4031,7 +4031,7 @@ sal_uInt16 NfCurrencyEntry::GetEffectivePositiveFormat( case 3: // 1 $ break; default: - OSL_FAIL("NfCurrencyEntry::GetEffectivePositiveFormat: unknown option"); + SAL_WARN( "svl.numbers", "NfCurrencyEntry::GetEffectivePositiveFormat: unknown option"); break; } return nIntlFormat; @@ -4072,7 +4072,7 @@ static sal_uInt16 lcl_MergeNegativeParenthesisFormat( sal_uInt16 nIntlFormat, sa nSign = 2; break; default: - OSL_FAIL("lcl_MergeNegativeParenthesisFormat: unknown option"); + SAL_WARN( "svl.numbers", "lcl_MergeNegativeParenthesisFormat: unknown option"); break; } @@ -4185,7 +4185,7 @@ sal_uInt16 NfCurrencyEntry::GetEffectiveNegativeFormat( sal_uInt16 nIntlFormat, nIntlFormat = 8; // -1 $ break; default: - OSL_FAIL("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); + SAL_WARN( "svl.numbers", "NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); break; } #endif @@ -4247,7 +4247,7 @@ sal_uInt16 NfCurrencyEntry::GetEffectiveNegativeFormat( sal_uInt16 nIntlFormat, nIntlFormat, nCurrFormat ); break; default: - OSL_FAIL("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); + SAL_WARN( "svl.numbers", "NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); break; } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index d479aeff1133..b57db8aa994f 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -2377,7 +2377,7 @@ bool SvNumberformat::GetOutputString(double fNumber, } if (rInfo.nCntExp == 0) { - OSL_FAIL("SvNumberformat:: Bruch, nCntExp == 0"); + SAL_WARN( "svl.numbers", "SvNumberformat:: Bruch, nCntExp == 0"); return false; } sal_uLong nBasis = ((sal_uLong)floor( // 9, 99, 999 ,... @@ -3025,7 +3025,7 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r ; // nothing } } - OSL_FAIL( "ImpUseMonthCase: unhandled keyword index eCodeType"); + SAL_WARN( "svl.numbers", "ImpUseMonthCase: unhandled keyword index eCodeType"); return CalendarDisplayCode::LONG_MONTH_NAME; } @@ -3241,7 +3241,7 @@ bool SvNumberformat::ImpIsIso8601( const ImpSvNumFor& rNumFor ) } else { - OSL_FAIL( "SvNumberformat::ImpIsIso8601: no date" ); + SAL_WARN( "svl.numbers", "SvNumberformat::ImpIsIso8601: no date" ); } return bIsIso; } @@ -4443,7 +4443,7 @@ DateFormat SvNumberformat::GetDateOrder() const } else { - OSL_FAIL( "SvNumberformat::GetDateOrder: no date" ); + SAL_WARN( "svl.numbers", "SvNumberformat::GetDateOrder: no date" ); } return rLoc().getDateFormat(); } @@ -4453,7 +4453,7 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const sal_uInt32 nRet = 0; if ( (eType & NUMBERFORMAT_DATE) != NUMBERFORMAT_DATE ) { - OSL_FAIL( "SvNumberformat::GetExactDateOrder: no date" ); + SAL_WARN( "svl.numbers", "SvNumberformat::GetExactDateOrder: no date" ); return nRet; } short const * const pType = NumFor[0].Info().nTypeArray; @@ -4533,7 +4533,7 @@ static void lcl_SvNumberformat_AddLimitStringImpl( String& rStr, rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[>=" ) ); break; default: - OSL_FAIL( "unsupported number format" ); + SAL_WARN( "svl.numbers", "unsupported number format" ); break; } rStr += String( ::rtl::math::doubleToUString( fLimit, |