[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - writerfilter/source

[Pierre-Eric Pelloux-Prayer]

 writerfilter/source/dmapper/DomainMapper.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 10362c7aef210abd1f5d1e78ea3b7884b656e510
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date:   Thu Dec 20 15:39:37 2012 +0100

    bnc#820819 docx import: don't apply complex font size to non-complex font
    
    OOXML spec says:
    "[szCs] specifies the font size which shall be applied to all
    complex script characters in the contents of this run when displayed"
    
    Reviewed-on: https://gerrit.libreoffice.org/1454
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>
    (cherry picked from commit 73731b01cd65defdf9b42a9754bede3ba84221d7)
    
    Change-Id: I0faf599e38ef5a2e2005bb6f98874639be7d8287

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index c91c139..25f90a0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2207,8 +2207,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
             if( NS_sprm::LN_CHpsBi == nSprmId )
             {
                 rContext->Insert( PROP_CHAR_HEIGHT_COMPLEX, true, aVal );
-                // Also set Western, but don't overwrite it.
-                rContext->Insert( PROP_CHAR_HEIGHT, true, aVal, false );
             }
             else
             {