From 2700982599036bf404014d47cbcf355588cd2295 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Thu, 9 Nov 2000 14:22:28 +0000
Subject: #65293#: std::min()/max()

---
 sw/source/ui/table/tabledlg.cxx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'sw/source/ui')

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 3a0e661e822b..5ff7b4fe9c6a 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.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hjs $ $Date: 2000-11-07 12:48:38 $
+ *  last change: $Author: hr $ $Date: 2000-11-09 15:22:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,9 +59,6 @@
  *
  ************************************************************************/
 
-#include <string>
-#include <algorithm>
-
 #ifdef PRECOMPILED
 #include "ui_pch.hxx"
 #endif
@@ -169,6 +166,7 @@
 #ifndef _TABLE_HRC
 #include <table.hrc>
 #endif
+#include <algorithm>
 
 
 #ifdef DEBUG_TBLDLG
@@ -840,7 +838,7 @@ int  SwFormatTablePage::DeactivatePage( SfxItemSet* pSet )
             }
             if(nColSum != pTblData->GetWidth())
             {
-                SwTwips nMinWidth = std::min(MINLAY, pTblData->GetWidth() / pTblData->GetColCount() - 1);
+                SwTwips nMinWidth = std::min((long)MINLAY, pTblData->GetWidth() / pTblData->GetColCount() - 1);
                 SwTwips nDiff = nColSum - pTblData->GetWidth();
                 while ( Abs(nDiff) > pTblData->GetColCount() + 1 )
                 {
@@ -2111,6 +2109,9 @@ void SwTextFlowPage::DisablePageBreak()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2000/11/07 12:48:38  hjs
+    use min/max from stl
+
     Revision 1.1.1.1  2000/09/18 17:14:48  hr
     initial import
 
-- 
cgit v1.2.3