You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2018/05/02 09:50:14 UTC

svn commit: r1830735 [2/2] - in /openoffice/trunk/main: basic/source/basmgr/ basic/source/sbx/ cui/source/dialogs/ editeng/source/items/ editeng/source/misc/ editeng/source/rtf/ filter/source/msfilter/ sc/source/ui/docshell/ svtools/source/svrtf/ sw/so...

Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtw8sty.cxx Wed May  2 09:50:12 2018
@@ -2090,7 +2090,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( W
             break;
 
         default:
-            ASSERT( !this, "was ist das fuer ein SubDocType?" );
+            ASSERT( sal_False, "what is that for a SubDocType?" );
     }
 
     pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));

Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8.cxx Wed May  2 09:50:12 2018
@@ -664,7 +664,7 @@ const SfxPoolItem* MSWordExportBase::Has
         pItem = pChpIter->HasTextItem( nWhich );
     else
     {
-        ASSERT( !this, "Wo ist mein ItemSet / pChpIter ?" );
+        ASSERT( sal_False, "Where is my ItemSet / pChpIter?" );
         pItem = 0;
     }
     return pItem;
@@ -686,7 +686,7 @@ const SfxPoolItem& MSWordExportBase::Get
         pItem = &pChpIter->GetItem( nWhich );
     else
     {
-        ASSERT( !this, "Wo ist mein ItemSet / pChpIter ?" );
+        ASSERT( sal_False, "Where is my ItemSet / pChpIter?" );
         pItem = 0;
     }
     return *pItem;
@@ -936,7 +936,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC
         aFkps.Insert( pF, aFkps.Count() );
         if( !pF->Append( nEndFc, nVarLen, pNewSprms ) )
         {
-            ASSERT( !this, "Sprm liess sich nicht einfuegen" );
+            ASSERT( sal_False, "Sprm could not be inserted" );
         }
     }
     if( pNewSprms != pSprms )   //Merge to new has created a new block
@@ -1079,7 +1079,7 @@ bool WW8_WrFkp::Append( WW8_FC nEndFc, s
 
     if( bCombined )
     {
-        ASSERT( !this, "Fkp::Append: Fkp is already combined" );
+        ASSERT( sal_False, "Fkp::Append: Fkp is already combined" );
         return false;
     }
     sal_Int32 n = ((sal_Int32*)pFkp)[nIMax];        // letzter Eintrag

Modified: openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/wrtww8gr.cxx Wed May  2 09:50:12 2018
@@ -1018,7 +1018,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStre
             }
             break;
         default:
-            ASSERT(!this,
+            ASSERT(sal_False,
            "Some inline export not implemented, remind cmc before we ship :-)");
             break;
     }

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8atr.cxx Wed May  2 09:50:12 2018
@@ -862,7 +862,7 @@ void MSWordExportBase::OutputFormat( con
     case RES_FRMFMT:
         break;
     default:
-        ASSERT( !this, "Which format is exported here?" );
+        ASSERT( sal_False, "Which format is exported here?" );
         break;
     }
 
@@ -1832,7 +1832,7 @@ WW8_WrPlcFld* WW8Export::CurrentFieldPlc
             pFldP = pFldHFTxtBxs;
             break;
         default:
