Don't use !this as an alias for a constant that evaluates to false in

unconditional asserts.  The former requires code to evaluate the
condition at runtime and also causes warnings from clang.

While here, translate the associated assert messages.

4 files changed, 11 insertions, 11 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index dd5d60315712..9a15b93d0832 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -975,7 +975,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
     // Plausi!
     if( nLibs & 0xF000 )
     {
-        DBG_ASSERT( !this, "BasicManager-Stream defect!" );
+        DBG_ASSERT( sal_False, "BasicManager-Stream defect!" );
         return;
     }
     for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index ce30eed40df3..3fdde8dc4a47 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -244,7 +244,7 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
             case SbxCLASS_METHOD:   pArray = pMethods;  break;
             case SbxCLASS_OBJECT:   pArray = pObjs;     break;
             default:
-                DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+                DBG_ASSERT( sal_False, "Invalid SBX class" );
         }
         if( pArray )
             pRes = pArray->Find( rName, t );
@@ -352,7 +352,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
         case SbxCLASS_METHOD:   pArray = pMethods;  break;
         case SbxCLASS_OBJECT:   pArray = pObjs;     break;
         default:
-            DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+            DBG_ASSERT( sal_False, "Invalid SBX class" );
     }
     if( pArray )
     {
@@ -387,7 +387,7 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
         case SbxCLASS_METHOD:   pArray = pMethods;  break;
         case SbxCLASS_OBJECT:   pArray = pObjs;     break;
         default:
-            DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+            DBG_ASSERT( sal_False, "Invalid SBX class" );
     }
     if( !pArray )
         return NULL;
@@ -555,7 +555,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
             case SbxCLASS_METHOD:   pArray = pMethods;  break;
             case SbxCLASS_OBJECT:   pArray = pObjs;     break;
             default:
-                DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+                DBG_ASSERT( sal_False, "Invalid SBX class" );
         }
     }
     if( pArray )
@@ -594,7 +594,7 @@ void SbxObject::VCPtrInsert( SbxVariable* pVar )
             case SbxCLASS_METHOD:   pArray = pMethods;  break;
             case SbxCLASS_OBJECT:   pArray = pObjs;     break;
             default:
-                DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+                DBG_ASSERT( sal_False, "Invalid SBX class" );
         }
     }
     if( pArray )
@@ -671,7 +671,7 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
         case SbxCLASS_METHOD:   pArray = pMethods;  break;
         case SbxCLASS_OBJECT:   pArray = pObjs;     break;
         default:
-            DBG_ASSERT( !this, "Ungueltige SBX-Klasse" );
+            DBG_ASSERT( sal_False, "Invalid SBX class" );
     }
     if( pArray )
     {
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 664842d024d2..1977ba9afa34 100755
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -251,7 +251,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
                 aData.pDecimal->addRef();
             break;
         default:
-            DBG_ASSERT( !this, "Angabe eines Pointers unzulaessig" );
+            DBG_ASSERT( sal_False, "Indication of an invalid pointer" );
             n = SbxNULL;
     }
     else
@@ -1751,7 +1751,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
             memset (&aData,0,sizeof(aData));
             ResetFlag(SBX_FIXED);
             aData.eType = SbxNULL;
-            DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
+            DBG_ASSERT( sal_False, "Unsupported data type loaded" );
             return sal_False;
     }
     return sal_True;
@@ -1852,7 +1852,7 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const
         case SbxWCHAR:
             break;
         default:
-            DBG_ASSERT( !this, "Speichern eines nicht unterstuetzten Datentyps" );
+            DBG_ASSERT( sal_False, "Save an unsupported data type" );
             return sal_False;
     }
     return sal_True;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index c512d1e3def4..8c04d456c7e6 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -502,7 +502,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
                 break;
             default:
                 aData.eType = SbxNULL;
-                DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
+                DBG_ASSERT( sal_False, "Unsupported data type loaded" );
                 return sal_False;
         }
         // Wert putten