[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-2' - sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Mar 15 17:32:15 UTC 2019
sw/inc/doc.hxx | 3 +-
sw/source/core/doc/doctxm.cxx | 7 +++++-
sw/source/core/docnode/ndsect.cxx | 5 ++--
sw/source/core/inc/UndoSection.hxx | 9 ++++++--
sw/source/core/inc/rootfrm.hxx | 7 ++++++
sw/source/core/undo/unsect.cxx | 41 +++++++++++++++++++++++++++++++++----
6 files changed, 62 insertions(+), 10 deletions(-)
New commits:
commit b71f54527a08eedf91b4268f280816a45928737a
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Mar 4 13:12:09 2019 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Mar 15 18:31:46 2019 +0100
tdf#123446 sw_redlinehide: fix crash on Redo of ToX
The problem is that the ToX must be updated with the same layout redline
setting as it was originally created, so that subsequent Redo actions
see the expected node indexes.
Unfortunately it's not enough to just pass a flag to the ToX update
functions, because they check GetTextNodeForParaProps() so we need a
layout corresponding to the layout setting; if there isn't one, the
existing one is temporarily toggled.
This could be much better if the MergedPara would be independent of the
layout and always exist, but with the various SwModify design issues
that looks tricky to do...
(regression from 80cedb5dcb6a7dd6c01349b93fab49ecee5f6594)
Reviewed-on: https://gerrit.libreoffice.org/68704
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
Tested-by: Michael Stahl <Michael.Stahl at cib.de>
(cherry picked from commit 405661a98f01416c596083262691cedd941733a1)
Change-Id: Ibdc5b4ace54ace27e5223a25ecaf39bb493fb69b
Reviewed-on: https://gerrit.libreoffice.org/68736
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit e53a3e8cc21b5c54c2463fbad6debd2011307b1c)
Reviewed-on: https://gerrit.libreoffice.org/69130
Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index dab81b32309a..db3220f26f18 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -139,6 +139,7 @@ namespace sw { namespace mark {
class MarkManager;
}}
namespace sw {
+ enum class RedlineMode;
class MetaFieldManager;
class UndoManager;
class IShellCursorSupplier;
@@ -1312,7 +1313,7 @@ public:
// insert section (the ODF kind of section, not the nodesarray kind)
SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
- SwTOXBase const*const pTOXBase,
+ std::pair<SwTOXBase const*, sw::RedlineMode> const* pTOXBase,
SfxItemSet const*const pAttr, bool const bUpdate = true);
static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
const SwNode** ppSttNd = nullptr );
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 05eb2de9295d..5f32399ffa64 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -366,8 +366,13 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPaM& aPam,
OUString sSectNm = GetUniqueTOXBaseName( *rTOX.GetTOXType(), rTOX.GetTOXName() );
SwSectionData aSectionData( TOX_CONTENT_SECTION, sSectNm );
+
+ std::pair<SwTOXBase const*, sw::RedlineMode> const tmp(&rTOX,
+ pLayout && pLayout->IsHideRedlines()
+ ? sw::RedlineMode::Hidden
+ : sw::RedlineMode::Shown);
SwTOXBaseSection *const pNewSection = dynamic_cast<SwTOXBaseSection *>(
- InsertSwSection( aPam, aSectionData, & rTOX, pSet, false ));
+ InsertSwSection(aPam, aSectionData, & tmp, pSet, false));
if (pNewSection)
{
SwSectionNode *const pSectNd = pNewSection->GetFormat()->GetSectionNode();
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index aaefcce05412..730150d01f1d 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -153,7 +153,7 @@ static void lcl_CheckEmptyLayFrame( SwNodes const & rNds, SwSectionData& rSectio
SwSection *
SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
- SwTOXBase const*const pTOXBase,
+ std::pair<SwTOXBase const*, sw::RedlineMode> const*const pTOXBaseAndMode,
SfxItemSet const*const pAttr, bool const bUpdate)
{
const SwNode* pPrvNd = nullptr;
@@ -186,7 +186,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
if (bUndo)
{
- pUndoInsSect = new SwUndoInsSection(rRange, rNewData, pAttr, pTOXBase);
+ pUndoInsSect = new SwUndoInsSection(rRange, rNewData, pAttr, pTOXBaseAndMode);
GetIDocumentUndoRedo().AppendUndo( std::unique_ptr<SwUndo>(pUndoInsSect) );
GetIDocumentUndoRedo().DoUndo(false);
}
@@ -197,6 +197,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
pFormat->SetFormatAttr( *pAttr );
}
+ SwTOXBase const*const pTOXBase(pTOXBaseAndMode ? pTOXBaseAndMode->first : nullptr);
SwSectionNode* pNewSectNode = nullptr;
RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags();
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index c221d79b3145..ef8847dae1e0 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -30,11 +30,15 @@ class SwSectionData;
class SwSectionFormat;
class SwTOXBase;
+namespace sw {
+ enum class RedlineMode;
+};
+
class SwUndoInsSection : public SwUndo, private SwUndRng
{
private:
const std::unique_ptr<SwSectionData> m_pSectionData;
- const std::unique_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX
+ const std::unique_ptr<std::pair<SwTOXBase *, sw::RedlineMode>> m_pTOXBase; /// set iff section is TOX
const std::unique_ptr<SfxItemSet> m_pAttrSet;
std::unique_ptr<SwHistory> m_pHistory;
std::unique_ptr<SwRedlineData> m_pRedlData;
@@ -48,7 +52,8 @@ private:
public:
SwUndoInsSection(SwPaM const&, SwSectionData const&,
- SfxItemSet const*const pSet, SwTOXBase const*const pTOXBase);
+ SfxItemSet const* pSet,
+ std::pair<SwTOXBase const*, sw::RedlineMode> const* pTOXBase);
virtual ~SwUndoInsSection() override;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index e0dfd88f919b..d9893e6e31f9 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -41,6 +41,13 @@ class SwSelectionList;
struct SwPosition;
struct SwCursorMoveState;
+namespace sw {
+ enum class RedlineMode
+ {
+ Shown, Hidden
+ };
+};
+
enum class SwInvalidateFlags
{
Size = 0x01,
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 1a40d6c5b424..d5c48a9d3322 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -20,12 +20,14 @@
#include <memory>
#include <UndoSection.hxx>
+#include <comphelper/scopeguard.hxx>
#include <sfx2/linkmgr.hxx>
#include <fmtcntnt.hxx>
#include <doc.hxx>
#include <IDocumentLinksAdministration.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
+#include <IDocumentLayoutAccess.hxx>
#include <docary.hxx>
#include <swundo.hxx>
#include <pam.hxx>
@@ -36,6 +38,7 @@
#include <redline.hxx>
#include <doctxm.hxx>
#include <ftnidx.hxx>
+#include <rootfrm.hxx>
#include <editsh.hxx>
/// OD 04.10.2002 #102894#
/// class Calc needed for calculation of the hidden condition of a section.
@@ -71,10 +74,14 @@ static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect )
SwUndoInsSection::SwUndoInsSection(
SwPaM const& rPam, SwSectionData const& rNewData,
- SfxItemSet const*const pSet, SwTOXBase const*const pTOXBase)
+ SfxItemSet const*const pSet,
+ std::pair<SwTOXBase const*, sw::RedlineMode> const*const pTOXBase)
: SwUndo( SwUndoId::INSSECTION, rPam.GetDoc() ), SwUndRng( rPam )
, m_pSectionData(new SwSectionData(rNewData))
- , m_pTOXBase( pTOXBase ? new SwTOXBase(*pTOXBase) : nullptr )
+ , m_pTOXBase( pTOXBase
+ ? o3tl::make_unique<std::pair<SwTOXBase *, sw::RedlineMode>>(
+ new SwTOXBase(*pTOXBase->first), pTOXBase->second)
+ : nullptr )
, m_pAttrSet( (pSet && pSet->Count()) ? new SfxItemSet( *pSet ) : nullptr )
, m_nSectionNodePos(0)
, m_bSplitAtStart(false)
@@ -173,8 +180,32 @@ void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & rContext)
const SwTOXBaseSection* pUpdateTOX = nullptr;
if (m_pTOXBase)
{
+ SwRootFrame const* pLayout(nullptr);
+ SwRootFrame * pLayoutToReset(nullptr);
+ comphelper::ScopeGuard g([&]() {
+ if (pLayoutToReset)
+ {
+ pLayoutToReset->SetHideRedlines(m_pTOXBase->second == sw::RedlineMode::Shown);
+ }
+ });
+ std::set<SwRootFrame *> layouts(rDoc.GetAllLayouts());
+ for (SwRootFrame const*const p : layouts)
+ {
+ if ((m_pTOXBase->second == sw::RedlineMode::Hidden) == p->IsHideRedlines())
+ {
+ pLayout = p;
+ break;
+ }
+ }
+ if (!pLayout)
+ {
+ assert(!layouts.empty()); // must have one layout
+ pLayoutToReset = *layouts.begin();
+ pLayoutToReset->SetHideRedlines(m_pTOXBase->second == sw::RedlineMode::Hidden);
+ pLayout = pLayoutToReset;
+ }
pUpdateTOX = rDoc.InsertTableOf( *rPam.GetPoint(),
- *m_pTOXBase, m_pAttrSet.get(), true);
+ *m_pTOXBase->first, m_pAttrSet.get(), true, pLayout);
}
else
{
@@ -223,7 +254,8 @@ void SwUndoInsSection::RepeatImpl(::sw::RepeatContext & rContext)
if (m_pTOXBase)
{
rDoc.InsertTableOf(*rContext.GetRepeatPaM().GetPoint(),
- *m_pTOXBase, m_pAttrSet.get(), true);
+ *m_pTOXBase->first, m_pAttrSet.get(), true,
+ rDoc.getIDocumentLayoutAccess().GetCurrentLayout()); // TODO add shell to RepeatContext?
}
else
{
@@ -321,6 +353,7 @@ void SwUndoDelSection::UndoImpl(::sw::UndoRedoContext & rContext)
if (m_pTOXBase)
{
+ // sw_redlinehide: this should work as-is; there will be another undo for the update
rDoc.InsertTableOf(m_nStartNode, m_nEndNode-2, *m_pTOXBase,
m_pAttrSet.get());
}
More information about the Libreoffice-commits
mailing list