-            ASSERT( !this, "was ist das fuer ein SubDoc-Type?" );
+            ASSERT( sal_False, "What is this SubDoc type?" );
     }
     return pFldP;
 }

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8glsy.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8glsy.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8glsy.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8glsy.cxx Wed May  2 09:50:12 2018
@@ -226,7 +226,7 @@ bool WW8Glossary::Load( SwTextBlocks &rB
                     *pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
                 if( !aIdx.GetNode().IsTxtNode() )
                 {
-                    ASSERT( !this, "wo ist der TextNode?" );
+                    ASSERT( sal_False, "where is the TextNode?" );
                     pD->GetNodes().GoNext( &aIdx );
                 }
                 SwPaM aPamo( aIdx );

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx Wed May  2 09:50:12 2018
@@ -177,7 +177,7 @@ bool SwWW8ImplReader::ReadGrafStart(void
 {
     if (SVBT16ToShort(pHd->cb) < sizeof(WW8_DPHEAD) + nDataSiz)
     {
-        ASSERT( !this, "+Grafik-Element: Size ?" );
+        ASSERT( sal_False, "+Graphic-Element: Size ?" );
         pStrm->SeekRel(SVBT16ToShort(pHd->cb) - sizeof(WW8_DPHEAD));
         return false;
     }
@@ -808,7 +808,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
     WW8PLCFspecial* pT = pPlcxMan ? pPlcxMan->GetTxbx() : 0;
     if( !pT )
     {
-        ASSERT( !this, "+Wo ist der Grafik-Text (1) ?" );
+        ASSERT( sal_False, "+Where is the graphic text (1) ?" );
         return false;
     }
 
@@ -821,7 +821,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
     void* pT0;
     if( !pT->Get( rStartCp, pT0 ) )
     {
-        ASSERT( !this, "+Wo ist der Grafik-Text (2) ?" );
+        ASSERT( sal_False, "+Where is the graphic text (2) ?" );
         return false;
     }
 
@@ -833,7 +833,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
             (*pT)++;
             if( !pT->Get( rStartCp, pT0 ) )
             {
-                ASSERT( !this, "+Wo ist der Grafik-Text (2-a) ?" );
+                ASSERT( sal_False, "+Where is the graphic text (2-a) ?" );
                 return false;
             }
             bReusable = (0 != SVBT16ToShort( ((WW8_TXBXS*)pT0)->fReusable ));
@@ -842,7 +842,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
     (*pT)++;
     if( !pT->Get( rEndCp, pT0 ) )
     {
-        ASSERT( !this, "+Wo ist der Grafik-Text (3) ?" );
+        ASSERT( sal_False, "+Where is the graphic text (3) ?" );
         return false;
     }
 
@@ -863,7 +863,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
             // den ersten Eintrag fuer diese TextBox-Story finden
             if( !pT->SeekPos( rStartCp ) )
             {
-                ASSERT( !this, "+Wo ist der Grafik-Text (4) ?" );
+                ASSERT( sal_False, "+Where is the graphic text (4) ?" );
                 return false;
             }
             // ggfs. entsprechende Anzahl Eintraege weitergehen
@@ -872,7 +872,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
             if(    (!pT->Get( rStartCp, pT0 ))
                 || ( nMinStartCp > rStartCp  ) )
             {
-                ASSERT( !this, "+Wo ist der Grafik-Text (5) ?" );
+                ASSERT( sal_False, "+Where is the graphic text (5) ?" );
                 return false;
             }
             if( rStartCp >= nMaxEndCp )
@@ -883,7 +883,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndC
                 if(    (!pT->Get( rEndCp, pT0 ))
                     || ( nMaxEndCp < rEndCp-1  ) )
                 {
-                    ASSERT( !this, "+Wo ist der Grafik-Text (6) ?" );
+                    ASSERT( sal_False, "+Where is the graphic text (6) ?" );
                     return false;
                 }
                 rEndCp -= 1;
@@ -1373,7 +1373,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrim
     }
     else
     {
-        ASSERT( !this, "+Grafik-Overlap" );
+        ASSERT( sal_False, "+Graphic-Overlap" );
     }
     rLeft = rLeft - SVBT16ToShort( aHd.cb );
     return pRet;
@@ -1386,13 +1386,13 @@ void SwWW8ImplReader::ReadGrafLayer1( WW
     void* pF0;
     if( !pPF->Get( nStartFc, pF0 ) )
     {
-        ASSERT( !this, "+Wo ist die Grafik (2) ?" );
+        ASSERT( sal_False, "+Where is the graphic (2) ?" );
         return;
     }
     WW8_FDOA* pF = (WW8_FDOA*)pF0;
     if( !SVBT32ToUInt32( pF->fc ) )
     {
-        ASSERT( !this, "+Wo ist die Grafik (3) ?" );
+        ASSERT( sal_False, "+Where is the graphic (3) ?" );
         return;
     }
     WW8_DO aDo;
@@ -1651,7 +1651,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIn
         break;
     // erroneously not implemented line style is set
     default:
-        ASSERT(!this, "eLineStyle is not (yet) implemented!");
+        ASSERT(sal_False, "eLineStyle is not (yet) implemented!");
         break;
     }
 
@@ -2526,7 +2526,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
     WW8PLCFspecial* pPF = pPlcxMan->GetFdoa();
     if( !pPF )
     {
-        ASSERT( !this, "Where is the grapic (1) ?" );
+        ASSERT( sal_False, "Where is the graphic (1) ?" );
         return 0;
     }
 
@@ -2547,7 +2547,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
     WW8_FC nStartFc;
     void* pF0;
     if( !pPF->Get( nStartFc, pF0 ) ){
-        ASSERT( !this, "+Wo ist die Grafik (2) ?" );
+        ASSERT( sal_False, "+Where is the graphic (2) ?" );
         return 0;
     }
 
@@ -2562,7 +2562,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
 #endif // defined __WW8_NEEDS_COPY
     if( !pF->nSpId )
     {
-        ASSERT( !this, "+Wo ist die Grafik (3) ?" );
+        ASSERT( sal_False, "+Where is the graphic (3) ?" );
         return 0;
     }
 
@@ -2588,7 +2588,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLaye
 
     if (!bOk)
     {
-        ASSERT( !this, "Where is the Shape ?" );
+        ASSERT( sal_False, "Where is the Shape ?" );
         return 0;
     }
 

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf2.cxx Wed May  2 09:50:12 2018
@@ -373,7 +373,7 @@ void SwWW8ImplReader::ReplaceObj(const S
     }
     else
     {
-        ASSERT( !this, "Impossible!");
+        ASSERT( sal_False, "Impossible!");
     }
 }
 

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Wed May  2 09:50:12 2018
@@ -1318,17 +1318,17 @@ void SwWW8FltControlStack::SetAttrInDoc(
             break;
 
         case RES_TXTATR_FIELD:
-            ASSERT(!this, "What is a field doing in the control stack,"
+            ASSERT(sal_False, "What is a field doing in the control stack,"
                 "probably should have been in the endstack");
             break;
 
         case RES_TXTATR_ANNOTATION:
-            ASSERT(!this, "What is a annotation doing in the control stack,"
+            ASSERT(sal_False, "What is a annotation doing in the control stack,"
                 "probably should have been in the endstack");
             break;
 
         case RES_TXTATR_INPUTFIELD:
-            ASSERT(!this, "What is a input field doing in the control stack,"
+            ASSERT(sal_False, "What is a input field doing in the control stack,"
                 "probably should have been in the endstack");
             break;
 
@@ -1498,7 +1498,7 @@ void SwWW8FltRefStack::SetAttrInDoc(cons
             break;
         default:
         case RES_FLTR_BOOKMARK:
-            ASSERT(!this, "EndStck used with non field, not what we want");
+            ASSERT(sal_False, "EndStck used with non field, not what we want");
             SwFltEndStack::SetAttrInDoc(rTmpPos, pEntry);
             break;
     }
@@ -3814,7 +3814,7 @@ void SwWW8ImplReader::DeleteStk(SwFltCon
     }
     else
     {
-        ASSERT( !this, "WW-Stack bereits geloescht" );
+        ASSERT( sal_False, "WW stack already deleted" );
     }
 }
 
@@ -4824,7 +4824,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams
             break;
         default:
             // Programm-Fehler!
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            ASSERT( sal_False, "It was forgotten to encode nVersion!" );
             nErrRet = ERR_SWG_READ_ERROR;
             break;
     }
@@ -5423,7 +5423,7 @@ sal_uLong SwWW8ImplReader::LoadDoc( SwPa
             break;
         default:
             nErrRet = ERR_WW8_NO_WW8_FILE_ERR;
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            ASSERT( sal_False, "It was forgotten to encode nVersion!" );
             break;
     }
 
@@ -5459,7 +5459,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, c
             nVersion = 6;
         else
         {
-            ASSERT(!this, "WinWord 95 Reader-Read ohne Stream");
+            ASSERT(sal_False, "WinWord 95 Reader-Read without stream");
             nRet = ERR_SWG_READ_ERROR;
         }
     }
@@ -5477,7 +5477,7 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, c
         }
         else
         {
-            ASSERT(!this, "WinWord 95/97 Reader-Read ohne Storage");
+            ASSERT(sal_False, "WinWord 95/97 Reader-Read without storage");
             nRet = ERR_SWG_READ_ERROR;
         }
     }

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx Wed May  2 09:50:12 2018
@@ -1571,7 +1571,7 @@ void WW8TabBandDesc::ProcessSpacing(cons
             case 0:
                 break;
             default:
-                ASSERT(!this, "Impossible");
+                ASSERT(sal_False, "Impossible");
                 break;
         }
     }
@@ -2984,7 +2984,7 @@ bool WW8TabDesc::SetPamInCell(short nWwC
 
     if ((sal_uInt16)nAktRow >= pTabLines->Count())
     {
-        ASSERT(!this, "Actual row bigger than expected." );
+        ASSERT(sal_False, "Actual row bigger than expected." );
         if (bPam)
             MoveOutsideTable();
         return false;

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx Wed May  2 09:50:12 2018
@@ -934,7 +934,7 @@ bool WW8ListManager::ReadLVL(
             break;
          default:
             // undefied value
-            ASSERT( !this, "Value of aLVL.nAlign is not supported" );
+            ASSERT( sal_False, "Value of aLVL.nAlign is not supported" );
             // take default
             eAdj = SVX_ADJUST_LEFT;
             break;
@@ -2318,7 +2318,7 @@ void WW8FormulaControl::FormulaRead(SwWw
                 nChecked = false;
                 break;
             default:
-                ASSERT(!this, "unknown option, please report to cmc");
+                ASSERT(sal_False, "unknown option, please report to cmc");
                 break;
         }
     }

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par5.cxx Wed May  2 09:50:12 2018
@@ -1847,7 +1847,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName
                 aReadParam.SkipToNextToken();
                 break;
             default:
-                ASSERT(!this, "unknown option in FileName field");
+                ASSERT(sal_False, "unknown option in FileName field");
                 break;
         }
     }
@@ -3440,7 +3440,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8
                     }
                     break;
                 default:
-                    ASSERT(!this, "Unhandled toc options!");
+                    ASSERT(sal_False, "Unhandled toc options!");
                     break;
             }
         }
@@ -3448,7 +3448,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8
     case TOX_USER:
         break;
     default:
-        ASSERT(!this, "Unhandled toc options!");
+        ASSERT(sal_False, "Unhandled toc options!");
         break;
     } // ToxBase fertig
 
@@ -3606,7 +3606,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlin
                     break;
                 case 'h':
                 case 'm':
-                    ASSERT( !this, "Auswertung fehlt noch - Daten unbekannt" );
+                    ASSERT( sal_False, "Evaluation is still missing - data unknown" );
                 case 's':   //worthless fake anchor option
                     bOptions = true;
                     break;

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8par6.cxx Wed May  2 09:50:12 2018
@@ -174,7 +174,7 @@ void wwSection::SetDirection()
     switch (maSep.wTextFlow)
     {
         default:
-            ASSERT(!this, "Unknown layout type");
+            ASSERT(sal_False, "Unknown layout type");
         case 0:
             meDir=FRMDIR_HORI_LEFT_TOP;
             break;
@@ -241,7 +241,7 @@ void SwWW8ImplReader::SetDocumentGrid(Sw
             eType = GRID_NONE;
             break;
         default:
-            ASSERT(!this, "Unknown grid type");
+            ASSERT(sal_False, "Unknown grid type");
         case 3:
             eType = GRID_LINES_CHARS;
 			aGrid.SetSnapToChars(sal_True);
@@ -3136,7 +3136,7 @@ void SwWW8ImplReader::SetToggleBiDiAttr(
             }
             break;
         default:
-            ASSERT(!this, "Unhandled unknown bidi toggle attribute");
+            ASSERT(sal_False, "Unhandled unknown bidi toggle attribute");
             break;
 
     }
@@ -3187,7 +3187,7 @@ void SwWW8ImplReader::SetToggleAttr(sal_
                                                 : STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ) );
             break;
         default:
-            ASSERT(!this, "Unhandled unknown toggle attribute");
+            ASSERT(sal_False, "Unhandled unknown toggle attribute");
             break;
     }
 }
@@ -4535,7 +4535,7 @@ void SwWW8ImplReader::Read_BoolItem( sal
             nId = RES_PARATR_SCRIPTSPACE;
             break;
         default:
-            ASSERT( !this, "wrong Id" );
+            ASSERT( sal_False, "wrong Id" );
             return ;
     }
 
@@ -5039,7 +5039,7 @@ void SwWW8ImplReader::Read_AlignFont( sa
                 break;
             default:
                 nVal = SvxParaVertAlignItem::AUTOMATIC;
-                ASSERT(!this,"Unknown paragraph vertical align");
+                ASSERT(sal_False,"Unknown paragraph vertical align");
                 break;
         }
         NewAttr( SvxParaVertAlignItem( nVal, RES_PARATR_VERTALIGN ) );

Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8scan.cxx Wed May  2 09:50:12 2018
@@ -1213,7 +1213,7 @@ WW8PLCFx& WW8PLCFx_PCD::operator ++( int
     if (pPcdI)
         (*pPcdI)++;
     else {
-        ASSERT( !this, "pPcdI fehlt");
+        ASSERT( sal_False, "pPcdI is missing");
     }
     return *this;
 }
@@ -1225,7 +1225,7 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc(
 
     if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
     {
-        ASSERT( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
+        ASSERT( sal_False, "AktPieceStartCp2Fc() with false Cp found (1)" );
         return WW8_FC_MAX;
     }
 
@@ -1263,7 +1263,7 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp(
     void* pData;
     if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
     {
-        ASSERT( !this, "AktPieceStartFc2Cp() - Fehler" );
+        ASSERT( sal_False, "AktPieceStartFc2Cp() - error" );
         return WW8_CP_MAX;
     }
     bool bIsUnicode = false;
@@ -1519,7 +1519,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC
             void* pData;
             if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
             {   // ausserhalb PLCFfpcd ?
-                ASSERT( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
+                ASSERT( sal_False, "PLCFpcd-WW8Fc2Cp() went wrong" );
                 break;
             }
             sal_Int32 nFcStart  = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc );
@@ -1594,7 +1594,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP n
             if( pTestFlag )
                 *pTestFlag = false;
             else {
-                ASSERT( !this, "Falscher CP an WW8Cp2Fc() uebergeben" );
+                ASSERT( sal_False, "Wrong CP passed to WW8Cp2Fc()" );
             }
             return WW8_FC_MAX;
         }
@@ -1605,7 +1605,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP n
             if( pTestFlag )
                 *pTestFlag = false;
             else {
-                ASSERT( !this, "PLCFfpcd-Get ging schief" );
+                ASSERT( sal_False, "PLCFfpcd-Get went wrong" );
             }
             return WW8_FC_MAX;
         }
@@ -1866,7 +1866,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream
 
             break;
         default:
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            ASSERT( sal_False, "It was forgotten to encode nVersion!" );
             break;
     }
 
@@ -2932,7 +2932,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(sa
 //-----------------------------------------
 void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
 {
-    ASSERT( !this, "Falsches GetSprms gerufen" );
+    ASSERT( sal_False, "Wrong GetSprms called" );
     p->nStartPos = p->nEndPos = WW8_CP_MAX;
     p->pMemPos = 0;
     p->nSprmsLen = 0;
@@ -2942,7 +2942,7 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p
 
 long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen )
 {
-    ASSERT( !this, "Falsches GetNoSprms gerufen" );
+    ASSERT( sal_False, "Wrong GetNoSprms called" );
     rStart = rEnd = WW8_CP_MAX;
     rLen = 0;
     return 0;
@@ -3003,7 +3003,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
             break;
         default:
             // Programm-Fehler!
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            ASSERT( sal_False, "It was forgotten to encode nVersion!" );
             return false;
     }
 
@@ -3463,7 +3463,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxD
                         {
                             if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
                             {
-                                ASSERT( !this, "piece iter broken!" );
+                                ASSERT( sal_False, "PieceIter broken!" );
                                 break;
                             }
                             bIsUnicode = false;
@@ -4279,14 +4279,14 @@ long WW8PLCFx_Book::GetLen() const
 {
     if( nIsEnd )
     {
-        ASSERT( !this, "Falscher Aufruf (1) von PLCF_Book::GetLen()" );
+        ASSERT( sal_False, "Wrong call (1) from PLCF_Book::GetLen()" );
         return 0;
     }
     void * p;
     WW8_CP nStartPos;
     if( !pBook[0]->Get( nStartPos, p ) )
     {
-        ASSERT( !this, "Falscher Aufruf (2) von PLCF_Book::GetLen()" );
+        ASSERT( sal_False, "Wrong call (2) from PLCF_Book::GetLen()" );
         return 0;
     }
     sal_uInt16 nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
@@ -4342,7 +4342,7 @@ String WW8PLCFx_Book::GetBookmark(long n
                 nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
             else
             {
-                ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+                ASSERT( sal_False, "Bookmark EndIdx unreadable" );
                 nEndIdx = i;
             }
 
@@ -4399,7 +4399,7 @@ bool WW8PLCFx_Book::MapName(String& rNam
             nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
         else
         {
-            ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+            ASSERT( sal_False, "Bookmark EndIdx unreadable" );
             nEndIdx = i;
         }
         nEndAkt = pBook[1]->GetPos( nEndIdx );
@@ -4854,7 +4854,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx,
         pRes->nSprmId = p->pIdStk->top();       // get end position
     else
     {
-        ASSERT( !this, "No Id on the Stack" );
+        ASSERT( sal_False, "No Id on the Stack" );
         pRes->nSprmId = 0;
     }
 }
@@ -5116,7 +5116,7 @@ bool WW8PLCFMan::Get(WW8PLCFManResult* p
 
     if( nIdx >= nPLCF )
     {
-        ASSERT( !this, "Position not found" );
+        ASSERT( sal_False, "Position not found" );
         return true;
     }
 
@@ -5154,7 +5154,7 @@ sal_uInt16 WW8PLCFMan::GetColl() const
         return  pPap->pPLCFx->GetIstd();
     else
     {
-        ASSERT( !this, "GetColl ohne PLCF_Pap" );
+        ASSERT( sal_False, "GetColl without PLCF_Pap" );
         return 0;
     }
 }
@@ -5399,7 +5399,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8
                 nFibMin = 0;            // Programm-Fehler!
                 nFibMax = 0;
                 nFib    = 1;
-                ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+                ASSERT( sal_False, "It was forgotten to encode nVersion!" );
                 break;
         }
         if ( (nFib < nFibMin) || (nFib > nFibMax) )
@@ -6332,7 +6332,7 @@ WW8_STD* WW8Style::Read1Style( short& rS
                     }
                     break;
                 default:
-                    ASSERT(!this, "Es wurde vergessen, nVersion zu kodieren!");
+                    ASSERT(sal_False, "It was forgotten to encode nVersion!");
                     break;
             }
         }
@@ -6413,7 +6413,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fi
     // always in ANSI, even if eStructCharSet == CHARSET_MAC !!
     if( rFib.lcbSttbfffn <= 2 )
     {
-        ASSERT( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
+        ASSERT( sal_False, "Font table broken! (rFib.lcbSttbfffn < 2)" );
         pFontA = 0;
         nMax = 0;
         return;
@@ -7411,7 +7411,7 @@ sal_uInt16 WW8DopTypography::GetConverte
             nLang = LANGUAGE_CHINESE_TRADITIONAL;
             break;
         default:
-            ASSERT(!this, "Unknown MS Asian Typography language, report");
+            ASSERT(sal_False, "Unknown MS Asian Typography language, report");
             nLang = LANGUAGE_CHINESE;
             break;
         case 0:
@@ -7468,7 +7468,7 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(
                     nL = static_cast< sal_uInt16 >(SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1);
                     break;
                 default:
-                    ASSERT(!this, "Unknown sprm variant");
+                    ASSERT(sal_False, "Unknown sprm variant");
                     break;
             }
             break;

Modified: openoffice/trunk/main/sw/source/filter/xml/xmlfmt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/xml/xmlfmt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/xml/xmlfmt.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/xml/xmlfmt.cxx Wed May  2 09:50:12 2018
@@ -560,7 +560,7 @@ SvXMLImportContext *SwXMLItemSetStyleCon
 		pItemSet = new SfxItemSet( rItemPool, aTableBoxSetRange );
 		break;
 	default:
-		ASSERT( !this,
+		ASSERT( sal_False,
 		"SwXMLItemSetStyleContext_Impl::CreateItemSetContext: unknown family" );
 		break;
 	}

Modified: openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx Wed May  2 09:50:12 2018
@@ -654,7 +654,7 @@ void SwXMLTextParagraphExport::_exportTe
 		}
 		break;
 	default:
-		ASSERT( !this, "unknown object type! Base class should have been called!" );
+		ASSERT( sal_False, "unknown object type! Base class should have been called!" );
 	}
 
 	{

Modified: openoffice/trunk/main/sw/source/ui/app/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docsh.cxx Wed May  2 09:50:12 2018
@@ -1132,7 +1132,7 @@ void SwDocShell::GetState(SfxItemSet& rS
         break;
 
         default:
-            DBG_ASSERT( !this, "Hier darfst Du nicht hinein!" );
+            DBG_ASSERT( sal_False, "You can not go in here!" );
 
         }
         nWhich = aIter.NextWhich();

Modified: openoffice/trunk/main/sw/source/ui/app/docshini.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docshini.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docshini.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docshini.cxx Wed May  2 09:50:12 2018
@@ -626,13 +626,13 @@ sal_Bool  SwDocShell::Load( SfxMedium& r
 				}
 #ifdef DBG_UTIL
 				else
-					ASSERT( !this, "ohne Sw3Reader geht nichts" );
+					ASSERT( sal_False, "nothing works without Sw3Reader" );
 #endif
 			}
 			break;
 
 		default:
-			ASSERT( !this, "Load: new CreateMode?" );
+			ASSERT( sal_False, "Load: new CreateMode?" );
 
 		}
 

