editeng/inc/outleeng.hxx | 8 -------- editeng/source/outliner/outlin2.cxx | 2 +- editeng/source/outliner/outliner.cxx | 12 ++++++------ include/editeng/outliner.hxx | 7 +++++++ 4 files changed, 14 insertions(+), 15 deletions(-)
New commits: commit 5fa7281135b2d0ede1eeb801a032eed67f27eac6 Author: Noel Grandin <[email protected]> AuthorDate: Fri Feb 7 20:40:53 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Feb 8 08:18:17 2025 +0100 move some fields from OutlinerEditEng to Outliner as the comment indicates, that is where they belong Change-Id: I0078a359253d86d0197a87fade5a2de7579be042 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181273 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/editeng/inc/outleeng.hxx b/editeng/inc/outleeng.hxx index fe118d78ed92..892c336d3290 100644 --- a/editeng/inc/outleeng.hxx +++ b/editeng/inc/outleeng.hxx @@ -21,10 +21,6 @@ #include <editeng/outliner.hxx> #include <editeng/editeng.hxx> -enum class SdrCompatibilityFlag; - -typedef std::vector<EENotify> NotifyList; - class OutlinerEditEng : public EditEngine { Outliner* pOwner; @@ -75,10 +71,6 @@ public: std::optional<bool> GetCompatFlag(SdrCompatibilityFlag eFlag) const; virtual void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override; - - // belongs into class Outliner, move there before incompatible update! - Link<EENotify&,void> aOutlinerNotifyHdl; - NotifyList aNotifyCache; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 18bf47edfe3f..eb9d54c849a9 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -110,7 +110,7 @@ void Outliner::SetModifyHdl( const Link<LinkParamNone*,void>& rLink ) void Outliner::SetNotifyHdl( const Link<EENotify&,void>& rLink ) { - pEditEngine->aOutlinerNotifyHdl = rLink; + aOutlinerNotifyHdl = rLink; if ( rLink.IsSet() ) pEditEngine->SetNotifyHdl( LINK( this, Outliner, EditEngineNotifyHdl ) ); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 4ff4c5a46751..b1e65c95219f 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1903,12 +1903,12 @@ void Outliner::ImplBlockInsertionCallbacks( bool b ) if ( !nBlockInsCallback ) { // Call blocked notify events... - while(!pEditEngine->aNotifyCache.empty()) + while(!aNotifyCache.empty()) { - EENotify aNotify(pEditEngine->aNotifyCache.front()); + EENotify aNotify(aNotifyCache.front()); // Remove from list before calling, maybe we enter LeaveBlockNotifications while calling the handler... - pEditEngine->aNotifyCache.erase(pEditEngine->aNotifyCache.begin()); - pEditEngine->aOutlinerNotifyHdl.Call( aNotify ); + aNotifyCache.erase(aNotifyCache.begin()); + aOutlinerNotifyHdl.Call( aNotify ); } } } @@ -1917,9 +1917,9 @@ void Outliner::ImplBlockInsertionCallbacks( bool b ) IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void ) { if ( !nBlockInsCallback ) - pEditEngine->aOutlinerNotifyHdl.Call( rNotify ); + aOutlinerNotifyHdl.Call( rNotify ); else - pEditEngine->aNotifyCache.push_back(rNotify); + aNotifyCache.push_back(rNotify); } /** sets a link that is called at the beginning of a drag operation at an edit view */ diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 2948bf6bdfdd..c6363520e1bc 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -565,6 +565,10 @@ enum class OutlinerMode { OutlineView = 0x0004 }; +enum class SdrCompatibilityFlag; + +typedef std::vector<EENotify> NotifyList; + class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster { public: @@ -612,6 +616,9 @@ private: bool bStrippingPortions; bool bPasting; + Link<EENotify&,void> aOutlinerNotifyHdl; + NotifyList aNotifyCache; + DECL_DLLPRIVATE_LINK( ParaVisibleStateChangedHdl, Paragraph&, void ); DECL_DLLPRIVATE_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); DECL_DLLPRIVATE_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo&, void );
