From 9cdf38e11f50e8b420e017b2dcf6b36f9f77c400 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 19 Jul 2016 21:47:29 +0100 Subject: Resolves: tdf#97404 outline space wrong on second level Revert "tdf#42788: FORMATTING - Numbering/ordered list" This reverts commit 6517141b6233c5f9667031bc92f66109fddf5b76. https://gerrit.libreoffice.org/#/c/23006/ was apparently intended to revert this, but it never was Then there was https://gerrit.libreoffice.org/#/c/23427/ which was an attempt to improve it but it was abandoned Then there was https://gerrit.libreoffice.org/#/c/23542/ whichw as another attempt to improve it, but it was too abandoned. all of which leaves us worse than when we started with a pile of unhappy abandoned efforts and cruddy indent Change-Id: I8b3666a957339030d5a946a2b387f452e7fb0099 (cherry picked from commit 8617010b851e000f336cf647f207557b5eeab8b7) Reviewed-on: https://gerrit.libreoffice.org/27328 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- editeng/source/items/numitem.cxx | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'editeng') diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 2f2a80a31a55..3c3fa19d71a7 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -151,7 +151,6 @@ SvxNumberFormat::SvxNumberFormat( sal_Int16 eType, SvxNumPositionAndSpaceMode ePositionAndSpaceMode ) : SvxNumberType(eType), eNumAdjust(SVX_ADJUST_LEFT), - mbNumAdjustChanged(false), nInclUpperLevels(0), nStart(1), cBullet(SVX_DEF_BULLET), @@ -181,8 +180,7 @@ SvxNumberFormat::SvxNumberFormat(const SvxNumberFormat& rFormat) : } SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) - : mbNumAdjustChanged(false) - , nStart(0) + : nStart(0) , nBulletRelSize(100) , nFirstLineOffset(0) , nAbsLSpace(0) @@ -245,26 +243,6 @@ SvxNumberFormat::~SvxNumberFormat() delete pBulletFont; } -void SvxNumberFormat::SetNumberingType(sal_Int16 nSet) -{ - if(!mbNumAdjustChanged) - { - // Right align Roman numbers, tdf#42788 - if(nSet == SVX_NUM_ROMAN_UPPER || nSet == SVX_NUM_ROMAN_LOWER) - eNumAdjust = SVX_ADJUST_RIGHT; - else if (eNumAdjust == SVX_ADJUST_RIGHT && (GetNumberingType() == SVX_NUM_ROMAN_UPPER || GetNumberingType() == SVX_NUM_ROMAN_LOWER)) - eNumAdjust = SVX_ADJUST_LEFT; - } - - SvxNumberType::SetNumberingType(nSet); -} - -void SvxNumberFormat::SetNumAdjust(SvxAdjust eSet) -{ - eNumAdjust = eSet; - mbNumAdjustChanged = true; -} - void SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter) { if(pConverter && pBulletFont) @@ -338,7 +316,6 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat ) SvxNumberType::SetNumberingType(rFormat.GetNumberingType()); eNumAdjust = rFormat.eNumAdjust ; - mbNumAdjustChanged = rFormat.mbNumAdjustChanged; nInclUpperLevels = rFormat.nInclUpperLevels ; nStart = rFormat.nStart ; cBullet = rFormat.cBullet ; -- cgit