Called C++ object pointer is null DBG_ASSERT->assert

Change-Id: I3094fc1728135fb9e8b229826cd2e30925e89b11

6 files changed, 12 insertions, 13 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 55d6849cbe35..e4f07208a321 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -329,7 +329,7 @@ bool ModulWindow::BasicExecute()
             for ( sal_uInt16 nMacro = 0; nMacro < xModule->GetMethods()->Count(); nMacro++ )
             {
                 SbMethod* pM = static_cast<SbMethod*>(xModule->GetMethods()->Get( nMacro ));
-                DBG_ASSERT( pM, "Method?" );
+                assert(pM && "Method?");
                 pM->GetLineRange( nStart, nEnd );
                 if (  nCurMethodStart >= nStart && nCurMethodStart <= nEnd )
                 {
@@ -532,7 +532,7 @@ bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
                     for ( sal_uInt16 nMethod = 0; nMethod < xModule->GetMethods()->Count(); nMethod++ )
                     {
                         SbMethod* pMethod = static_cast<SbMethod*>(xModule->GetMethods()->Get( nMethod ));
-                        DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
+                        assert(pMethod && "Methode nicht gefunden! (NULL)");
                         pMethod->SetDebugFlags( pMethod->GetDebugFlags() | SbDEBUG_BREAK );
                     }
                 }
@@ -1311,7 +1311,7 @@ void ModulWindow::BasicStarted()
             for ( sal_uInt16 nMethod = 0; nMethod < xModule->GetMethods()->Count(); nMethod++ )
             {
                 SbMethod* pMethod = static_cast<SbMethod*>(xModule->GetMethods()->Get( nMethod ));
-                DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
+                assert(pMethod && "Methode nicht gefunden! (NULL)");
                 pMethod->SetDebugFlags( pMethod->GetDebugFlags() | SbDEBUG_BREAK );
             }
         }
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 5a3b9c52a122..fcc2e37685c3 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -453,7 +453,7 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
         case SID_CHOOSE_CONTROLS:
         {
             const SfxItemSet* pArgs = rReq.GetArgs();
-            DBG_ASSERT( pArgs, "Nix Args" );
+            assert(pArgs && "Nix Args");
 
             const SfxAllEnumItem& rItem = static_cast<const SfxAllEnumItem&>(pArgs->Get( SID_CHOOSE_CONTROLS ));
             switch( rItem.GetValue() )
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index cfe05b3b56dc..acaa37a5c9fd 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -80,7 +80,7 @@ SfxPrinter* Shell::GetPrinter( bool bCreate )
     if ( pCurWin )
     {
         DocShell* pDocShell = static_cast<DocShell*>(GetViewFrame()->GetObjectShell());
-        DBG_ASSERT( pDocShell, "DocShell ?!" );
+        assert(pDocShell && "DocShell ?!");
         return pDocShell->GetPrinter( bCreate );
     }
     return 0;
@@ -89,7 +89,7 @@ SfxPrinter* Shell::GetPrinter( bool bCreate )
 sal_uInt16 Shell::SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags , bool )
 {
     DocShell* pDocShell = static_cast<DocShell*>(GetViewFrame()->GetObjectShell());
-    DBG_ASSERT( pDocShell, "DocShell ?!" );
+    assert(pDocShell && "DocShell ?!");
     pDocShell->SetPrinter( pNewPrinter );
     return 0;
 }
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 04da7715d3a8..539976eb6c5c 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -646,7 +646,7 @@ SvTreeListEntry* TreeListBox::CloneEntry( SvTreeListEntry* pSource )
     SvTreeListEntry* pNew = SvTreeListBox::CloneEntry( pSource );
     Entry* pUser = static_cast<Entry*>(pSource->GetUserData());
 
-    DBG_ASSERT( pUser, "User-Daten?!" );
+    assert(pUser && "User-Daten?!");
     DBG_ASSERT( pUser->GetType() != OBJ_TYPE_DOCUMENT, "TreeListBox::CloneEntry: document?!" );
 
     Entry* pNewUser = new Entry( *pUser );
@@ -661,7 +661,7 @@ SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* pParent, const OUStrin
     while ( pEntry )
     {
         Entry* pBasicEntry = static_cast<Entry*>(pEntry->GetUserData());
-        DBG_ASSERT( pBasicEntry, "FindEntry: no Entry ?!" );
+        assert(pBasicEntry && "FindEntry: no Entry ?!");
         if ( ( pBasicEntry->GetType() == eType  ) && ( rText.equals(GetEntryText( pEntry )) ) )
             return pEntry;
 
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 88178c0b5cf6..94436dac89a4 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -131,8 +131,7 @@ void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry )
 void TreeListBox::ExpandedHdl()
 {
     SvTreeListEntry* pEntry = GetHdlEntry();
-    DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
-
+    assert(pEntry && "Was wurde zugeklappt?");
     if ( !IsExpanded( pEntry ) && pEntry->HasChildrenOnDemand() )
     {
         SvTreeListEntry* pChild = FirstChild( pEntry );
@@ -300,9 +299,9 @@ EntryDescriptor TreeListBox::GetEntryDescriptor( SvTreeListEntry* pEntry )
         for ( size_t n = 0; n < aEntries.size(); n++ )
         {
             SvTreeListEntry* pLE = aEntries[n];
-            DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
+            assert(pLE && "Entrie im Array nicht gefunden");
             Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
-            DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
+            assert(pBE && "Keine Daten im Eintrag gefunden!");
 
             switch ( pBE->GetType() )
             {
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index d95e00dabf18..2e417c12e222 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -310,7 +310,7 @@ void MacroChooser::DeleteMacro()
         }
 
         SbModule* pModule = pMethod->GetModule();
-        DBG_ASSERT( pModule, "DeleteMacro: Kein Modul?!" );
+        assert(pModule && "DeleteMacro: Kein Modul?!");
         OUString aSource( pModule->GetSource32() );
         sal_uInt16 nStart, nEnd;
         pMethod->GetLineRange( nStart, nEnd );