Kaydet (Commit) a6535c89 authored tarafından Caolán McNamara's avatar Caolán McNamara

cppcheck: Redundant null pointer check

üst 7972fcd4
...@@ -738,39 +738,36 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) ...@@ -738,39 +738,36 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
pHatchList->SetName( aURL.getName() ); pHatchList->SetName( aURL.getName() );
if( pHatchList->Load() ) if( pHatchList->Load() )
{ {
if( pHatchList ) // Pruefen, ob Tabelle geloescht werden darf:
if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() )
delete pHatchingList;
pHatchingList = pHatchList;
( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList );
aLbHatchings.Clear();
aLbHatchings.Fill( pHatchingList );
Reset( rOutAttrs );
pHatchingList->SetName( aURL.getName() );
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
{ {
// Pruefen, ob Tabelle geloescht werden darf: aString += String(aURL.getBase()).Copy( 0, 15 );
if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() ) aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
delete pHatchingList;
pHatchingList = pHatchList;
( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList );
aLbHatchings.Clear();
aLbHatchings.Fill( pHatchingList );
Reset( rOutAttrs );
pHatchingList->SetName( aURL.getName() );
// Ermitteln (evtl. abschneiden) des Namens und in
// der GroupBox darstellen
String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
if ( aURL.getBase().getLength() > 18 )
{
aString += String(aURL.getBase()).Copy( 0, 15 );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
}
else
aString += String(aURL.getBase());
// Flag fuer gewechselt setzen
*pnHatchingListState |= CT_CHANGED;
// Flag fuer modifiziert entfernen
*pnHatchingListState &= ~CT_MODIFIED;
} }
else
aString += String(aURL.getBase());
// Flag fuer gewechselt setzen
*pnHatchingListState |= CT_CHANGED;
// Flag fuer modifiziert entfernen
*pnHatchingListState &= ~CT_MODIFIED;
} }
else else
ErrorBox( DLGWIN, WinBits( WB_OK ), ErrorBox( DLGWIN, WinBits( WB_OK ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment