diff options
Diffstat (limited to 'sw/source/core/inc/txtfrm.hxx')
| -rw-r--r-- | sw/source/core/inc/txtfrm.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index bf4c0ad8a316..8b3d6a8c8575 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -101,8 +101,10 @@ struct MergedPara; std::pair<SwTextNode*, sal_Int32> MapViewToModel(MergedPara const&, TextFrameIndex nIndex); TextFrameIndex MapModelToView(MergedPara const&, SwTextNode const* pNode, sal_Int32 nIndex); +// warning: Existing must be used only once; a second use would delete the frame created by the first one... enum class FrameMode { New, Existing }; std::unique_ptr<sw::MergedPara> CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode & rTextNode, FrameMode eMode); +SwTextFrame * MakeTextFrame(SwTextNode & rNode, SwFrame *, sw::FrameMode eMode); bool FrameContainsNode(SwContentFrame const& rFrame, sal_uLong nNodeIndex); bool IsParaPropsNode(SwRootFrame const& rLayout, SwTextNode const& rNode); @@ -450,7 +452,7 @@ public: { return const_cast<SwDoc &>(const_cast<SwTextFrame const*>(this)->GetDoc()); } SwDoc const& GetDoc() const; - SwTextFrame(SwTextNode * const, SwFrame* ); + SwTextFrame(SwTextNode * const, SwFrame*, sw::FrameMode eMode); /** * SwContentFrame: the shortcut for the Frames |