Modified: openoffice/trunk/main/sw/source/ui/app/docstyle.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docstyle.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docstyle.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docstyle.cxx Wed May  2 09:50:12 2018
@@ -562,7 +562,7 @@ sal_Bool  SwDocStyleSheet::HasFollowSupp
 		case SFX_STYLE_FAMILY_CHAR :
 		case SFX_STYLE_FAMILY_PSEUDO: return sal_False;
 		default:
-			ASSERT(!this, "unbekannte Style-Familie");
+			ASSERT(sal_False, "unknown style family");
 	}
 	return sal_False;
 }
@@ -936,7 +936,7 @@ sal_Bool  SwDocStyleSheet::SetName( cons
 			break;
 
 		default:
-			ASSERT(!this, "unbekannte Style-Familie");
+			ASSERT(sal_False, "unknown style family");
 	}
 
 	if( bChg )
@@ -982,7 +982,7 @@ sal_Bool   SwDocStyleSheet::SetParent( c
 		case SFX_STYLE_FAMILY_PSEUDO:
 			break;
 		default:
-			ASSERT(!this, "unbekannte Style-Familie");
+			ASSERT(sal_False, "unknown style family");
 	}
 
 	sal_Bool bRet = sal_False;
@@ -1056,7 +1056,7 @@ sal_Bool   SwDocStyleSheet::SetFollow( c
 	case SFX_STYLE_FAMILY_PSEUDO:
 		break;
 	default:
-		ASSERT(!this, "unbekannte Style-Familie");
+		ASSERT(sal_False, "unknown style family");
 	}
 
 	return sal_True;
@@ -1143,7 +1143,7 @@ SfxItemSet&   SwDocStyleSheet::GetItemSe
 			break;
 
 		default:
-			ASSERT(!this, "unbekannte Style-Familie");
+			ASSERT(sal_False, "unknown style family");
 	}
 	// Member der Basisklasse
 	pSet = &aCoreSet;
@@ -1418,7 +1418,7 @@ void SwDocStyleSheet::SetItemSet( const
 			break;
 
 		default:
-			ASSERT(!this, "unbekannte Style-Familie");
+			ASSERT(sal_False, "unknown style family");
 	}
 
 	if( pFmt && rSet.Count())
@@ -2000,7 +2000,7 @@ sal_Bool  SwDocStyleSheet::IsUsed() cons
 			return pNumRule ? rDoc.IsUsed( *pNumRule ) : sal_False;
 
 	default:
-		ASSERT(!this, "unbekannte Style-Familie");
+		ASSERT(sal_False, "unknown style family");
 		return sal_False;
 	}
 	return rDoc.IsUsed( *pMod );
@@ -2077,7 +2077,7 @@ static String sTemplateHelpFile = String
 		break;
 
 	default:
-		ASSERT(!this, "unbekannte Style-Familie");
+		ASSERT(sal_False, "unknown style family");
 		return 0;
 	}
 
@@ -2132,7 +2132,7 @@ void  SwDocStyleSheet::SetHelpId( const
 		break;
 
 	default:
-		ASSERT(!this, "unbekannte Style-Familie");
+		ASSERT(sal_False, "unknown style family");
 		return ;
 	}
 	if( pTmpFmt )
@@ -2191,7 +2191,7 @@ SfxStyleSheetBase&	 SwDocStyleSheetPool:
 
 SfxStyleSheetBase*   SwDocStyleSheetPool::Create( const SfxStyleSheetBase& /*rOrg*/)
 {
-	ASSERT(!this , "Create im SW-Stylesheet-Pool geht nicht" );
+	ASSERT(sal_False, "Create in the SW style sheet pool is not working" );
 	return NULL;
 }
 
@@ -2199,7 +2199,7 @@ SfxStyleSheetBase*   SwDocStyleSheetPool
 SfxStyleSheetBase*	 SwDocStyleSheetPool::Create( const String &,
 												SfxStyleFamily, sal_uInt16 )
 {
-	ASSERT( !this, "Create im SW-Stylesheet-Pool geht nicht" );
+	ASSERT( sal_False, "Create in the SW style sheet pool is not working" );
 	return NULL;
 }
 
@@ -2361,7 +2361,7 @@ void SwDocStyleSheetPool::Remove( SfxSty
 		break;
 
 	default:
-		ASSERT(!this, "unbekannte Style-Familie");
+		ASSERT(sal_False, "unknown style family");
 		bBroadcast = sal_False;
 	}
 
@@ -2397,7 +2397,7 @@ sal_Bool  SwDocStyleSheetPool::SetParent
 		break;
 
 	default:
-		ASSERT(!this, "unbekannte Style-Familie");
+		ASSERT(sal_False, "unknown style family");
 	}
 
 	sal_Bool bRet = sal_False;
