[Libreoffice-commits] core.git: sc/source
Eike Rathke
erack at redhat.com
Fri Feb 2 19:25:06 UTC 2018
sc/source/filter/lotus/lotattr.cxx | 2 +-
sc/source/filter/lotus/lotform.cxx | 22 +++++++++++-----------
sc/source/filter/lotus/lotimpop.cxx | 10 +++++-----
sc/source/filter/lotus/lotread.cxx | 8 ++++----
sc/source/filter/lotus/tool.cxx | 4 ++--
5 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 196f8f85fc20491a9d3fa0d4431ed5ec21b318a8
Author: Eike Rathke <erack at redhat.com>
Date: Fri Feb 2 20:20:29 2018 +0100
Make SAL_WARN domain "sc.filter" in sc/source/filter/lotus/
Change-Id: I6fd767bd2694369db836bb1943c7135c10fa6aa6
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 82d197b67187..66f0d75997eb 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -188,7 +188,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
{
// Actually with the current implementation of MAXROWCOUNT>=64k and nRow
// being read as sal_uInt16 there's no chance that nRow would be invalid..
- SAL_WARN_IF( !ValidRow(nRow), "sc", "*LotAttrCol::SetAttr(): ... and failed?!" );
+ SAL_WARN_IF( !ValidRow(nRow), "sc.filter", "*LotAttrCol::SetAttr(): ... and failed?!" );
std::vector<std::unique_ptr<ENTRY> >::reverse_iterator iterLast = aEntries.rbegin();
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 3ab1e020d1af..a80cc13c4693 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -43,7 +43,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
bool bAddIn = false;
- SAL_WARN_IF( nCnt > 128, "sc", "-LotusToSc::DoFunc(): Too many (128)!" );
+ SAL_WARN_IF( nCnt > 128, "sc.filter", "-LotusToSc::DoFunc(): Too many (128)!" );
if( eOc == ocNoName )
{
@@ -88,7 +88,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
switch( eOc )
{
case ocIndex:
- SAL_WARN_IF( nCnt < 2, "sc", "+LotusToSc::DoFunc(): ocIndex needs at least 2 parameters!" );
+ SAL_WARN_IF( nCnt < 2, "sc.filter", "+LotusToSc::DoFunc(): ocIndex needs at least 2 parameters!" );
nMerk0 = eParam[ 0 ];
eParam[ 0 ] = eParam[ 1 ];
eParam[ 1 ] = nMerk0;
@@ -97,7 +97,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
break;
case ocIRR:
{
- SAL_WARN_IF( nCnt != 2, "sc", "+LotusToSc::DoFunc(): ocIRR needs 2 parameters!" );
+ SAL_WARN_IF( nCnt != 2, "sc.filter", "+LotusToSc::DoFunc(): ocIRR needs 2 parameters!" );
nMerk0 = eParam[ 0 ];
eParam[ 0 ] = eParam[ 1 ];
eParam[ 1 ] = nMerk0;
@@ -132,7 +132,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
case ocRate:
{
// new quantity = 4!
- SAL_WARN_IF( nCnt != 3, "sc",
+ SAL_WARN_IF( nCnt != 3, "sc.filter",
"*LotusToSc::DoFunc(): ZINS() needs 3 parameters!" );
nCnt = 4;
eParam[ 3 ] = eParam[ 0 ]; // 3. -> 1.
@@ -143,7 +143,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
break;
case ocNper:
{
- SAL_WARN_IF( nCnt != 3, "sc",
+ SAL_WARN_IF( nCnt != 3, "sc.filter",
"*LotusToSc::DoFunc(): TERM() or CTERM() need 3 parameters!" );
nCnt = 4;
if ( OString(pExtString) == "TERM" )
@@ -195,7 +195,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nCnt, const sal_Char* pExtStri
if( eOc == ocPMT )
{ // special case ocPMT, negate last parameter!
// additionally: 1. -> 3., 3. -> 2., 2. -> 1.
- SAL_WARN_IF( nCnt != 3, "sc", "+LotusToSc::DoFunc(): ocPMT needs 3 parameters!" );
+ SAL_WARN_IF( nCnt != 3, "sc.filter", "+LotusToSc::DoFunc(): ocPMT needs 3 parameters!" );
// There should be at least 3 arguments, but with binary crap may not..
switch (nCnt)
{
@@ -287,7 +287,7 @@ void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefDa
nRow &= 0x1FFF;
break;
default:
- SAL_WARN( "sc", "*LotusToSc::LotusRelToScRel(): unhandeled case?" );
+ SAL_WARN( "sc.filter", "*LotusToSc::LotusRelToScRel(): unhandeled case?" );
}
}
else
@@ -307,7 +307,7 @@ void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefDa
nRow &= 0x3FFF;
break;
default:
- SAL_WARN( "sc", "*LotusToSc::LotusRelToScRel(): unhandeled case?" );
+ SAL_WARN( "sc.filter", "*LotusToSc::LotusRelToScRel(): unhandeled case?" );
}
}
@@ -654,14 +654,14 @@ void LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest )
}
break;
default:
- SAL_WARN( "sc", "*LotusToSc::Convert(): unknown enum!" );
+ SAL_WARN( "sc.filter", "*LotusToSc::Convert(): unknown enum!" );
}
}
rpErg = aPool[ aStack.Get() ];
- SAL_WARN_IF( nBytesLeft < 0, "sc", "*LotusToSc::Convert(): processed too much!");
- SAL_WARN_IF( nBytesLeft > 0, "sc", "*LotusToSc::Convert(): what happens with the rest?" );
+ SAL_WARN_IF( nBytesLeft < 0, "sc.filter", "*LotusToSc::Convert(): processed too much!");
+ SAL_WARN_IF( nBytesLeft > 0, "sc.filter", "*LotusToSc::Convert(): what happens with the rest?" );
if( rRest )
aIn.SeekRel( nBytesLeft ); // Correct any remainder/overflow
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 51367b9d08e5..99cc7a9dd3be 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -121,7 +121,7 @@ bool ImportLotus::BofFm3()
void ImportLotus::Columnwidth( sal_uInt16 nRecLen )
{
- SAL_WARN_IF( nRecLen < 4, "sc", "*ImportLotus::Columnwidth(): Record too short!" );
+ SAL_WARN_IF( nRecLen < 4, "sc.filter", "*ImportLotus::Columnwidth(): Record too short!" );
sal_uInt8 nLTab, nWindow2;
sal_uInt16 nCnt = (nRecLen < 4) ? 0 : ( nRecLen - 4 ) / 2;
@@ -152,7 +152,7 @@ void ImportLotus::Columnwidth( sal_uInt16 nRecLen )
void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen )
{
- SAL_WARN_IF( nRecLen < 4, "sc", "*ImportLotus::Hiddencolumn(): Record too short!" );
+ SAL_WARN_IF( nRecLen < 4, "sc.filter", "*ImportLotus::Hiddencolumn(): Record too short!" );
sal_uInt8 nLTab, nWindow2;
sal_uInt16 nCnt = (nRecLen < 4) ? 0 : ( nRecLen - 4 ) / 2;
@@ -260,7 +260,7 @@ void ImportLotus::Smallnumcell()
void ImportLotus::Formulacell( sal_uInt16 n )
{
- SAL_WARN_IF( !pIn, "sc", "-ImportLotus::Formulacell(): Null-Stream!" );
+ SAL_WARN_IF( !pIn, "sc.filter", "-ImportLotus::Formulacell(): Null-Stream!" );
ScAddress aAddr;
@@ -291,7 +291,7 @@ void ImportLotus::Read( OUString &r )
void ImportLotus::RowPresentation( sal_uInt16 nRecLen )
{
- SAL_WARN_IF( nRecLen < 5, "sc", "*ImportLotus::RowPresentation(): Record too short!" );
+ SAL_WARN_IF( nRecLen < 5, "sc.filter", "*ImportLotus::RowPresentation(): Record too short!" );
sal_uInt8 nLTab, nFlags;
sal_uInt16 nRow, nHeight;
@@ -378,7 +378,7 @@ void ImportLotus::Font_Ysize()
void ImportLotus::Row_( const sal_uInt16 nRecLen )
{
- SAL_WARN_IF( nExtTab < 0, "sc", "*ImportLotus::Row_(): not possible!" );
+ SAL_WARN_IF( nExtTab < 0, "sc.filter", "*ImportLotus::Row_(): not possible!" );
sal_uInt16 nCntDwn = (nRecLen < 4) ? 0 : ( nRecLen - 4 ) / 5;
SCCOL nColCnt = 0;
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index e218b5536aa3..165071c03931 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -190,7 +190,7 @@ ErrCode ImportLotus::Read()
break;
}
- SAL_WARN_IF( nNextRec < pIn->Tell(), "sc",
+ SAL_WARN_IF( nNextRec < pIn->Tell(), "sc.filter",
"*ImportLotus::Read(): Read too much..." );
pIn->Seek( nNextRec );
@@ -211,7 +211,7 @@ ErrCode ImportLotus::Read()
}
for( nCnt = 1 ; nCnt < nTabs ; nCnt++ )
{
- SAL_WARN_IF( !pD->HasTable( nCnt ), "sc",
+ SAL_WARN_IF( !pD->HasTable( nCnt ), "sc.filter",
"-ImportLotus::Read(): Where is my table?!" );
pD->GetName( nCnt, aTabName );
if( aTabName == "temp" )
@@ -268,7 +268,7 @@ ErrCode ImportLotus::Read(SvStream& rIn)
case 0x0001: // EOF
bRead = false;
- SAL_WARN_IF( nTab != 0, "sc",
+ SAL_WARN_IF( nTab != 0, "sc.filter",
"-ImportLotus::Read( SvStream& ): EOF twice!" );
nTab++;
break;
@@ -295,7 +295,7 @@ ErrCode ImportLotus::Read(SvStream& rIn)
break;
}
- SAL_WARN_IF( nNextRec < pIn->Tell(), "sc",
+ SAL_WARN_IF( nNextRec < pIn->Tell(), "sc.filter",
"*ImportLotus::Read(): Read too much..." );
pIn->Seek( nNextRec );
aPrgrsBar.Progress();
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 28aa9030d44e..7b2866918667 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -40,7 +40,7 @@
void PutFormString(LotusContext& rContext, SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString)
{
// evaluate Label-Format
- SAL_WARN_IF( pString == nullptr, "sc", "PutFormString(): pString == NULL" );
+ SAL_WARN_IF( pString == nullptr, "sc.filter", "PutFormString(): pString == NULL" );
if (!pString)
return;
@@ -408,7 +408,7 @@ LR_ID LotusRangeList::GetIndex( const LotusRange &rRef )
void LotusRangeList::Append( LotusRange* pLR, const OUString& rName )
{
- SAL_WARN_IF( !pLR, "sc", "*LotusRangeList::Append(): no pointer!" );
+ SAL_WARN_IF( !pLR, "sc.filter", "*LotusRangeList::Append(): no pointer!" );
maRanges.push_back(pLR);
ScTokenArray aTokArray;
More information about the Libreoffice-commits
mailing list