[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/svx-fix-fit-to-frame-crash.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bcce167d19c600a711b3e8dcc7e38d46a1e293d
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Jun 5 11:34:00 2009 -0400

    Fixed build breakage on x86.
    
    * patches/dev300/svx-fix-fit-to-frame-crash.diff:

diff --git a/patches/dev300/svx-fix-fit-to-frame-crash.diff b/patches/dev300/svx-fix-fit-to-frame-crash.diff
index 9302a1c..caa2230 100644
--- a/patches/dev300/svx-fix-fit-to-frame-crash.diff
+++ b/patches/dev300/svx-fix-fit-to-frame-crash.diff
@@ -6,7 +6,7 @@ diff -rup svx/source/editeng-orig/impedit3.cxx svx/source/editeng/impedit3.cxx
  						// Skalierung rausrechnen
  						if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
 -							nCurPos = nCurPos*100/nStretchX;
-+						    nCurPos = nCurPos*100/std::max((sal_Int32)nStretchX, 1);
++						    nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
  
                          short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
                          aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );