[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

[Kay Schenk]

 sw/source/core/text/itrcrsr.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit aec10dffbd66cc6b4a8fc7ca6bb75cf589c81509
Author: Kay Schenk <kschenk at apache.org>
Date:   Mon Aug 24 21:04:11 2015 +0000

    #i126476# Patch by: Mark Hung

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 5c5e6eb..dc3d371 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -56,6 +56,7 @@
 // --> OD 2010-05-05 #i111284#
 #include <numrule.hxx>
 // <--
+#include <com/sun/star/i18n/ScriptType.hpp>
 
 // Nicht reentrant !!!
 // wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet.
@@ -267,6 +268,9 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
             rSpace.IsAutoFirst() )
         {
             nFirstLineOfs = GetFnt()->GetSize( GetFnt()->GetActual() ).Height();
+                        LanguageType aLang = pNode->GetLang( 0, 1, i18n::ScriptType::ASIAN);
+                        if (aLang != LANGUAGE_KOREAN && aLang != LANGUAGE_JAPANESE)
+                            nFirstLineOfs<<=1;
             const SvxLineSpacingItem *pSpace = aLineInf.GetLineSpacing();
             if( pSpace )
             {