@@ -2487,7 +2487,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::
 			break;
 
 		default:
-			ASSERT(!this, "unbekannte Style-Familie");
+			ASSERT(sal_False, "unknown style family");
 		}
 	}
 
@@ -2942,7 +2942,7 @@ void SwStyleSheetIterator::AppendStyleLi
 						bUsed = rDoc.IsPoolPageDescUsed( nId );
 						break;
 				default:
-					ASSERT( !this, "unknown PoolFmt-Id" );
+					ASSERT( sal_False, "unknown PoolFmt-Id" );
 			}
 			if ( bUsed )
 				aLst.Append( cType, *rList[i] );

Modified: openoffice/trunk/main/sw/source/ui/dbui/dbinsdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dbui/dbinsdlg.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dbui/dbinsdlg.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/dbui/dbinsdlg.cxx Wed May  2 09:50:12 2018
@@ -369,7 +369,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAut
 			}
 			if( !aDBColumns.Insert( pNew ))
 			{
-				ASSERT( !this, "Spaltenname mehrfach vergeben?" );
+				ASSERT( sal_False, "Assign column name multiple times?" );
 				delete pNew;
 			}
 		}
@@ -1063,19 +1063,19 @@ void SwInsertDBColAutoPilot::DataToDoc(
 			if( aDBColumns.Seek_Entry( &aSrch, &nFndPos ) )
 				aColFlds.Insert( aDBColumns[ nFndPos ], n );
 			else {
-				ASSERT( !this, "Datenbankspalte nicht mehr gefunden" );
+				ASSERT( sal_False, "Database column not found anymore" );
             }
 		}
 
 		if( nCols != aColFlds.Count() )
 		{
-			ASSERT( !this, "nicht alle Datenbankspalten gefunden" );
+			ASSERT( sal_False, "not all database columns found" );
 			nCols = aColFlds.Count();
 		}
 
 		if(!nRows || !nCols)
 		{
-			ASSERT( !this, "wrong parameters" );
+			ASSERT( sal_False, "wrong parameters" );
 			break;
 		}
 

Modified: openoffice/trunk/main/sw/source/ui/docvw/edtdd.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtdd.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/edtdd.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtdd.cxx Wed May  2 09:50:12 2018
@@ -330,7 +330,7 @@ sal_uInt16 SwEditWin::GetDropDestination
 		case OBJCNT_URLBUTTON:	nDropDestination = EXCHG_DEST_DOC_URLBUTTON; break;
 		case OBJCNT_GROUPOBJ:	nDropDestination = EXCHG_DEST_DOC_GROUPOBJ;		break;
 
-		default: ASSERT( !this, "new ObjectType?" );
+		default: ASSERT( sal_False, "new ObjectType?" );
 		}
 	}
 	if ( !nDropDestination )

Modified: openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx Wed May  2 09:50:12 2018
@@ -4918,7 +4918,7 @@ void SwEditWin::Command( const CommandEv
 
 #ifdef DBG_UTIL
                     default:
-                        ASSERT( !this, "unknown speech command." );
+                        ASSERT( sal_False, "unknown speech command." );
 #endif
                 }
                 if ( nSlotId )
@@ -5218,7 +5218,7 @@ void SwEditWin::Command( const CommandEv
         break;
 #ifdef DBG_UTIL
         default:
-            ASSERT( !this, "unknown command." );
+            ASSERT( sal_False, "unknown command." );
 #endif
     }
     if (bCallBase)

Modified: openoffice/trunk/main/sw/source/ui/fldui/fldmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/fldui/fldmgr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/fldui/fldmgr.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/fldui/fldmgr.cxx Wed May  2 09:50:12 2018
@@ -1417,7 +1417,7 @@ sal_Bool SwFldMgr::InsertFld(
 
     default:
         {
-            ASSERT(!this, "Falscher Feldtyp");
+            ASSERT(sal_False, "Wrong field type");
             return sal_False;
         }
     }

Modified: openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/fmtui/tmpdlg.cxx Wed May  2 09:50:12 2018
@@ -356,7 +356,7 @@ SwTemplateDlg::SwTemplateDlg(Window*			p
 		break;
 
 		default:
-			ASSERT(!this, "Falsche Familie");
+			ASSERT(sal_False, "Wrong family");
 
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/shells/annotsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/annotsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/annotsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/annotsh.cxx Wed May  2 09:50:12 2018
@@ -1442,7 +1442,7 @@ void SwAnnotationShell::ExecTransliterat
 				break;
 
 			default:
-				ASSERT(!this, "falscher Dispatcher");
+				ASSERT(sal_False, "wrong dispatcher");
 		}
 
 		if( nMode )

Modified: openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/drawsh.cxx Wed May  2 09:50:12 2018
@@ -405,7 +405,7 @@ void SwDrawShell::Execute(SfxRequest &rR
         }
 
 		default:
-			DBG_ASSERT(!this, "falscher Dispatcher");
+			DBG_ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 	if (pSdrView->GetModel()->IsChanged())

Modified: openoffice/trunk/main/sw/source/ui/shells/drformsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/drformsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/drformsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/drformsh.cxx Wed May  2 09:50:12 2018
@@ -166,7 +166,7 @@ void SwDrawFormShell::Execute(SfxRequest
 		break;
 
 		default:
-			DBG_ASSERT(!this, "falscher Dispatcher");
+			DBG_ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/shells/drwbassh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/drwbassh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/drwbassh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/drwbassh.cxx Wed May  2 09:50:12 2018
@@ -612,7 +612,7 @@ void SwDrawBaseShell::Execute(SfxRequest
 		}
 
 		default:
-			DBG_ASSERT(!this, "falscher Dispatcher");
+			DBG_ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 	if(!bDone)

Modified: openoffice/trunk/main/sw/source/ui/shells/drwtxtex.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/drwtxtex.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/drwtxtex.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/drwtxtex.cxx Wed May  2 09:50:12 2018
@@ -593,7 +593,7 @@ void SwDrawTextShell::Execute( SfxReques
         }
         return;
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
     if(nEEWhich && pNewAttrs)

Modified: openoffice/trunk/main/sw/source/ui/shells/drwtxtsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/drwtxtsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/drwtxtsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/drwtxtsh.cxx Wed May  2 09:50:12 2018
@@ -447,7 +447,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxR
             break;
 
         default:
-			ASSERT(!this, "unexpected slot-id");
+			ASSERT(sal_False, "unexpected slot-id");
 		}
 	}
 }
@@ -584,7 +584,7 @@ void SwDrawTextShell::ExecDraw(SfxReques
 			break;
 
 		default:
-			ASSERT(!this, "unexpected slot-id");
+			ASSERT(sal_False, "unexpected slot-id");
 			return;
 	}
 
@@ -744,7 +744,7 @@ void SwDrawTextShell::ExecTransliteratio
 			break;
 
 		default:
-			ASSERT(!this, "falscher Dispatcher");
+			ASSERT(sal_False, "wrong dispatcher");
 		}
 
 		if( nMode )

Modified: openoffice/trunk/main/sw/source/ui/shells/frmsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/frmsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/frmsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/frmsh.cxx Wed May  2 09:50:12 2018
@@ -684,7 +684,7 @@ void SwFrameShell::Execute(SfxRequest &r
         break;
         // <--
         default:
-            ASSERT( !this, "falscher Dispatcher" );
+            ASSERT( sal_False, "wrong dispatcher" );
             return;
     }
     if ( bUpdateMgr )

Modified: openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx Wed May  2 09:50:12 2018
@@ -379,7 +379,7 @@ void SwGrfShell::Execute(SfxRequest &rRe
 		break;
 
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }
@@ -522,7 +522,7 @@ void SwGrfShell::ExecAttr( SfxRequest &r
 			break;
 
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 		}
 		if( aGrfSet.Count() )
 			GetShell().SetAttrSet( aGrfSet );

