diff options
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) |