Kaydet (Commit) 229b8f91 authored tarafından Steve Yin's avatar Steve Yin Kaydeden (comit) Caolán McNamara

Resolves: #i125090# The values of upper and lower spacing...

for default paragraph did the complete opposite.

(cherry picked from commit 75f191b0)

Conflicts:
	sd/source/core/stlpool.cxx

Change-Id: Idd44f7f1e4ad6acbde2733240fd357e628ac1f28
üst f8115ce7
...@@ -274,34 +274,34 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool ...@@ -274,34 +274,34 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
} }
sal_uLong nFontSize = 20; sal_uLong nFontSize = 20;
sal_uInt16 nLower = 100; sal_uInt16 nUpper = 100;
switch (nLevel) switch (nLevel)
{ {
case 1: case 1:
{ {
nFontSize = 32; nFontSize = 32;
nLower = 500; nUpper = 500;
} }
break; break;
case 2: case 2:
{ {
nFontSize = 28; nFontSize = 28;
nLower = 400; nUpper = 400;
} }
break; break;
case 3: case 3:
{ {
nFontSize = 24; nFontSize = 24;
nLower = 300; nUpper = 300;
} }
break; break;
case 4: case 4:
{ {
nLower = 200; nUpper = 200;
} }
break; break;
} }
...@@ -313,8 +313,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool ...@@ -313,8 +313,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) ); rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) );
rOutlineSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( nFontSize ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); rOutlineSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( nFontSize ), 100, EE_CHAR_FONTHEIGHT_CTL ) );
// Line distance (downwards). Stuff around here cleaned up in i35937 // Line distance (upwards). Stuff around here cleaned up in i35937
aSvxULSpaceItem.SetLower(nLower); aSvxULSpaceItem.SetUpper(nUpper);
pSheet->GetItemSet().Put(aSvxULSpaceItem); pSheet->GetItemSet().Put(aSvxULSpaceItem);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment