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

[Bjoern Michaelsen]

 sw/source/core/txtnode/thints.cxx |   18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

New commits:
commit e757bccfabf3bd00afd0eecb0ddcb656c7217904
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 20 01:09:59 2014 +0100

    simplify after expand
    
    Change-Id: Ibcb863b32e5dfb6a2cba9db418c8e8d489e9577f
    Reviewed-on: https://gerrit.libreoffice.org/13003
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 7cab8d8..095b20d 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3419,16 +3419,14 @@ sal_uInt16 SwTxtNode::GetLang( const sal_Int32 nBegin, const sal_Int32 nLen,
                     if( pHt->DontExpand() ? nBegin >= *pEndIdx : nBegin > *pEndIdx)
                         continue;
                 }
-                {
-                    const SfxPoolItem* pItem = CharFmt::GetItem( *pHt, nWhichId );
-                    const sal_uInt16 nLng = ((SvxLanguageItem*)pItem)->GetLanguage();
-
-                    // Umfasst das Attribut den Bereich komplett?
-                    if( nAttrStart <= nBegin && nEnd <= *pEndIdx )
-                        nRet = nLng;
-                    else if( LANGUAGE_DONTKNOW == nRet )
-                        nRet = nLng; // partielle Ueberlappung, der 1. gewinnt
-                }
+                const SfxPoolItem* pItem = CharFmt::GetItem( *pHt, nWhichId );
+                const sal_uInt16 nLng = ((SvxLanguageItem*)pItem)->GetLanguage();
+
+                // Umfasst das Attribut den Bereich komplett?
+                if( nAttrStart <= nBegin && nEnd <= *pEndIdx )
+                    nRet = nLng;
+                else if( LANGUAGE_DONTKNOW == nRet )
+                    nRet = nLng; // partielle Ueberlappung, der 1. gewinnt
             }
         }
     }