Modified: openoffice/trunk/main/sw/source/ui/shells/listsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/listsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/listsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/listsh.cxx Wed May  2 09:50:12 2018
@@ -238,7 +238,7 @@ void SwListShell::Execute(SfxRequest &rR
 		}
 		break;
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/shells/tabsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/tabsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/tabsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/tabsh.cxx Wed May  2 09:50:12 2018
@@ -555,7 +555,7 @@ void SwTableShell::Execute(SfxRequest &r
 					aBox.SetDistance( Max(rCoreBox.GetDistance(),(sal_uInt16)MIN_BORDER_DIST)  );
 			}
 			else
-				{ASSERT( !this, "Wo ist das Box-Item?" )}
+				{ASSERT( sal_False, "Where is the box item?" )}
 
             //since the drawing layer also supports borders the which id might be a different one
             SvxBoxInfoItem aInfo( SID_ATTR_BORDER_INNER );
@@ -818,7 +818,7 @@ void SwTableShell::Execute(SfxRequest &r
 						aInfoBox.Execute();
 						break;
 					}
-					default: ASSERT( !this, "unbekannter Returnwert MergeTab.");
+					default: ASSERT( sal_False, "unknown return value MergeTab.");
 				}
 		break;
 		case FN_TABLE_ADJUST_CELLS:
@@ -892,7 +892,7 @@ void SwTableShell::Execute(SfxRequest &r
 		break;
 		case FN_NUMBER_BULLETS:
 		case FN_NUM_BULLET_ON:
-			ASSERT( !this, "Funktion darf zur Zeit nicht gerufen werden." );
+			ASSERT( sal_False, "Function may not be called at the moment." );
 		break;
 
 		case FN_TABLE_INSERT_COL:
@@ -1235,7 +1235,7 @@ void SwTableShell::Execute(SfxRequest &r
         break;
 
 		default:
-			ASSERT( !this, "falscher Dispatcher" );
+			ASSERT( sal_False, "wrong dispatcher" );
 			return;
 	}
     if(bCallDone)

Modified: openoffice/trunk/main/sw/source/ui/shells/textidx.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textidx.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textidx.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textidx.cxx Wed May  2 09:50:12 2018
@@ -170,7 +170,7 @@ void SwTextShell::ExecIdx(SfxRequest &rR
 		}
 		break;
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/shells/textsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh.cxx Wed May  2 09:50:12 2018
@@ -765,7 +765,7 @@ void SwTextShell::ExecInsert(SfxRequest
 	break;
 
 	default:
-		ASSERT( !this, "falscher Dispatcher" );
+		ASSERT( sal_False, "wrong dispatcher" );
 		return;
 	}
 }
@@ -1008,7 +1008,7 @@ void  SwTextShell::ExecDelete(SfxRequest
 			rSh.DelLine();
 			break;
 		default:
-			ASSERT(!this, "falscher Dispatcher");
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
     rReq.Done();
@@ -1053,7 +1053,7 @@ void SwTextShell::ExecTransliteration( S
 			break;
 
 		default:
-			ASSERT(!this, "falscher Dispatcher");
+			ASSERT(sal_False, "wrong dispatcher");
 		}
 
 		if( nMode )

Modified: openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx Wed May  2 09:50:12 2018
@@ -1376,7 +1376,7 @@ void SwTextShell::Execute(SfxRequest &rR
     }
     break;
     default:
-		ASSERT(!this, falscher Dispatcher);
+		ASSERT(sal_False, "wrong dispatcher");
 		return;
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx Wed May  2 09:50:12 2018
@@ -243,7 +243,7 @@ void SwTextShell::ExecDB(SfxRequest &rRe
 			break;
 
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/uiview/pview.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/pview.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/pview.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/pview.cxx Wed May  2 09:50:12 2018
@@ -1037,7 +1037,7 @@ MOVEPAGE:
 		}
         break;
         default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 

Modified: openoffice/trunk/main/sw/source/ui/uiview/view2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/view2.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/view2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/view2.cxx Wed May  2 09:50:12 2018
@@ -1170,7 +1170,7 @@ void __EXPORT SwView::Execute(SfxRequest
 
 
         default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
     if(!bIgnore)
@@ -1421,8 +1421,8 @@ void SwView::StateStatusLine(SfxItemSet
 									sStr = pTOX->GetTOXName();
 								else
 								{
-									ASSERT( !this,
-										"was ist das fuer ein Verzeichnis?" );
+									ASSERT( sal_False,
+										"what is this directory?" );
                                     sStr = pCurrSect->GetSectionName();
 								}
 							}
@@ -2102,7 +2102,7 @@ long SwView::InsertMedium( sal_uInt16 nS
         case SID_INSERTDOC:             bInsert = sal_True;     break;
 
         default:
-            ASSERT( !this, "Unbekannte SlotId!" );
+            ASSERT( sal_False, "Unknown SlotId!" );
             bInsert = sal_True;
             nSlotId = SID_INSERTDOC;
             break;

Modified: openoffice/trunk/main/sw/source/ui/uiview/viewcoll.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewcoll.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewcoll.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewcoll.cxx Wed May  2 09:50:12 2018
@@ -51,7 +51,7 @@ void SwView::ExecColl(SfxRequest &rReq)
 	{
 		case FN_SET_PAGE:
 		{
-			DBG_ASSERT(!this, "Not implemented");
+			DBG_ASSERT(sal_False, "Not implemented");
 		}
 		break;
 		case FN_SET_PAGE_STYLE:

Modified: openoffice/trunk/main/sw/source/ui/uiview/viewdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewdlg.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewdlg.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewdlg.cxx Wed May  2 09:50:12 2018
@@ -79,7 +79,7 @@ void SwView::ExecDlg(SfxRequest &rReq)
 		break;
 
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 

Modified: openoffice/trunk/main/sw/source/ui/uiview/viewling.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewling.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewling.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewling.cxx Wed May  2 09:50:12 2018
@@ -229,7 +229,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
 			HyphenateDocument();
 			break;
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }
@@ -338,7 +338,7 @@ void SwView::SpellStart( SvxSpellArea eW
 			}
 			break;
 		default:
-			ASSERT( !this, "SpellStart with unknown Area" );
+			ASSERT( sal_False, "SpellStart with unknown Area" );
 	}
     pWrtShell->SpellStart( eStart, eEnde, eCurr, pConvArgs );
 }
@@ -438,7 +438,7 @@ void SwView::HyphStart( SvxSpellArea eWh
 			pWrtShell->HyphStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND );
 			break;
 		default:
-			ASSERT( !this, "HyphStart with unknown Area" );
+			ASSERT( sal_False, "HyphStart with unknown Area" );
 	}
 }
 

Modified: openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewprt.cxx Wed May  2 09:50:12 2018
@@ -264,7 +264,7 @@ void __EXPORT SwView::ExecutePrint(SfxRe
 			return;
 		}
 		default:
-			ASSERT(!this, falscher Dispatcher);
+			ASSERT(sal_False, "wrong dispatcher");
 			return;
 	}
 }

Modified: openoffice/trunk/main/sw/source/ui/uiview/viewtab.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewtab.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewtab.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewtab.cxx Wed May  2 09:50:12 2018
@@ -1016,7 +1016,7 @@ void SwView::ExecTabWin( SfxRequest& rRe
         break;
 
     default:
-        ASSERT( !this, "Falsche SlotId");
+        ASSERT( sal_False, "Wrong SlotId");
     }
     rSh.EndAllAction();
 
