[openoffice] branch AOO41X updated: #i126476# Patch by: Mark Hung

[mseidel]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO41X by this push:
     new 376de1e92b #i126476# Patch by: Mark Hung
376de1e92b is described below

commit 376de1e92b9cf8f9af0f1e4b64def448bc422b96
Author: Kay Schenk <ksch...@apache.org>
AuthorDate: Mon Aug 24 21:04:11 2015 +0000

    #i126476# Patch by: Mark Hung
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1697501 
13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit 290927565caaa0b0949305f1ad0dcb1cc863aa3e)
---
 main/sw/source/core/text/itrcrsr.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/sw/source/core/text/itrcrsr.cxx 
b/main/sw/source/core/text/itrcrsr.cxx
index b5ef649715..b00b5ca2e9 100644
--- a/main/sw/source/core/text/itrcrsr.cxx
+++ b/main/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 )
                        {