summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/unocore/unotext.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index a36cc9ce32d5..a8b91c8a7ae2 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1755,7 +1755,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (bParaAfterInserted)
{
xFrameTextCursor->gotoEnd(sal_False);
- m_pImpl->m_pDoc->DelFullPara(*pFrameCursor->GetPaM());
+ if (!m_pImpl->m_pDoc->DelFullPara(*pFrameCursor->GetPaM()))
+ {
+ // In case the frame has a table only, the cursor points to the end of the first cell of the table.
+ SwPaM aPaM(*pFrameCursor->GetPaM()->GetNode()->FindSttNodeByType(SwFlyStartNode)->EndOfSectionNode());
+ // Now we have the end of the frame -- the node before that will be the paragraph we want to remove.
+ aPaM.GetPoint()->nNode--;
+ m_pImpl->m_pDoc->DelFullPara(aPaM);
+ }
}
}
cp-6.4-19&id=27ad8ca01c9691e539fea37d018d7892377f403f'>Bin some leftover and actually unnecessary iOS crack in vclTor Lillqvist 2018-10-31loplugin:useuniqueptr in DeletePrinterQueueInfoNoel Grandin 2018-10-08Define a dummy GlyphCache class here for nowTor Lillqvist 2018-10-02Unify sal plugin loadersJan-Marek Glogowski 2018-08-27Fix iOS build after f05f4e042ca6ac8ae7f1d1e8e6bfb4cbba17a044Tor Lillqvist 2018-06-09hold and return SalPrinter with std::unique_ptrNoel Grandin 2018-03-05vcl, make ios/dummies compilejan Iversen 2018-02-26vcl: fix hangs in SvpSalInstanceMichael Stahl 2017-11-11Replace list by vector for ShowNativeDialog (vcl)Julien Nabet 2017-10-31ReleaseYieldMutex is always called with trueNoel Grandin 2017-10-10iOS, solve missing vcl referencesjan Iversen 2017-09-19rename SalGenericData to GenericUnixSalDataNoel Grandin 2017-09-19Unify SolarMutex implementationsJan-Marek Glogowski 2017-08-08loplugin:constantparamNoel Grandin 2017-05-03iOS remove unused parameterjan Iversen 2017-04-28iOS, fixed build breaker.jan Iversen 2017-04-03iOS update for Rectanglejan Iversen