@@ -1982,7 +1982,7 @@ void SwView::StateTabWin(SfxItemSet& rSe
 
                         if( nNum > rCols.Count() )
                         {
-                            ASSERT( !this, "es wird auf dem falschen FmtCol gearbeitet!" );
+                            ASSERT( sal_False, "it is working on the wrong FmtCol!" );
                             nNum = rCols.Count();
                         }
 

Modified: openoffice/trunk/main/xmloff/source/forms/elementimport.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/elementimport.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/forms/elementimport.cxx (original)
+++ openoffice/trunk/main/xmloff/source/forms/elementimport.cxx Wed May  2 09:50:12 2018
@@ -2050,7 +2050,7 @@ namespace xmloff
 	//---------------------------------------------------------------------
 	SvXMLImportContext*	OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName)
 	{
-		OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" );
+		OSL_ENSURE( sal_False, "illegal call to OFormImport::implCreateControlWrapper" );
 		return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName );
 	}
 

Modified: openoffice/trunk/main/xmloff/source/style/xmlbahdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/style/xmlbahdl.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/style/xmlbahdl.cxx (original)
+++ openoffice/trunk/main/xmloff/source/style/xmlbahdl.cxx Wed May  2 09:50:12 2018
@@ -843,13 +843,13 @@ XMLCompareOnlyPropHdl::~XMLCompareOnlyPr
 
 sal_Bool XMLCompareOnlyPropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "importXML called for compare-only-property" );
+	DBG_ASSERT( sal_False, "importXML called for compare-only-property" );
 	return sal_False;
 }
 
 sal_Bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "exportXML called for compare-only-property" );
+	DBG_ASSERT( sal_False, "exportXML called for compare-only-property" );
 	return sal_False;
 }
 

Modified: openoffice/trunk/main/xmloff/source/style/xmlexppr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/style/xmlexppr.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/style/xmlexppr.cxx (original)
+++ openoffice/trunk/main/xmloff/source/style/xmlexppr.cxx Wed May  2 09:50:12 2018
@@ -551,7 +551,7 @@ void FilterPropertiesInfo_Impl::FillProp
 						    catch( UnknownPropertyException& )
 						    {
 							    // might be a problem of getImplemenetationId
-							    OSL_ENSURE( !this, "unknown property in getPropertyValue" );
+							    OSL_ENSURE( sal_False, "unknown property in getPropertyValue" );
 						    }
 
 					    }
@@ -713,7 +713,7 @@ vector< XMLPropertyState > SvXMLExportPr
 		catch( UnknownPropertyException& )
 		{
 			// might be a problem of getImplemenetationId
-			OSL_ENSURE( !this, "unknown property in getPropertyStates" );
+			OSL_ENSURE( sal_False, "unknown property in getPropertyStates" );
 		}
 	}
 

Modified: openoffice/trunk/main/xmloff/source/text/txtparae.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtparae.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/text/txtparae.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtparae.cxx Wed May  2 09:50:12 2018
@@ -3085,14 +3085,14 @@ void XMLTextParagraphExport::_exportText
 
 void XMLTextParagraphExport::_collectTextEmbeddedAutoStyles(const Reference < XPropertySet > & )
 {
-	DBG_ASSERT( !this, "no API implementation avialable" );
+	DBG_ASSERT( sal_False, "no API implementation avialable" );
 }
 
 void XMLTextParagraphExport::_exportTextEmbedded(
 		const Reference < XPropertySet > &,
 		const Reference < XPropertySetInfo > & )
 {
-	DBG_ASSERT( !this, "no API implementation avialable" );
+	DBG_ASSERT( sal_False, "no API implementation avialable" );
 }
 
 void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rPropSet )

Modified: openoffice/trunk/main/xmloff/source/text/txtparai.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtparai.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/text/txtparai.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtparai.cxx Wed May  2 09:50:12 2018
@@ -2290,7 +2290,7 @@ XMLParaContext::~XMLParaContext()
 			// <--
 
 			default:
-				DBG_ASSERT( !this, "What's this" );
+				DBG_ASSERT( sal_False, "What's this" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/text/txtprhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtprhdl.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/text/txtprhdl.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtprhdl.cxx Wed May  2 09:50:12 2018
@@ -303,7 +303,7 @@ sal_Bool XMLDropCapPropHdl_Impl::importX
 	   	Any&,
 		const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "drop caps are an element import property" );
+	DBG_ASSERT( sal_False, "drop caps are an element import property" );
 	return sal_False;
 }
 
@@ -312,7 +312,7 @@ sal_Bool XMLDropCapPropHdl_Impl::exportX
 		const Any&,
 		const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "drop caps are an element export property" );
+	DBG_ASSERT( sal_False, "drop caps are an element export property" );
 	return sal_False;
 }
 
@@ -731,7 +731,7 @@ sal_Bool XMLTextColumnsPropertyHandler::
 	   	Any&,
 		const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "columns are an element import property" );
+	DBG_ASSERT( sal_False, "columns are an element import property" );
 	return sal_False;
 }
 
@@ -740,7 +740,7 @@ sal_Bool XMLTextColumnsPropertyHandler::
 		const Any&,
 		const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "columns are an element export property" );
+	DBG_ASSERT( sal_False, "columns are an element export property" );
 	return sal_False;
 }
 
@@ -784,7 +784,7 @@ sal_Bool XMLHoriMirrorPropHdl_Impl::expo
 		const Any&,
 		const SvXMLUnitConverter& ) const
 {
-	DBG_ASSERT( !this, "HorMirror properyt shouldn't be exported" );
+	DBG_ASSERT( sal_False, "HorMirror property shouldn't be exported" );
 
 	return sal_False;
 }

Modified: openoffice/trunk/main/xmloff/source/transform/ChartOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/ChartOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/ChartOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/ChartOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -123,7 +123,7 @@ void XMLChartOASISTransformerContext::St
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/ChartOOoTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/ChartOOoTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/ChartOOoTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/ChartOOoTContext.cxx Wed May  2 09:50:12 2018
@@ -130,7 +130,7 @@ void XMLChartOOoTransformerContext::Star
 				--nAttrCount;
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/ControlOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/ControlOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/ControlOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/ControlOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -141,7 +141,7 @@ void XMLControlOASISTransformerContext::
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/CreateElemTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/CreateElemTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/CreateElemTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/CreateElemTContext.cxx Wed May  2 09:50:12 2018
@@ -110,7 +110,7 @@ void XMLCreateElemTransformerContext::St
 					}
 					break;
 				default:
-					OSL_ENSURE( !this, "unknown action" );
+					OSL_ENSURE( sal_False, "unknown action" );
 					break;
 				}
 			}

Modified: openoffice/trunk/main/xmloff/source/transform/DlgOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/DlgOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/DlgOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/DlgOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -102,7 +102,7 @@ void XMLDlgOASISTransformerContext::Star
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/EventOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -406,7 +406,7 @@ void XMLEventOASISTransformerContext::St
 			case XML_ATACTION_COPY:
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/EventOOoTContext.cxx Wed May  2 09:50:12 2018
@@ -211,7 +211,7 @@ void XMLEventOOoTransformerContext::Star
 			case XML_ATACTION_COPY:
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/FormPropOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/FormPropOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/FormPropOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/FormPropOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -169,7 +169,7 @@ void XMLFormPropOASISTransformerContext:
 				--nAttrCount;
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/FormPropOOoTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/FormPropOOoTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/FormPropOOoTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/FormPropOOoTContext.cxx Wed May  2 09:50:12 2018
@@ -259,7 +259,7 @@ void XMLFormPropOOoTransformerContext::S
 				--nAttrCount;
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/FrameOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/FrameOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/FrameOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/FrameOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -166,7 +166,7 @@ XMLTransformerContext *XMLFrameOASISTran
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/FrameOOoTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/FrameOOoTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/FrameOOoTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/FrameOOoTContext.cxx Wed May  2 09:50:12 2018
@@ -99,7 +99,7 @@ void XMLFrameOOoTransformerContext::Star
 				--nAttrCount;
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}
@@ -137,7 +137,7 @@ XMLTransformerContext *XMLFrameOOoTransf
 				   		nPrefix, rLocalName, rQName, rAttrList );
 			break;
 		default:
