editeng/source/items/numitem.cxx | 25 +------------------------ include/editeng/numitem.hxx | 8 +++----- vcl/unx/gtk/a11y/atkhypertext.cxx | 2 ++ 3 files changed, 6 insertions(+), 29 deletions(-)
New commits: commit 9a934b04754586111c5083983e8459616ec051db Author: Caolán McNamara <caol...@redhat.com> Date: Tue Jul 19 21:47:29 2016 +0100 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/27343 Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Reviewed-by: Eike Rathke <er...@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 2f2a80a..3c3fa19 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 ; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 775e8f1..e4ccbea 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -60,12 +60,12 @@ class EDITENG_DLLPUBLIC SvxNumberType public: explicit SvxNumberType(sal_Int16 nType = css::style::NumberingType::ARABIC); SvxNumberType(const SvxNumberType& rType); - virtual ~SvxNumberType(); + ~SvxNumberType(); OUString GetNumStr( sal_uLong nNo ) const; OUString GetNumStr( sal_uLong nNo, const css::lang::Locale& rLocale ) const; - virtual void SetNumberingType(sal_Int16 nSet) {nNumType = nSet;} + void SetNumberingType(sal_Int16 nSet) {nNumType = nSet;} sal_Int16 GetNumberingType() const {return nNumType;} void SetShowSymbol(bool bSet) {bShowSymbol = bSet;} @@ -99,7 +99,6 @@ private: OUString sSuffix; SvxAdjust eNumAdjust; - bool mbNumAdjustChanged; sal_uInt8 nInclUpperLevels; // Take over numbers from the previous level. sal_uInt16 nStart; // Start of counting @@ -155,8 +154,7 @@ public: bool operator==( const SvxNumberFormat& ) const; bool operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);} - void SetNumberingType(sal_Int16 nSet) override; - void SetNumAdjust(SvxAdjust eSet); + void SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;} SvxAdjust GetNumAdjust() const {return eNumAdjust;} void SetPrefix(const OUString& rSet) { sPrefix = rSet;} const OUString& GetPrefix() const { return sPrefix;} commit 6f16f5096652ab7d081b06114af4d8d112053784 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jul 28 08:50:59 2016 +0100 Resolves: tdf#101132 a11y crash in hyperlink regression from... commit aa6c54f337a616c9ca6a39cfc8708657018d8613 Date: Mon Jan 18 09:01:15 2016 +0200 loplugin:unusedfields Change-Id: Ic2b7fe5f2d49a447a9936c4fb04bafcc7349ecf9 (cherry picked from commit 4fc3c8a3df485f6dccdcb2c51c6266fbd0dace3e) Reviewed-on: https://gerrit.libreoffice.org/27610 Reviewed-by: Eike Rathke <er...@redhat.com> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 1b65290..25f4116 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -26,6 +26,8 @@ using namespace ::com::sun::star; // ---------------------- AtkHyperlink ---------------------- typedef struct { + AtkHyperlink atk_hyper_link; + uno::Reference< accessibility::XAccessibleHyperlink > xLink; } HyperLink;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits