diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-18 16:23:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-19 09:31:43 +0200 |
| commit | 71d48c3d5c81f9637705de2212ef860bf8a9b4fd (patch) | |
| tree | 7bf38c76fa059cf4e7d4c0ff608de9bb44fc3abc /editeng | |
| parent | a090b8785f6580ef779fb8b4e140f82085b4455a (diff) | |
unused xForbiddenCharsTable in ImpEditEngine
since as far back as I can see
Change-Id: I828d527e91479f40d0186b09043de4841d735e84
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 9cf5de4e22ab..aa0a1eb8b7a6 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -520,8 +520,6 @@ private: Link<EditView*,void> maBeginDropHdl; Link<EditView*,void> maEndDropHdl; - std::shared_ptr<SvxForbiddenCharactersTable> xForbiddenCharsTable; - bool bKernAsianPunctuation:1; bool bAddExtLeading:1; bool bIsFormatting:1; @@ -1036,7 +1034,7 @@ public: void SetAddExtLeading( bool b ); bool IsAddExtLeading() const { return bAddExtLeading; } - std::shared_ptr<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; + static std::shared_ptr<SvxForbiddenCharactersTable> GetForbiddenCharsTable(); static void SetForbiddenCharsTable( const std::shared_ptr<SvxForbiddenCharactersTable>& xForbiddenChars ); /** sets a link that is called at the beginning of a drag operation at an edit view */ diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1e020d6d5ac3..af9c14b3340f 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4339,12 +4339,9 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, bool bRight ) } } -std::shared_ptr<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable() const +std::shared_ptr<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable() { - std::shared_ptr<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable; - if (!xF) - xF = EditDLL::Get().GetGlobalData()->GetForbiddenCharsTable(); - return xF; + return EditDLL::Get().GetGlobalData()->GetForbiddenCharsTable(); } void ImpEditEngine::SetForbiddenCharsTable(const std::shared_ptr<SvxForbiddenCharactersTable>& xForbiddenChars) |