-			OSL_ENSURE( !this, "unknown action" );
+			OSL_ENSURE( sal_False, "unknown action" );
 			break;
 		}
 	}

Modified: openoffice/trunk/main/xmloff/source/transform/MergeElemTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/MergeElemTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/MergeElemTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/MergeElemTContext.cxx Wed May  2 09:50:12 2018
@@ -276,7 +276,7 @@ XMLTransformerContext *XMLMergeElemTrans
                     }
                     break;
 				default:
-					OSL_ENSURE( !this, "unknown action" );
+					OSL_ENSURE( sal_False, "unknown action" );
 					break;
 				}
 			}
@@ -308,7 +308,7 @@ XMLTransformerContext *XMLMergeElemTrans
                     }
                     break;
 				default:
-					OSL_ENSURE( !this, "unknown action" );
+					OSL_ENSURE( sal_False, "unknown action" );
 					break;
 				}
 			}

Modified: openoffice/trunk/main/xmloff/source/transform/OOo2Oasis.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/OOo2Oasis.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/OOo2Oasis.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/OOo2Oasis.cxx Wed May  2 09:50:12 2018
@@ -1406,7 +1406,7 @@ void XMLTabStopOOoTContext_Impl::StartEl
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}
@@ -1486,7 +1486,7 @@ void XMLTrackedChangesOOoTContext_Impl::
 				}
 				else
 				{
-					OSL_ENSURE( !this, "RedineProtectionKey is missing" );
+					OSL_ENSURE( sal_False, "RedineProtectionKey is missing" );
 				}
 			}
 			break;
@@ -1619,7 +1619,7 @@ XMLTransformerContext *OOo2OasisTransfor
     case XML_ETACTION_TABLE:
         return new XMLTableOOoTransformerContext_Impl( *this, rQName );
 	default:
-		OSL_ENSURE( !this, "no user defined context found!" );
+		OSL_ENSURE( sal_False, "no user defined context found!" );
 	}
 
 	// default is copying

Modified: openoffice/trunk/main/xmloff/source/transform/Oasis2OOo.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/Oasis2OOo.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/Oasis2OOo.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/Oasis2OOo.cxx Wed May  2 09:50:12 2018
@@ -1438,7 +1438,7 @@ void XMLTabStopOASISTContext_Impl::Start
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}
@@ -1710,7 +1710,7 @@ XMLTransformerContext *Oasis2OOoTransfor
 	case XML_ETACTION_CHART_PLOT_AREA:
         return new XMLChartPlotAreaOASISTContext( *this, rQName );
 	default:
-		OSL_ENSURE( !this, "no user defined context found!" );
+		OSL_ENSURE( sal_False, "no user defined context found!" );
 		break;
 	}
 

Modified: openoffice/trunk/main/xmloff/source/transform/PersMixedContentTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/PersMixedContentTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/PersMixedContentTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/PersMixedContentTContext.cxx Wed May  2 09:50:12 2018
@@ -78,19 +78,19 @@ XMLTransformerContext *XMLPersTextTConte
 		const OUString&,
 		const Reference< XAttributeList >& )
 {
-	OSL_ENSURE( !this, "illegal call to CreateChildContext" );
+	OSL_ENSURE( sal_False, "illegal call to CreateChildContext" );
 	return 0;
 }
 
 void XMLPersTextTContext_Impl::StartElement( 
 	const Reference< XAttributeList >& )
 {
-	OSL_ENSURE( !this, "illegal call to StartElement" );
+	OSL_ENSURE( sal_False, "illegal call to StartElement" );
 }
 
 void XMLPersTextTContext_Impl::EndElement()
 {
-	OSL_ENSURE( !this, "illegal call to EndElement" );
+	OSL_ENSURE( sal_False, "illegal call to EndElement" );
 }
 
 sal_Bool XMLPersTextTContext_Impl::IsPersistent() const

Modified: openoffice/trunk/main/xmloff/source/transform/StyleOASISTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/StyleOASISTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/StyleOASISTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/StyleOASISTContext.cxx Wed May  2 09:50:12 2018
@@ -567,7 +567,7 @@ void XMLPropertiesTContext_Impl::StartEl
 					}
 					break;
 				default:
-					OSL_ENSURE( !this, "unknown action" );
+					OSL_ENSURE( sal_False, "unknown action" );
 					break;
 				}
 			}
@@ -915,7 +915,7 @@ void XMLStyleOASISTContext::StartElement
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/StyleOOoTContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/StyleOOoTContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/StyleOOoTContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/StyleOOoTContext.cxx Wed May  2 09:50:12 2018
@@ -366,7 +366,7 @@ XMLTypedPropertiesOOoTContext_Impl
 								RTL_TEXTENCODING_ASCII_US );
 		aTmp += ::rtl::OString::valueOf( '>' );
 
-		OSL_ENSURE( !this, aTmp );
+		OSL_ENSURE( sal_False, aTmp );
 	}
 #endif
 
@@ -978,7 +978,7 @@ void XMLPropertiesOOoTContext_Impl::Star
 			}
 			break;
 		default:
-			OSL_ENSURE( !this, "unknown action" );
+			OSL_ENSURE( sal_False, "unknown action" );
 			break;
 		}
 	}
@@ -1113,7 +1113,7 @@ XMLTransformerContext *XMLStyleOOoTConte
 	{
 		if( aPropTypes[m_eFamily][0] == XML_PROP_TYPE_END )
 		{
-			OSL_ENSURE( !this, "unexpected properties element" );
+			OSL_ENSURE( sal_False, "unexpected properties element" );
 			pContext = m_bPersistent
 							? XMLPersElemContentTContext::CreateChildContext(
 									nPrefix, rLocalName, rQName, rAttrList )
@@ -1291,7 +1291,7 @@ void XMLStyleOOoTContext::StartElement(
 				}
 				break;
 			default:
-				OSL_ENSURE( !this, "unknown action" );
+				OSL_ENSURE( sal_False, "unknown action" );
 				break;
 			}
 		}

Modified: openoffice/trunk/main/xmloff/source/transform/TransformerBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/TransformerBase.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/TransformerBase.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/TransformerBase.cxx Wed May  2 09:50:12 2018
@@ -183,7 +183,7 @@ XMLTransformerContext *XMLTransformerBas
 			return new XMLMergeElemTransformerContext( *this, rQName,
 				   	static_cast< sal_uInt16 >( (*aIter).second.m_nParam1 ) );
 		default:
-			OSL_ENSURE( !this, "unknown action" );
+			OSL_ENSURE( sal_False, "unknown action" );
 			break;
 		}
 	}
@@ -896,7 +896,7 @@ XMLMutableAttributeList *XMLTransformerB
 				}
 
 				default:
-					OSL_ENSURE( !this, "unknown action" );
+					OSL_ENSURE( sal_False, "unknown action" );
 					break;
 				}
 

Modified: openoffice/trunk/main/xmloff/source/transform/TransformerContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/transform/TransformerContext.cxx?rev=1830735&r1=1830734&r2=1830735&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/transform/TransformerContext.cxx (original)
+++ openoffice/trunk/main/xmloff/source/transform/TransformerContext.cxx Wed May  2 09:50:12 2018
@@ -100,10 +100,10 @@ sal_Bool XMLTransformerContext::IsPersis
 
 void XMLTransformerContext::Export()
 {
-	OSL_ENSURE( !this, "context is not persistent" );
+	OSL_ENSURE( sal_False, "context is not persistent" );
 }
 
 void XMLTransformerContext::ExportContent()
 {
-	OSL_ENSURE( !this, "context is not persistent" );
+	OSL_ENSURE( sal_False, "context is not persistent" );
 }