|
 |
e3debef |
From f752aa8de421ab6ee296370b4c287354fc2ba06c Mon Sep 17 00:00:00 2001
|
|
|
e3debef |
From: Michael Stahl <mstahl@redhat.com>
|
|
|
e3debef |
Date: Thu, 2 Apr 2015 22:32:59 +0200
|
|
|
e3debef |
Subject: [PATCH 1/4] tdf#87400: sw: fix ~SwIndexReg assertion in AutoCorrect
|
|
|
e3debef |
MIME-Version: 1.0
|
|
|
e3debef |
Content-Type: text/plain; charset=UTF-8
|
|
|
e3debef |
Content-Transfer-Encoding: 8bit
|
|
|
e3debef |
|
|
|
e3debef |
SwAutoFormat::DoUnderline() calls DeleteSel() with a SwPaM that is not
|
|
|
e3debef |
corrected, except if it's passed along directly to SwDoc methods.
|
|
|
e3debef |
|
|
|
e3debef |
(regression from f9b62506b22c3eb885ffd5a4ec8025c33df7b2d4)
|
|
|
e3debef |
|
|
|
e3debef |
(cherry picked from commit 41e4998cdeb54a6fc316f349de61296be820fe47)
|
|
|
e3debef |
Reviewed-on: https://gerrit.libreoffice.org/15127
|
|
|
e3debef |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
e3debef |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
e3debef |
(cherry picked from commit d8d946210a39400e4fc0b83f186e6234ad364836)
|
|
|
e3debef |
|
|
|
e3debef |
Conflicts:
|
|
|
e3debef |
sw/source/core/edit/eddel.cxx
|
|
|
e3debef |
|
|
|
e3debef |
Change-Id: I741e0391e7f8e09a64bcfe99ca4d650f1016aaa7
|
|
|
e3debef |
---
|
|
|
e3debef |
sw/source/core/edit/eddel.cxx | 14 ++++++++++----
|
|
|
e3debef |
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
e3debef |
|
|
|
e3debef |
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
|
|
|
e3debef |
index 47614f2c..fad1eaf 100644
|
|
|
e3debef |
--- a/sw/source/core/edit/eddel.cxx
|
|
|
e3debef |
+++ b/sw/source/core/edit/eddel.cxx
|
|
|
e3debef |
@@ -89,14 +89,20 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
|
|
|
e3debef |
}
|
|
|
e3debef |
else
|
|
|
e3debef |
{
|
|
|
e3debef |
- SwPaM aPam(rPam);
|
|
|
e3debef |
+ std::unique_ptr<SwPaM> pNewPam;
|
|
|
e3debef |
+ SwPaM * pPam = &rPam;
|
|
|
e3debef |
if (bSelectAll)
|
|
|
e3debef |
+ {
|
|
|
e3debef |
+ assert(dynamic_cast<SwShellCrsr*>(&rPam)); // must be corrected pam
|
|
|
e3debef |
+ pNewPam.reset(new SwPaM(rPam));
|
|
|
e3debef |
// Selection starts at the first para of the first cell, but we
|
|
|
e3debef |
// want to delete the table node before the first cell as well.
|
|
|
e3debef |
- aPam.Start()->nNode = aPam.Start()->nNode.GetNode().FindTableNode()->GetIndex();
|
|
|
e3debef |
+ pNewPam->Start()->nNode = pNewPam->Start()->nNode.GetNode().FindTableNode()->GetIndex();
|
|
|
e3debef |
+ pPam = pNewPam.get();
|
|
|
e3debef |
+ }
|
|
|
e3debef |
// delete everything
|
|
|
e3debef |
- GetDoc()->DeleteAndJoin( aPam );
|
|
|
e3debef |
- SaveTblBoxCntnt( aPam.GetPoint() );
|
|
|
e3debef |
+ GetDoc()->DeleteAndJoin( *pPam );
|
|
|
e3debef |
+ SaveTblBoxCntnt( pPam->GetPoint() );
|
|
|
e3debef |
}
|
|
|
e3debef |
|
|
|
e3debef |
// Selection is not needed anymore
|
|
|
e3debef |
--
|
|
|
e3debef |
2.1.0
|
|
|
e3debef |
|