diff options
| author | Kurt Zenker <kz@openoffice.org> | 2000-11-09 14:49:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2000-11-09 14:49:34 +0000 |
| commit | 4e684488cf2937a01c490fd4bb45b22e24c28cf3 (patch) | |
| tree | 4b7dddc6c25a71f62eaf0f6394f789ec3bf971bc | |
| parent | 705a218461a35e033c9cf63b994d16a1f91d2413 (diff) | |
#65293#: std::min() / max()
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 5ff7b4fe9c6a..7ad0e010a849 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2000-11-09 15:22:28 $ + * last change: $Author: kz $ $Date: 2000-11-09 15:49:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -838,7 +838,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* pSet ) } if(nColSum != pTblData->GetWidth()) { - SwTwips nMinWidth = std::min((long)MINLAY, pTblData->GetWidth() / pTblData->GetColCount() - 1); + SwTwips nMinWidth = std::min((long)MINLAY, (long) (pTblData->GetWidth() / pTblData->GetColCount() - 1)); SwTwips nDiff = nColSum - pTblData->GetWidth(); while ( Abs(nDiff) > pTblData->GetColCount() + 1 ) { @@ -2109,6 +2109,9 @@ void SwTextFlowPage::DisablePageBreak() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.3 2000/11/09 15:22:28 hr + #65293#: std::min()/max() + Revision 1.2 2000/11/07 12:48:38 hjs use min/max from stl |