include/sfx2/objsh.hxx |
3 -
include/sfx2/redlinerecordingmode.hxx |
24 ++++++++
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2
sc/source/ui/docshell/docsh.cxx |
2
sc/source/ui/inc/docsh.hxx |
2
sfx2/source/doc/objxtor.cxx |
2
sw/inc/IDocumentRedlineAccess.hxx |
5 +
sw/inc/docsh.hxx |
2
sw/inc/editsh.hxx |
4 +
sw/qa/extras/tiledrendering/tiledrendering2.cxx |
27 ++++++++++
sw/source/core/doc/DocumentRedlineManager.cxx |
21 ++++++-
sw/source/core/edit/edredln.cxx |
15 +++--
sw/source/core/inc/DocumentRedlineManager.hxx |
4 -
sw/source/uibase/app/docsh.cxx |
6 +-
sw/source/uibase/inc/wrtsh.hxx |
3 -
sw/source/uibase/uiview/view2.cxx |
8 ++
sw/source/uibase/wrtsh/select.cxx |
4 -
17 files changed, 106 insertions(+), 28 deletions(-)
New commits:
commit 7d7ee87f18f50a0a07ddfe383e3497041183f828
Author: Sarper Akdemir <sarper.akde...@allotropia.de>
AuthorDate: Mon Apr 7 11:20:31 2025 +0200
Commit: Sarper Akdemir <sarper.akde...@allotropia.de>
CommitDate: Mon Apr 7 17:38:59 2025 +0200
tdf#163444 sd: add mnemonic for Notes Pane menu item
Set p as the mnemonic for Notes Pane menu item. AFAICS no
clash-free mnemonic was possible. As a result the mnemonics
for Slide Pane and Notes Pane clash now.
I think it is logical to make these two items clash, since
they are both for toggling panes.
Change-Id: I00ac6f815e0109a3e276eeee7e03beffba7b0946
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183777
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir <sarper.akde...@allotropia.de>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d0cdf85fe3c4..ff126025fd32 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -26,7 +26,7 @@
</node>
<node oor:name=".uno:BottomPaneImpress" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Notes Pane</value>
+ <value xml:lang="en-US">Notes ~Pane</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
commit 94e683b5e18cfa40a65d970b50f03a88ec352b60
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Apr 7 09:12:57 2025 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Apr 7 17:38:54 2025 +0200
cool#11226 sw per-view redline on: fix bad record mode change on undo
Have 2 Writer views, enable recording for "this view", type a few
characters, undo. The recording is now enabled for all views, not just
this view.
The problem is that sw::DocumentRedlineManager::SetRedlineFlags_intern()
only gets flags, so in case UndoRedoRedlineGuard sets new temporary
flags & then restores those flags later, then that guard assumes that we
return to the old state, but it implicitly calls
SetRedlineFlags_intern() with 'bRecordAllViews = true', so the record
mode changes from "this view" to "all views" at the end.
Fix the problem by changing the RecordAllViews boolean to an enum and
introducing a "view agnostic" mode: here we don't care too much about
views, since these calls are typically just temporary, but what we care
is that 1) if they enable recording, then IsRedlineOn() reports true and
2) if they set new flags & later restore the old flags, the state is
unchanged.
Alternatives considered:
- It would be possible to just touch the model in the "view agnostic"
case, but then IsRedlineOn() would still get the recording bool from
the view, leading to a stack overflow: lcl_DoWithBreaks() ->
sw::DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl() ->
sw::DocumentRedlineManager::AppendRedline() ->
sw::DocumentContentOperationsManager::DeleteAndJoin() ->
lcl_DoWithBreaks() again.
- It would be possible to fix this on the undo side (to query the record
mode and restore that mode explicitly when restoring flags), but we
have many other use-cases for setting & restoring flags: e.g.
autocorrect or autoformat.
Change-Id: I75697c6b5b3767ad8db899cda080be312eb6c821
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183792
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index badeddf332b7..8a7875640762 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -44,6 +44,7 @@
#include <o3tl/typed_flags_set.hxx>
#include <functional>
#include <sfx2/AccessibilityIssue.hxx>
+#include <sfx2/redlinerecordingmode.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -696,7 +697,7 @@ public:
// slots used for Calc: FID_CHG_RECORD, SID_CHG_PROTECT
virtual bool IsChangeRecording(SfxViewShell* pViewShell = nullptr, bool
bRecordAllViews = true) const;
virtual bool HasChangeRecordProtection() const;
- virtual void SetChangeRecording( bool bActivate, bool bLockAllViews =
false, bool bRecordAllViews = true );
+ virtual void SetChangeRecording( bool bActivate, bool bLockAllViews =
false, SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic );
virtual void SetProtectionPassword( const OUString &rPassword );
virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 >
&rPasswordHash );
diff --git a/include/sfx2/redlinerecordingmode.hxx
b/include/sfx2/redlinerecordingmode.hxx
new file mode 100644
index 000000000000..fabd741df4b2
--- /dev/null
+++ b/include/sfx2/redlinerecordingmode.hxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+/// Decides how new redline flags affect the views
+enum class SfxRedlineRecordingMode
+{
+ /// Model and current view only: to set new flags & restore old ones later
+ ViewAgnostic,
+ /// Have recording on in this view
+ ThisView,
+ /// Have recording on in all views
+ AllViews,
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e9ace1fdfd3d..eee54aacb342 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3409,7 +3409,7 @@ bool ScDocShell::HasChangeRecordProtection() const
return bRes;
}
-void ScDocShell::SetChangeRecording( bool bActivate, bool /*bLockAllViews*/,
bool /*bRecordAllViews*/ )
+void ScDocShell::SetChangeRecording( bool bActivate, bool /*bLockAllViews*/,
SfxRedlineRecordingMode /*eRedlineRecordingMode*/)
{
bool bOldChangeRecording = IsChangeRecording();
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index ee9c642fea2d..c29eba3d9160 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -427,7 +427,7 @@ public:
// see also: FID_CHG_RECORD, SID_CHG_PROTECT
virtual bool IsChangeRecording(SfxViewShell* pViewShell = nullptr, bool
bRecordAllViews = true) const override;
virtual bool HasChangeRecordProtection() const override;
- virtual void SetChangeRecording( bool bActivate, bool bLockAllViews =
false, bool bRecordAllViews = true ) override;
+ virtual void SetChangeRecording( bool bActivate, bool bLockAllViews =
false, SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic) override;
virtual void SetProtectionPassword( const OUString &rPassword )
override;
virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 >
&rPasswordHash ) override;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 978bdbd5f579..71b372ca4b5e 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1140,7 +1140,7 @@ bool SfxObjectShell::HasChangeRecordProtection() const
}
-void SfxObjectShell::SetChangeRecording( bool /*bActivate*/, bool
/*bLockAllViews*/, bool /*bRecordAllViews*/ )
+void SfxObjectShell::SetChangeRecording( bool /*bActivate*/, bool
/*bLockAllViews*/, SfxRedlineRecordingMode /*eRedlineRecordingMode*/)
{
// currently this function needs to be overwritten by Writer and Calc only
SAL_WARN( "sfx.doc", "function not implemented" );
diff --git a/sw/inc/IDocumentRedlineAccess.hxx
b/sw/inc/IDocumentRedlineAccess.hxx
index 804678479ab1..7861a5858421 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/uno/Sequence.h>
#include <o3tl/typed_flags_set.hxx>
#include <svx/ctredlin.hxx>
+#include <sfx2/redlinerecordingmode.hxx>
#include "docary.hxx"
@@ -107,14 +108,14 @@ public:
@param eMode
[in] the new redline mode.
*/
- virtual void SetRedlineFlags_intern(/*[in]*/RedlineFlags eMode, bool
bRecordAllViews = true, bool bRecordModeChange = false) = 0;
+ virtual void SetRedlineFlags_intern(/*[in]*/RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic, bool bRecordModeChange = false) = 0;
/** Set a new redline mode.
@param eMode
[in] the new redline mode.
*/
- virtual void SetRedlineFlags(/*[in]*/RedlineFlags eMode, bool
bRecordAllViews = true, bool bRecordModeChange = false) = 0;
+ virtual void SetRedlineFlags(/*[in]*/RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic, bool bRecordModeChange = false) = 0;
/** Query if redlining is on.
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index d67471627c5c..767234155d5f 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -323,7 +323,7 @@ public:
see also: FN_REDLINE_ON, FN_REDLINE_ON */
virtual bool IsChangeRecording(SfxViewShell* pViewShell = nullptr, bool
bRecordAllViews = true) const override;
virtual bool HasChangeRecordProtection() const override;
- virtual void SetChangeRecording( bool bActivate, bool bLockAllViews =
false, bool bRecordAllViews = true ) override;
+ virtual void SetChangeRecording( bool bActivate, bool bLockAllViews =
false, SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic) override;
virtual void SetProtectionPassword( const OUString &rPassword )
override;
virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 >
&rPasswordHash ) override;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 00ed2ad9dacf..3568be169fad 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_SW_INC_EDITSH_HXX
#define INCLUDED_SW_INC_EDITSH_HXX
+#include <sfx2/redlinerecordingmode.hxx>
+
#include "crsrsh.hxx"
#include "charfmt.hxx"
@@ -953,7 +955,7 @@ public:
/// For Redlining.
SW_DLLPUBLIC RedlineFlags GetRedlineFlags() const;
- SW_DLLPUBLIC void SetRedlineFlags( RedlineFlags eMode, bool
bRecordAllViews = true );
+ SW_DLLPUBLIC void SetRedlineFlags( RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic );
bool IsRedlineOn() const;
SW_DLLPUBLIC SwRedlineTable::size_type GetRedlineCount() const;
const SwRangeRedline& GetRedline( SwRedlineTable::size_type nPos ) const;
diff --git a/sw/qa/extras/tiledrendering/tiledrendering2.cxx
b/sw/qa/extras/tiledrendering/tiledrendering2.cxx
index 5055dbdf8024..00ffe811b821 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering2.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering2.cxx
@@ -684,6 +684,33 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest,
testControlCodesCursor)
// cursor when showing formatting marks.
CPPUNIT_ASSERT(!aView1.m_bCursorVisible);
}
+
+CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTrackChangesInsertUndo)
+{
+ // Given a document with 2 views, first view enables redline record for
that view only:
+ SwXTextDocument* pXTextDocument = createDoc();
+ CPPUNIT_ASSERT(pXTextDocument);
+ SwTestViewCallback aView1;
+ int nView1 = SfxLokHelper::getView();
+ SwView* pView1 = pXTextDocument->GetDocShell()->GetView();
+ SwWrtShell* pWrtShell1 = pXTextDocument->GetDocShell()->GetWrtShell();
+ SfxLokHelper::createView();
+ SwTestViewCallback aView2;
+ SfxLokHelper::setView(nView1);
+ comphelper::dispatchCommand(".uno:TrackChangesInThisView", {});
+
+ // When typing and undoing:
+ pWrtShell1->Insert(u"A"_ustr);
+ pWrtShell1->Undo();
+
+ // Then make sure the record mode doesn't change:
+ std::unique_ptr<SfxPoolItem> pItem;
+
pView1->GetViewFrame().GetBindings().QueryState(FN_TRACK_CHANGES_IN_THIS_VIEW,
pItem);
+
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(FN_TRACK_CHANGES_IN_THIS_VIEW),
pItem->Which());
+ // Without the accompanying fix in place, this test would have failed,
undo changed "this view"
+ // record mode to "all views", which is unexpected.
+ CPPUNIT_ASSERT(dynamic_cast<SfxBoolItem*>(pItem.get())->GetValue());
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 58f76bd4f0a1..c4d975df58ea 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1171,7 +1171,7 @@ RedlineFlags
DocumentRedlineManager::GetRedlineFlags(const SwViewShell* pViewShe
return eRedlineFlags;
}
-void DocumentRedlineManager::SetRedlineFlags( RedlineFlags eMode, bool
bRecordAllViews, bool bRecordModeChange )
+void DocumentRedlineManager::SetRedlineFlags( RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode, bool bRecordModeChange )
{
if( GetRedlineFlags() == eMode && !bRecordModeChange )
return;
@@ -1244,7 +1244,7 @@ void DocumentRedlineManager::SetRedlineFlags(
RedlineFlags eMode, bool bRecordAl
m_rDoc.SetInXMLImport( bSaveInXMLImportFlag );
}
- SetRedlineFlags_intern(eMode, bRecordAllViews, bRecordModeChange);
+ SetRedlineFlags_intern(eMode, eRedlineRecordingMode, bRecordModeChange);
m_rDoc.getIDocumentState().SetModified();
// #TODO - add 'SwExtraRedlineTable' also ?
@@ -1260,12 +1260,25 @@ bool DocumentRedlineManager::IsIgnoreRedline() const
return bool(RedlineFlags::Ignore & GetRedlineFlags());
}
-void DocumentRedlineManager::SetRedlineFlags_intern(RedlineFlags eMode, bool
bRecordAllViews, bool bRecordModeChange)
+void DocumentRedlineManager::SetRedlineFlags_intern(RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode, bool bRecordModeChange)
{
SwDocShell* pDocShell = m_rDoc.GetDocShell();
SwViewShell* pViewShell = pDocShell ? pDocShell->GetWrtShell() : nullptr;
- if (pViewShell)
+ if (pViewShell && eRedlineRecordingMode ==
SfxRedlineRecordingMode::ViewAgnostic)
+ {
+ // Just set the requested flags on the model and on the current view,
so setting flags &
+ // restoring them result in the same state (no matter if that was
this-view or all-views).
+ auto bRedlineRecordingOn = bool(eMode & RedlineFlags::On);
+ SwViewOption aOpt(*pViewShell->GetViewOptions());
+ if (aOpt.IsRedlineRecordingOn() != bRedlineRecordingOn)
+ {
+ aOpt.SetRedlineRecordingOn(bRedlineRecordingOn);
+ pViewShell->ApplyViewOptions(aOpt);
+ }
+ }
+ else if (pViewShell)
{
+ bool bRecordAllViews = eRedlineRecordingMode ==
SfxRedlineRecordingMode::AllViews;
// Recording may be per-view, the rest is per-document.
for(SwViewShell& rSh : pViewShell->GetRingContainer())
{
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index 8c1955cad571..bb50961de030 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -34,16 +34,21 @@ RedlineFlags SwEditShell::GetRedlineFlags() const
return GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags(this);
}
-void SwEditShell::SetRedlineFlags( RedlineFlags eMode, bool bRecordAllViews )
+void SwEditShell::SetRedlineFlags( RedlineFlags eMode, SfxRedlineRecordingMode
eRedlineRecordingMode)
{
if (SwDocShell* pDocSh = GetDoc()->GetDocShell())
{
- bool bRecordModeChange = bRecordAllViews !=
pDocSh->IsChangeRecording(nullptr, bRecordAllViews);
+ bool bRecordModeChange = false;
+ if (eRedlineRecordingMode != SfxRedlineRecordingMode::ViewAgnostic)
+ {
+ bool bRecordAllViews = eRedlineRecordingMode ==
SfxRedlineRecordingMode::AllViews;
+ bRecordModeChange = bRecordAllViews !=
pDocSh->IsChangeRecording(nullptr, bRecordAllViews);
+ }
if( eMode != GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags()
|| bRecordModeChange )
{
CurrShell aCurr( this );
StartAllAction();
- GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eMode,
bRecordAllViews, bRecordModeChange );
+ GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eMode,
eRedlineRecordingMode, bRecordModeChange );
EndAllAction();
}
}
@@ -135,7 +140,7 @@ void
SwEditShell::ReinstateRedline(SwRedlineTable::size_type nPos)
if (!IsRedlineOn())
{
RedlineFlags nMode = GetRedlineFlags();
- SetRedlineFlags(nMode | RedlineFlags::On, /*bRecordAllViews=*/false);
+ SetRedlineFlags(nMode | RedlineFlags::On,
SfxRedlineRecordingMode::ThisView);
}
SwRangeRedline& rRedline = GetRedline(nPos);
@@ -237,7 +242,7 @@ void SwEditShell::ReinstateRedlinesInSelection()
if (!IsRedlineOn())
{
RedlineFlags nMode = GetRedlineFlags();
- SetRedlineFlags(nMode | RedlineFlags::On, /*bRecordAllViews=*/false);
+ SetRedlineFlags(nMode | RedlineFlags::On,
SfxRedlineRecordingMode::ThisView);
}
SwPosition aCursorStart(*GetCursor()->Start());
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx
b/sw/source/core/inc/DocumentRedlineManager.hxx
index e55d9ca79e86..784189c9ff59 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -38,9 +38,9 @@ public:
*/
virtual RedlineFlags GetRedlineFlags(const SwViewShell* pViewShell =
nullptr) const override;
- virtual void SetRedlineFlags_intern(/*[in]*/RedlineFlags eMode, bool
bRecordAllViews = true, bool bRecordModeChange = false) override;
+ virtual void SetRedlineFlags_intern(/*[in]*/RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic, bool bRecordModeChange = false) override;
- virtual void SetRedlineFlags(/*[in]*/RedlineFlags eMode, bool
bRecordAllViews = true, bool bRecordModeChange = false) override;
+ virtual void SetRedlineFlags(/*[in]*/RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic, bool bRecordModeChange = false) override;
virtual bool IsRedlineOn() const override;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index a95be1457362..6fc966e19bdd 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1399,7 +1399,7 @@ bool SwDocShell::HasChangeRecordProtection() const
return
m_pWrtShell->getIDocumentRedlineAccess().GetRedlinePassword().hasElements();
}
-void SwDocShell::SetChangeRecording( bool bActivate, bool bLockAllViews, bool
bRecordAllViews )
+void SwDocShell::SetChangeRecording( bool bActivate, bool bLockAllViews,
SfxRedlineRecordingMode eRedlineRecordingMode)
{
RedlineFlags nOn = bActivate ? RedlineFlags::On : RedlineFlags::NONE;
RedlineFlags nMode = m_pWrtShell->GetRedlineFlags();
@@ -1407,11 +1407,11 @@ void SwDocShell::SetChangeRecording( bool bActivate,
bool bLockAllViews, bool bR
{
// tdf#107870: prevent jumping to cursor
auto aViewGuard(LockAllViews());
- m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode &
~RedlineFlags::On) | nOn, bRecordAllViews );
+ m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode &
~RedlineFlags::On) | nOn, eRedlineRecordingMode );
}
else
{
- m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode &
~RedlineFlags::On) | nOn, bRecordAllViews );
+ m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode &
~RedlineFlags::On) | nOn, eRedlineRecordingMode );
}
}
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index ea8ec1a1166d..9b5ce7e9ba3f 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -29,6 +29,7 @@
#include <o3tl/typed_flags_set.hxx>
#include <svx/swframetypes.hxx>
#include <vcl/weld.hxx>
+#include <sfx2/redlinerecordingmode.hxx>
#include <doc.hxx>
#include <docsh.hxx>
@@ -179,7 +180,7 @@ public:
void SetInsMode( bool bOn = true );
void ToggleInsMode() { SetInsMode( !m_bIns ); }
bool IsInsMode() const { return m_bIns; }
- SW_DLLPUBLIC void SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode, bool
bRecordAllViews = true );
+ SW_DLLPUBLIC void SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::ViewAgnostic);
SW_DLLPUBLIC void EnterSelFrameMode(const Point *pStartDrag = nullptr);
SW_DLLPUBLIC void LeaveSelFrameMode();
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 71424e12d751..44b47540a977 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -807,8 +807,12 @@ void SwView::Execute(SfxRequest &rReq)
}
SwDocShell* pDocShell = GetDocShell();
- bool bRecordAllViews = nSlot != FN_TRACK_CHANGES_IN_THIS_VIEW;
- pDocShell->SetChangeRecording( oOn.value(),
/*bLockAllViews=*/true, bRecordAllViews );
+ SfxRedlineRecordingMode eRedlineRecordingMode =
SfxRedlineRecordingMode::AllViews;
+ if (nSlot == FN_TRACK_CHANGES_IN_THIS_VIEW)
+ {
+ eRedlineRecordingMode = SfxRedlineRecordingMode::ThisView;
+ }
+ pDocShell->SetChangeRecording( oOn.value(),
/*bLockAllViews=*/true, eRedlineRecordingMode );
// Notify all view shells of this document, as the track
changes mode is document-global.
for (SfxViewFrame* pViewFrame =
SfxViewFrame::GetFirst(pDocShell); pViewFrame; pViewFrame =
SfxViewFrame::GetNext(*pViewFrame, pDocShell))
diff --git a/sw/source/uibase/wrtsh/select.cxx
b/sw/source/uibase/wrtsh/select.cxx
index dd57576359f7..3dfb059399d2 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -749,9 +749,9 @@ void SwWrtShell::SetInsMode( bool bOn )
}
//Overwrite mode is incompatible with red-lining
-void SwWrtShell::SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode, bool
bRecordAllViews )
+void SwWrtShell::SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode,
SfxRedlineRecordingMode eRedlineRecordingMode )
{
- SetRedlineFlags( eMode, bRecordAllViews );
+ SetRedlineFlags( eMode, eRedlineRecordingMode );
if (IsRedlineOn())
SetInsMode();
}
