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

[Steve Yin]

 sd/source/core/stlpool.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 229b8f91228e195fa2613486447c02260c5844e5
Author: Steve Yin <steve_y at apache.org>
Date:   Tue Jun 24 06:43:14 2014 +0000

    Resolves: #i125090# The values of upper and lower spacing...
    
    for default paragraph did the complete opposite.
    
    (cherry picked from commit 75f191b09f25e4dd357f42fdf80c2b0252d1c410)
    
    Conflicts:
    	sd/source/core/stlpool.cxx
    
    Change-Id: Idd44f7f1e4ad6acbde2733240fd357e628ac1f28

diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index da88e23..cb81501 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -274,34 +274,34 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
             }
 
             sal_uLong nFontSize = 20;
-            sal_uInt16 nLower = 100;
+            sal_uInt16 nUpper = 100;
 
             switch (nLevel)
             {
                 case 1:
                 {
                     nFontSize = 32;
-                    nLower = 500;
+                    nUpper = 500;
                 }
                 break;
 
                 case 2:
                 {
                     nFontSize = 28;
-                    nLower = 400;
+                    nUpper = 400;
                 }
                 break;
 
                 case 3:
                 {
                     nFontSize = 24;
-                    nLower = 300;
+                    nUpper = 300;
                 }
                 break;
 
                 case 4:
                 {
-                    nLower = 200;
+                    nUpper = 200;
                 }
                 break;
             }
@@ -313,8 +313,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
             rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) );
             rOutlineSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( nFontSize ), 100, EE_CHAR_FONTHEIGHT_CTL ) );
 
-            // Line distance (downwards). Stuff around here cleaned up in i35937
-            aSvxULSpaceItem.SetLower(nLower);
+            // Line distance (upwards). Stuff around here cleaned up in i35937
+            aSvxULSpaceItem.SetUpper(nUpper);
             pSheet->GetItemSet().Put(aSvxULSpaceItem);
         }
     }