diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-08 16:13:58 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:18:24 +0200 |
| commit | ad067c367fbca9eb7a0f5c8adbe6be243950569e (patch) | |
| tree | a380bcd92983c7a7017f994e6fa5011ac1db86c6 /sw/source/core/graphic | |
| parent | 6386e5951c72d1ac4072a333e867bcf87fdd9c81 (diff) | |
sw_redlinehide_2: fix ordering of SplitNode usage of ContentIdxStore
The problem is that now the ctor of SwTextFrame will check the redline
positions, but the call to MakeFramesForAdjacentContentNode()
happens before the call to ContentIdxStore::Restore() that updates
the SwPositions of the redlines, hence they point to the wrong node.
Try to fix this by not calling Restore directly but pass in a closure
to SwTextNode::SplitContentNode() so that it can call
ContentIdxStore::Restore() before frames are created and redline positions
are checked.
Also remove the useless SwContentNode::SplitContentNode() - only the
SwTextNode override actually did anything.
Change-Id: I2088fd124d04cf354f4f0f691a50ff5217d778d7
Diffstat (limited to 'sw/source/core/graphic')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 0f6ce3dcbd36..f7a489bba3bb 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -398,11 +398,6 @@ const GraphicObject* SwGrfNode::GetReplacementGrfObj() const return mpReplacementGraphic.get(); } -SwContentNode *SwGrfNode::SplitContentNode( const SwPosition & ) -{ - return this; -} - SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere, const OUString& rGrfName, const OUString& rFltName, |