[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/text/porlay.hxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit d431a1323f0b7bbeff79216b2c132e457b6cd3ef
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue Mar 5 13:22:50 2013 +0100

    SwLinePortion: drop no longer needed C30 workaround
    
    Change-Id: I80496eab6f1bbdcbae74ddac946a95ca2c34b45f

diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index e4bb214..83ac09b 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -397,19 +397,8 @@ inline void SwParaPortion::FormatReset()
     bFollowField = bFixLineHeight = bMargin = sal_False;
 }
 
-#ifdef UNX
-// The ternary expression is too much for the C30
-inline SwLinePortion *SwLineLayout::GetFirstPortion() const
-{
-    SwLinePortion *pTmp = pPortion;
-    if ( !pPortion )
-        pTmp = (SwLinePortion*)this;
-    return( pTmp );
-}
-#else
 inline SwLinePortion *SwLineLayout::GetFirstPortion() const
 { return( pPortion ? pPortion : (SwLinePortion*)this ); }
-#endif
 
 CLASSIO( SwLineLayout )
 CLASSIO( SwParaPortion )