Kaydet (Commit) af3030e6 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

OSL_* to SAL_WARN in conditio.cxx

Change-Id: I866217341572a79f653fb9900789a7e523b620a6
üst 332b61dc
...@@ -465,7 +465,7 @@ void ScConditionEntry::CompileXML() ...@@ -465,7 +465,7 @@ void ScConditionEntry::CompileXML()
void ScConditionEntry::SetSrcString( const rtl::OUString& rNew ) void ScConditionEntry::SetSrcString( const rtl::OUString& rNew )
{ {
// aSrcString is only evaluated in CompileXML // aSrcString is only evaluated in CompileXML
OSL_ENSURE( mpDoc->IsImportingXML(), "SetSrcString is only valid for XML import" ); SAL_WARN_IF( !mpDoc->IsImportingXML(), "sc", "SetSrcString is only valid for XML import" );
aSrcString = rNew; aSrcString = rNew;
} }
...@@ -1138,7 +1138,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const ...@@ -1138,7 +1138,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const
bValid = !bValid; bValid = !bValid;
break; break;
default: default:
OSL_FAIL("unbekannte Operation bei ScConditionEntry"); SAL_WARN("sc", "unbekannte Operation bei ScConditionEntry");
break; break;
} }
return bValid; return bValid;
...@@ -1246,7 +1246,7 @@ bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& r ...@@ -1246,7 +1246,7 @@ bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& r
break; break;
// SC_COND_DIRECT schon oben abgefragt // SC_COND_DIRECT schon oben abgefragt
default: default:
OSL_FAIL("unbekannte Operation bei ScConditionEntry"); SAL_WARN("sc", "unbekannte Operation bei ScConditionEntry");
bValid = false; bValid = false;
break; break;
} }
...@@ -1317,7 +1317,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn ...@@ -1317,7 +1317,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn
} }
else else
{ {
OSL_FAIL("GetExpression: falscher Index"); SAL_WARN("sc", "GetExpression: falscher Index");
} }
return aRet; return aRet;
...@@ -1356,7 +1356,7 @@ ScTokenArray* ScConditionEntry::CreateTokenArry( sal_uInt16 nIndex ) const ...@@ -1356,7 +1356,7 @@ ScTokenArray* ScConditionEntry::CreateTokenArry( sal_uInt16 nIndex ) const
} }
else else
{ {
OSL_FAIL("GetExpression: falscher Index"); SAL_WARN("sc", "GetExpression: falscher Index");
} }
return pRet; return pRet;
...@@ -2110,7 +2110,7 @@ ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey ) ...@@ -2110,7 +2110,7 @@ ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey )
if (itr->GetKey() == nKey) if (itr->GetKey() == nKey)
return &(*itr); return &(*itr);
OSL_FAIL("ScConditionalFormatList: Eintrag nicht gefunden"); SAL_WARN("sc", "ScConditionalFormatList: Eintrag nicht gefunden");
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment