From 59074c09b838ebaf63f5d3e7578bb473080ec0ee Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 1 Jan 2013 22:39:15 +0100 Subject: remove use of #pragma optimize All these are years old, guessing from some comments as old as Windows 9x support. These workarounds do not seem to be needed now. Change-Id: If67baa5cdefcec33b28696c764b1ed96143b7ccd --- sw/source/core/layout/layact.cxx | 2 -- sw/source/core/txtnode/fntcache.cxx | 14 -------------- sw/source/core/txtnode/fntcap.cxx | 11 ----------- 3 files changed, 27 deletions(-) (limited to 'sw/source') diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 249f951abe1d..26b3523ba6eb 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -80,8 +80,6 @@ #include #include -//#pragma optimize("ity",on) - /************************************************************************* |* |* SwLayAction static stuff diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index c6c6745c3511..fe189ab1fc84 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -653,14 +653,6 @@ static bool lcl_IsMonoSpaceFont( const OutputDevice& rOut ) return nWidth1 == nWidth2; } -// ER 09.07.95 20:34 -// mit -Ox Optimierung stuerzt's unter win95 ab -// JP 12.07.95: unter WNT auch (i386); Alpha ?? -// global optimization off -#ifdef _MSC_VER -#pragma optimize("g",off) -#endif - /* This helper structure (SwForbidden) contains the already marked parts of the string to avoid double lines (e.g grammar + spell check error) */ @@ -1775,12 +1767,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) } -// optimization disabled for DrawText() -#ifdef _MSC_VER -#pragma optimize("",on) -#endif - - /************************************************************************* * * Size SwFntObj::GetTextSize( const OutputDevice *pOut, const String &rTxt, diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index e77acb060059..ef40571130c4 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -541,11 +541,6 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf ) * SwSubFont::DoOnCapitals() const *************************************************************************/ -// JP 22.8.2001 - global optimization off - Bug 91245 / 91223 -#ifdef _MSC_VER -#pragma optimize("g",off) -#endif - void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) { OSL_ENSURE( pLastFont, "SwFont::DoOnCapitals: No LastFont?!" ); @@ -836,10 +831,4 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) rDo.GetInf().SetKanaDiff( nKana ); } -// JP 22.8.2001 - global optimization off - Bug 91245 / 91223 -#ifdef _MSC_VER -#pragma optimize("g",on) -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit