summaryrefslogtreecommitdiff
path: root/include/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-19 21:47:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-19 22:33:34 +0100
commit8617010b851e000f336cf647f207557b5eeab8b7 (patch)
tree2cdde3b7f543e665ca4b7e7431d243f656d8acf6 /include/editeng
parentf5792667cafef77cc4c142f4261f8b64280bc0fe (diff)
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
Diffstat (limited to 'include/editeng')
-rw-r--r--include/editeng/numitem.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 13ffac063128..e87b74ffbce9 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;}