diff options
| author | jp <jp@openoffice.org> | 2000-11-30 10:47:50 +0000 |
|---|---|---|
| committer | jp <jp@openoffice.org> | 2000-11-30 10:47:50 +0000 |
| commit | 262b28a61db006dd0727e82d97cb23638f9bc56b (patch) | |
| tree | 90db4f991f48ce1be4b477ca44806dc6e4e139c0 | |
| parent | a2f64ca085ce2527a9aaa637ccdcc0a78c5b0ccf (diff) | |
Bug #80930#: handle the return value correct
| -rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 7c5318fccd06..fdfdeee7b030 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $ + * last change: $Author: jp $ $Date: 2000-11-30 11:47:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -311,14 +311,17 @@ void SwSortDlg::Apply() aOptions.nDeli = nDeli; aOptions.bTable = rSh.IsTableMode(); - SwWait aWait( *rSh.GetView().GetDocShell(), TRUE ); - rSh.StartAllAction(); - BOOL bRet = rSh.Sort(aOptions); - rSh.EndAllAction(); - if(bRet) - InfoBox(this->GetParent(), SW_RES(MSG_SRTERR)).Execute(); - else - rSh.SetModified(); + BOOL bRet; + { + SwWait aWait( *rSh.GetView().GetDocShell(), TRUE ); + rSh.StartAllAction(); + if( 0 != (bRet = rSh.Sort( aOptions ))) + rSh.SetModified(); + rSh.EndAllAction(); + } + + if( !bRet ) + InfoBox( this->GetParent(), SW_RES(MSG_SRTERR)).Execute(); // Alte Einstellung speichern // @@ -376,6 +379,9 @@ IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck ) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:45 hr + initial import + Revision 1.58 2000/09/18 16:06:00 willem.vandorp OpenOffice header added. |