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

Revert "Check pointer before deferenging"

these are all exception enabled .o's new doesn't return NULL on failure, it
throws bad_alloc

This reverts commit 6b379300.
üst 6b379300
...@@ -78,17 +78,12 @@ sal_Bool SwServerObject::GetData( uno::Any & rData, ...@@ -78,17 +78,12 @@ sal_Bool SwServerObject::GetData( uno::Any & rData,
case SECTION_SERVER: case SECTION_SERVER:
pPam = new SwPaM( SwPosition( *CNTNT_TYPE.pSectNd ) ); pPam = new SwPaM( SwPosition( *CNTNT_TYPE.pSectNd ) );
if (!pPam)
{
break;
}
pPam->Move( fnMoveForward ); pPam->Move( fnMoveForward );
pPam->SetMark(); pPam->SetMark();
pPam->GetPoint()->nNode = *CNTNT_TYPE.pSectNd->EndOfSectionNode(); pPam->GetPoint()->nNode = *CNTNT_TYPE.pSectNd->EndOfSectionNode();
pPam->Move( fnMoveBackward ); pPam->Move( fnMoveBackward );
break; break;
case NONE_SERVER: case NONE_SERVER: break;
break;
} }
if( pPam ) if( pPam )
......
...@@ -830,12 +830,9 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) ...@@ -830,12 +830,9 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
else else
{ {
pPam = new SwPaM( *pPam ); pPam = new SwPaM( *pPam );
if (pPam) pPam->Move( fnMoveBackward, fnGoDoc );
{ pPam->SetMark();
pPam->Move( fnMoveBackward, fnGoDoc ); pPam->Move( fnMoveForward, fnGoDoc );
pPam->SetMark();
pPam->Move( fnMoveForward, fnGoDoc );
}
} }
} }
// pPam ist immer noch der akt. Cursor !! // pPam ist immer noch der akt. Cursor !!
...@@ -845,19 +842,16 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) ...@@ -845,19 +842,16 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
// keine Shell oder alles schreiben -> eigenen Pam erzeugen // keine Shell oder alles schreiben -> eigenen Pam erzeugen
SwDoc* pOutDoc = pDoc ? pDoc : &rDoc; SwDoc* pOutDoc = pDoc ? pDoc : &rDoc;
pPam = new SwPaM( pOutDoc->GetNodes().GetEndOfContent() ); pPam = new SwPaM( pOutDoc->GetNodes().GetEndOfContent() );
if (pPam) if( pOutDoc->IsClipBoard() )
{ {
if( pOutDoc->IsClipBoard() ) pPam->Move( fnMoveBackward, fnGoDoc );
{ pPam->SetMark();
pPam->Move( fnMoveBackward, fnGoDoc ); pPam->Move( fnMoveForward, fnGoDoc );
pPam->SetMark(); }
pPam->Move( fnMoveForward, fnGoDoc ); else
} {
else pPam->SetMark();
{ pPam->Move( fnMoveBackward, fnGoDoc );
pPam->SetMark();
pPam->Move( fnMoveBackward, fnGoDoc );
}
} }
} }
......
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