summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/doc/CntntIdxStore.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 7f97c0c83250..ffdf2ff15764 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -38,6 +38,7 @@
#include <sal/types.h>
#include <unocrsr.hxx>
#include <edimp.hxx>
+#include <txtfrm.hxx>
#include <memory>
using namespace ::boost;
@@ -321,7 +322,10 @@ void ContentIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCont
SwFrame* pFrame = pNode->getLayoutFrame( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
if( pFrame )
{
- if( !pFrame->GetDrawObjs() )
+ // sw_redlinehide: this looks like an invalid optimisation if merged,
+ // assuming that flys in deleted redlines should be saved here too.
+ if ((!pFrame->IsTextFrame() || !static_cast<SwTextFrame const*>(pFrame)->GetMergedPara())
+ && !pFrame->GetDrawObjs())
return; // if we have a layout and no DrawObjs, we can skip this
}
MarkEntry aSave = { 0, false, 0 };