Rebased ref, commits from common ancestor:
commit 2c22163ec4cb76e20850c711313f03a838b65729
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Nov 9 16:04:17 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Nov 13 19:11:29 2018 +0100
sw_redlinehide_3: update fields on redline ops
Can't tell which chapter/reference fields will be affected by a redline,
so we have to either update all of them, or rely on the
IDocumentSettingAccess::getFieldUpdateFlags() which lets the SwIdle
update the fields, at some later time...
Change-Id: I3b9cfd17bd227a18f64dac193f0cc912768810c1
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 0d4448a79079..96513369cc4a 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -22,6 +22,7 @@
#include <txtfrm.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
+#include <IDocumentFieldsAccess.hxx>
#include <IDocumentState.hxx>
#include <redline.hxx>
#include <UndoRedline.hxx>
@@ -29,6 +30,7 @@
#include <ndtxt.hxx>
#include <unocrsr.hxx>
#include <ftnidx.hxx>
+#include <authfld.hxx>
#include <strings.hrc>
#include <swmodule.hxx>
#include <editsh.hxx>
@@ -119,6 +121,15 @@ using namespace com::sun::star;
namespace sw {
+static void UpdateFieldsForRedline(IDocumentFieldsAccess & rIDFA)
+{
+ static_cast<SwAuthorityFieldType*>(rIDFA.GetFieldType(
+ SwFieldIds::TableOfAuthorities, OUString(),
false))->DelSequenceArray();
+ rIDFA.GetSysFieldType(SwFieldIds::Chapter)->UpdateFields();
+ rIDFA.UpdateExpFields(nullptr, false);
+ rIDFA.UpdateRefFields();
+}
+
void UpdateFramesForAddDeleteRedline(SwDoc & rDoc, SwPaM const& rPam)
{
// no need to call UpdateFootnoteNums for FTNNUM_PAGE:
@@ -148,6 +159,8 @@ void UpdateFramesForAddDeleteRedline(SwDoc & rDoc, SwPaM
const& rPam)
// node of the merged frame, there could be another redline nearby
sw::AddRemoveFlysAnchoredToFrameStartingAtNode(*pFrame, *pStartNode,
nullptr);
}
+ // fields last - SwGetRefField::UpdateField requires up-to-date frames
+ UpdateFieldsForRedline(rDoc.getIDocumentFieldsAccess()); // after footnotes
}
void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM const& rPam)
@@ -205,6 +218,8 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM
const& rPam)
AppendAllObjs(rDoc.GetSpzFrameFormats(), pLayout);
}
}
+ // fields last - SwGetRefField::UpdateField requires up-to-date frames
+ UpdateFieldsForRedline(rDoc.getIDocumentFieldsAccess()); // after footnotes
}
} // namespace sw
commit fa52f989197689290041d778f841091d06dd2e1c
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Nov 9 12:50:04 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Nov 13 19:11:29 2018 +0100
sw_redlinehide_3: update fields in UnHideRedlines
Repainting is not enough, values require up-to-date outline visibility
etc.
Change-Id: I85d99fc65a071279c2d4656a52ff82ed3b2db7d8
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index eb8a0fa12368..fd3ab2b10dd0 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -4504,6 +4504,10 @@ void SwRootFrame::SetHideRedlines(bool const
bHideRedlines)
pFootnote->InvalidateNumberInLayout();
}
}
+ // update various fields to re-expand them with the new layout
+
rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::Chapter)->UpdateFields();
+ rDoc.getIDocumentFieldsAccess().UpdateExpFields(nullptr, false);
+ rDoc.getIDocumentFieldsAccess().UpdateRefFields();
// InvalidateAllContent(SwInvalidateFlags::Size); // ??? TODO what to
invalidate? this is the big hammer
}
commit b52052d8c67e21612f1530b7c661c12f092fbd8b
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Nov 13 18:53:50 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Nov 13 19:11:29 2018 +0100
sw_redlinehide_3: add second result to SwAuthorityField
... and SwAuthorityFieldType, which needs 2 lists of the fields because
each citation may occur multiple times, so their order might change on
deletions.
This is for when there is a bibliography in the document, and it is set
to IsSequence(), i.e.,
insert Bibliography -> Number entries -> Sort by document position...
Change-Id: Iba2c31267aeebacb779713567eeb0aa6659afefb
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 617ea990614c..00ceff6fcc2a 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -39,6 +39,7 @@ enum class SwFieldIds : sal_uInt16;
template <class T> class SwHashTable;
struct HashStr;
class SwRootFrame;
+class IDocumentRedlineAccess;
namespace rtl { class OUString; }
using rtl::OUString;
@@ -139,6 +140,11 @@ protected:
virtual ~IDocumentFieldsAccess() {};
};
+namespace sw {
+bool IsFieldDeletedInModel(IDocumentRedlineAccess const& rIDRA,
+ SwTextField const& rTextField);
+}
+
#endif // INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index c6bab5ccf91c..72837f765c65 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -62,6 +62,7 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
SwDoc* m_pDoc;
SwAuthDataArr m_DataArr;
std::vector<sal_IntPtr> m_SequArr;
+ std::vector<sal_IntPtr> m_SequArrRLHidden; ///< hidden redlines
SortKeyArr m_SortKeyArr;
sal_Unicode m_cPrefix;
sal_Unicode m_cSuffix;
@@ -90,6 +91,7 @@ public:
void DelSequenceArray()
{
m_SequArr.clear();
+ m_SequArrRLHidden.clear();
}
const SwAuthEntry* GetEntryByHandle(sal_IntPtr nHandle) const;
@@ -102,7 +104,7 @@ public:
sal_uInt16 AppendField(const SwAuthEntry& rInsert);
sal_IntPtr GetHandle(sal_uInt16 nPos);
- sal_uInt16 GetSequencePos(sal_IntPtr nHandle);
+ sal_uInt16 GetSequencePos(sal_IntPtr nHandle, SwRootFrame const*
pLayout);
bool IsSequence() const {return m_bIsSequence;}
void SetSequence(bool bSet)
@@ -142,20 +144,29 @@ public:
};
+/** invariant for SwAuthorityField is that it is always registered at its
+ SwAuthorityFieldType via AddField()/RemoveField() & therefore has m_nHandle
+ set - but it's possible that multiple SwAuthorityField have the same
+ m_nHandle & so the number of instances is an upper bound on
+ SwAuthorityField::m_DataArr.size() - it's not clear to me if more than one
+ one of the instances with the same m_nHandle is actually in the document,
+ they're all cloned via CopyField()...
+ */
class SwAuthorityField : public SwField
{
sal_IntPtr m_nHandle;
mutable sal_IntPtr m_nTempSequencePos;
+ mutable sal_IntPtr m_nTempSequencePosRLHidden; ///< hidden redlines
virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override;
virtual std::unique_ptr<SwField> Copy() const override;
public:
/// For internal use only, in general continue using ExpandField() instead.
- OUString ConditionalExpandAuthIdentifier() const;
+ OUString ConditionalExpandAuthIdentifier(SwRootFrame const* pLayout) const;
//To handle Citation
- SW_DLLPUBLIC OUString ExpandCitation(ToxAuthorityField eField) const;
+ SW_DLLPUBLIC OUString ExpandCitation(ToxAuthorityField eField, SwRootFrame
const* pLayout) const;
SwAuthorityField(SwAuthorityFieldType* pType, const OUString&
rFieldContents);
SwAuthorityField(SwAuthorityFieldType* pType, sal_IntPtr nHandle);
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index e089f88ec7fb..afd615b24afd 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -59,6 +59,21 @@
using namespace ::com::sun::star::uno;
+namespace sw
+{
+ bool IsFieldDeletedInModel(IDocumentRedlineAccess const& rIDRA,
+ SwTextField const& rTextField)
+ {
+ SwRedlineTable::size_type tmp;
+ SwPosition const pos(const_cast<SwTextNode&>(rTextField.GetTextNode()),
+ rTextField.GetStart());
+ SwRangeRedline const*const pRedline(rIDRA.GetRedline(pos, &tmp));
+ return (pRedline
+ && pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE
+ && *pRedline->GetPoint() != *pRedline->GetMark());
+ }
+}
+
namespace
{
#if HAVE_FEATURE_DBCONNECTIVITY
@@ -94,13 +109,7 @@ namespace
// for *any* layout...
return true;
}
- SwRedlineTable::size_type tmp;
- SwPosition const pos(const_cast<SwTextNode&>(rTextField.GetTextNode()),
- rTextField.GetStart());
- SwRangeRedline const*const pRedline(rIDRA.GetRedline(pos, &tmp));
- return (pRedline
- && pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE
- && *pRedline->GetPoint() != *pRedline->GetMark());
+ return sw::IsFieldDeletedInModel(rIDRA, rTextField);
}
void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const SetGetExpField&
rSGEField,
diff --git a/sw/source/core/fields/authfld.cxx
b/sw/source/core/fields/authfld.cxx
index 034a221e72e5..1e9c1ab6ed74 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -30,6 +30,7 @@
#include <expfld.hxx>
#include <pam.hxx>
#include <cntfrm.hxx>
+#include <rootfrm.hxx>
#include <tox.hxx>
#include <txmsrt.hxx>
#include <doctxm.hxx>
@@ -231,7 +232,8 @@ sal_IntPtr SwAuthorityFieldType::GetHandle(sal_uInt16 nPos)
return 0;
}
-sal_uInt16 SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
+sal_uInt16 SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle,
+ SwRootFrame const*const pLayout)
{
//find the field in a sorted array of handles,
#if OSL_DEBUG_LEVEL > 0
@@ -241,7 +243,11 @@ sal_uInt16
SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
DelSequenceArray();
if(m_SequArr.empty())
{
+ IDocumentRedlineAccess const&
rIDRA(m_pDoc->getIDocumentRedlineAccess());
+ // sw_redlinehide: need 2 arrays because the sorting may be different,
+ // if multiple fields refer to the same entry and first one is deleted
std::vector<std::unique_ptr<SwTOXSortTabBase>> aSortArr;
+ std::vector<std::unique_ptr<SwTOXSortTabBase>> aSortArrRLHidden;
SwIterator<SwFormatField,SwFieldType> aIter( *this );
SwTOXInternational aIntl(m_eLanguage, SwTOIOptions::NONE,
m_sSortAlgorithm);
@@ -268,16 +274,21 @@ sal_uInt16
SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
//body the directly available text node will be used
if(!pTextNode)
pTextNode = &rFieldTextNode;
- if (!pTextNode->GetText().isEmpty() &&
- pTextNode->getLayoutFrame(
rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ) &&
- pTextNode->GetNodes().IsDocNodes() )
+ if (pTextNode->GetText().isEmpty()
+ ||
!pTextNode->getLayoutFrame(rDoc.getIDocumentLayoutAccess().GetCurrentLayout())
+ || !pTextNode->GetNodes().IsDocNodes())
+ {
+ continue;
+ }
+ auto const InsertImpl = [&aIntl, pTextNode, pFormatField]
+ (std::vector<std::unique_ptr<SwTOXSortTabBase>> & rSortArr)
{
std::unique_ptr<SwTOXAuthority> pNew(
new SwTOXAuthority(*pTextNode, *pFormatField, aIntl));
- for(size_t i = 0; i < aSortArr.size(); ++i)
+ for (size_t i = 0; i < rSortArr.size(); ++i)
{
- SwTOXSortTabBase* pOld = aSortArr[i].get();
+ SwTOXSortTabBase* pOld = rSortArr[i].get();
if(*pOld == *pNew)
{
//only the first occurrence in the document
@@ -285,7 +296,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(sal_IntPtr
nHandle)
if(*pOld < *pNew)
pNew.reset();
else // remove the old content
- aSortArr.erase(aSortArr.begin() + i);
+ rSortArr.erase(rSortArr.begin() + i);
break;
}
}
@@ -294,31 +305,41 @@ sal_uInt16
SwAuthorityFieldType::GetSequencePos(sal_IntPtr nHandle)
{
size_t j {0};
- while(j < aSortArr.size())
+ while (j < rSortArr.size())
{
- SwTOXSortTabBase* pOld = aSortArr[j].get();
+ SwTOXSortTabBase* pOld = rSortArr[j].get();
if(*pNew < *pOld)
break;
++j;
}
- aSortArr.insert(aSortArr.begin() + j, std::move(pNew));
+ rSortArr.insert(rSortArr.begin() + j, std::move(pNew));
}
+ };
+ InsertImpl(aSortArr);
+ if (!sw::IsFieldDeletedInModel(rIDRA, *pTextField))
+ {
+ InsertImpl(aSortArrRLHidden);
}
}
for(auto & pBase : aSortArr)
{
- SwTOXSortTabBase& rBase = *pBase;
- SwFormatField& rFormatField =
static_cast<SwTOXAuthority&>(rBase).GetFieldFormat();
+ SwFormatField& rFormatField =
static_cast<SwTOXAuthority&>(*pBase).GetFieldFormat();
SwAuthorityField* pAField =
static_cast<SwAuthorityField*>(rFormatField.GetField());
m_SequArr.push_back(pAField->GetHandle());
}
- aSortArr.clear();
+ for (auto & pBase : aSortArrRLHidden)
+ {
+ SwFormatField& rFormatField =
static_cast<SwTOXAuthority&>(*pBase).GetFieldFormat();
+ SwAuthorityField* pAField =
static_cast<SwAuthorityField*>(rFormatField.GetField());
+ m_SequArrRLHidden.push_back(pAField->GetHandle());
+ }
}
//find nHandle
- for(std::vector<sal_IntPtr>::size_type i = 0; i < m_SequArr.size(); ++i)
+ auto const& rSequArr(pLayout && pLayout->IsHideRedlines() ?
m_SequArrRLHidden : m_SequArr);
+ for (std::vector<sal_IntPtr>::size_type i = 0; i < rSequArr.size(); ++i)
{
- if(m_SequArr[i] == nHandle)
+ if (rSequArr[i] == nHandle)
{
return i + 1;
}
@@ -491,17 +512,19 @@ void SwAuthorityFieldType::SetSortKeys(sal_uInt16
nKeyCount, SwTOXSortKey const
SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pInitType,
const OUString& rFieldContents )
- : SwField(pInitType),
- m_nTempSequencePos( -1 )
+ : SwField(pInitType)
+ , m_nTempSequencePos( -1 )
+ , m_nTempSequencePosRLHidden( -1 )
{
m_nHandle = pInitType->AddField( rFieldContents );
}
SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pInitType,
sal_IntPtr nSetHandle )
- : SwField( pInitType ),
- m_nHandle( nSetHandle ),
- m_nTempSequencePos( -1 )
+ : SwField( pInitType )
+ , m_nHandle( nSetHandle )
+ , m_nTempSequencePos( -1 )
+ , m_nTempSequencePosRLHidden( -1 )
{
pInitType->AddField( m_nHandle );
}
@@ -511,12 +534,13 @@ SwAuthorityField::~SwAuthorityField()
static_cast<SwAuthorityFieldType* >(GetTyp())->RemoveField(m_nHandle);
}
-OUString SwAuthorityField::ExpandImpl(SwRootFrame const*const) const
+OUString SwAuthorityField::ExpandImpl(SwRootFrame const*const pLayout) const
{
- return ConditionalExpandAuthIdentifier();
+ return ConditionalExpandAuthIdentifier(pLayout);
}
-OUString SwAuthorityField::ConditionalExpandAuthIdentifier() const
+OUString SwAuthorityField::ConditionalExpandAuthIdentifier(
+ SwRootFrame const*const pLayout) const
{
SwAuthorityFieldType* pAuthType =
static_cast<SwAuthorityFieldType*>(GetTyp());
OUString sRet;
@@ -525,10 +549,12 @@ OUString
SwAuthorityField::ConditionalExpandAuthIdentifier() const
if( pAuthType->IsSequence() )
{
+ sal_IntPtr & rnTempSequencePos(pLayout && pLayout->IsHideRedlines()
+ ? m_nTempSequencePosRLHidden : m_nTempSequencePos);
if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked())
- m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
- if( m_nTempSequencePos >= 0 )
- sRet += OUString::number( m_nTempSequencePos );
+ rnTempSequencePos = pAuthType->GetSequencePos(m_nHandle, pLayout);
+ if (0 <= rnTempSequencePos)
+ sRet += OUString::number(rnTempSequencePos);
}
else
{
@@ -542,17 +568,20 @@ OUString
SwAuthorityField::ConditionalExpandAuthIdentifier() const
return sRet;
}
-OUString SwAuthorityField::ExpandCitation(ToxAuthorityField eField) const
+OUString SwAuthorityField::ExpandCitation(ToxAuthorityField eField,
+ SwRootFrame const*const pLayout) const
{
SwAuthorityFieldType* pAuthType =
static_cast<SwAuthorityFieldType*>(GetTyp());
OUString sRet;
if( pAuthType->IsSequence() )
{
+ sal_IntPtr & rnTempSequencePos(pLayout && pLayout->IsHideRedlines()
+ ? m_nTempSequencePosRLHidden : m_nTempSequencePos);
if(!pAuthType->GetDoc()->getIDocumentFieldsAccess().IsExpFieldsLocked())
- m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
- if( m_nTempSequencePos >= 0 )
- sRet += OUString::number( m_nTempSequencePos );
+ rnTempSequencePos = pAuthType->GetSequencePos(m_nHandle, pLayout);
+ if (0 <= rnTempSequencePos)
+ sRet += OUString::number(rnTempSequencePos);
}
else
{
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 7be1be2d0f11..a5008b4c4e3a 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -418,7 +418,7 @@ SwField::ExpandField(bool const bCached, SwRootFrame
const*const pLayout) const
if (GetTypeId() == TYP_AUTHORITY)
{
const SwAuthorityField* pAuthorityField = static_cast<const
SwAuthorityField*>(this);
- m_Cache = pAuthorityField->ConditionalExpandAuthIdentifier();
+ m_Cache =
pAuthorityField->ConditionalExpandAuthIdentifier(pLayout);
}
else
m_Cache = ExpandImpl(pLayout);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 796c6e621f8e..756cf145443a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1940,7 +1940,7 @@ void DocxAttributeOutput::EndField_Impl( const
SwTextNode* pNode, sal_Int32 nPos
if(rInfos.eType == ww::eCITATION)
{
sExpand = static_cast<SwAuthorityField const*>(rInfos.pField.get())
- ->ExpandCitation(AUTH_FIELD_TITLE);
+ ->ExpandCitation(AUTH_FIELD_TITLE, nullptr);
}
else
{
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cbe0fa6ac810..3deb8c137891 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2993,7 +2993,7 @@ void AttributeOutputBase::TextField( const SwFormatField&
rField )
case SwFieldIds::TableOfAuthorities:
{
OUString sRet(static_cast<SwAuthorityField const*>(pField)
- ->ExpandCitation(AUTH_FIELD_IDENTIFIER));
+ ->ExpandCitation(AUTH_FIELD_IDENTIFIER, nullptr));
// FIXME: DomainMapper_Impl::CloseFieldCommand() stuffs fully formed
// field instructions in here, but if the field doesn't originate
// from those filters it won't have that
commit f243598a3354b9a1dc4df4b1f305a442dc930096
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Nov 13 11:00:33 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Nov 13 15:56:34 2018 +0100
sw_redlinehide_3: add second result to SwGetExpField, SwSetExpField
This is quite tricky & somewhat ugly due to the SwValueField base class
& we need to duplicate its member too :(
It would be possible to filter the deleted fields in
SwDocUpdateField::MakeFieldList(), but the problem with that is that
the instance is long-lived & might be used with different layout
settings, so it's probably better to filter in the 5 or so client
functions that iterate over the GetSortList().
Note that this will also filter other fields including database fields,
hopefully that shouldn't cause problems.
Change-Id: I0cdbc7757fa529598b5dbceec0bd2c4a619be05a
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 5b8299ac14db..617ea990614c 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -38,6 +38,7 @@ class SwNode;
enum class SwFieldIds : sal_uInt16;
template <class T> class SwHashTable;
struct HashStr;
+class SwRootFrame;
namespace rtl { class OUString; }
using rtl::OUString;
@@ -122,9 +123,9 @@ namespace com { namespace sun { namespace star { namespace
uno { class Any; } }
// (if the address != 0 and the pointer == 0 a new list will be returned).
virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16
nLastCnt) = 0;
- virtual void FieldsToCalc(SwCalc& rCalc, const SetGetExpField&
rToThisField) = 0;
+ virtual void FieldsToCalc(SwCalc& rCalc, const SetGetExpField&
rToThisField, SwRootFrame const* pLayout) = 0;
- virtual void FieldsToExpand(SwHashTable<HashStr> & rTable, const
SetGetExpField& rToThisField) = 0;
+ virtual void FieldsToExpand(SwHashTable<HashStr> & rTable, const
SetGetExpField& rToThisField, SwRootFrame const& rLayout) = 0;
virtual bool IsNewFieldLst() const = 0;
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 96b52b576743..f9fd74c09c57 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -31,6 +31,7 @@ class SwCalc;
class SwTableBox;
class SwTableFormulaUpdate;
class SwDoc;
+class SwRootFrame;
class SwTableCalcPara
{
@@ -38,11 +39,12 @@ class SwTableCalcPara
sal_uInt16 m_nStackCount, m_nMaxSize;
public:
+ SwRootFrame const*const m_pLayout; ///< layout to access text field results
std::unique_ptr<SwTableSortBoxes> m_pBoxStack; ///< stack for recognizing
recursion
SwCalc& m_rCalc; ///< current Calculator
const SwTable* m_pTable; ///< current table
- SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable );
+ SwTableCalcPara(SwCalc& rCalculator, const SwTable& rTable, SwRootFrame
const* pLayout);
~SwTableCalcPara();
bool CalcWithStackOverflow();
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 7ec48a69af5d..c82d1e0edab8 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -80,7 +80,9 @@ protected:
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
{
+ double m_fValueRLHidden; ///< SwValueField; hidden redlines
OUString m_sExpand;
+ OUString m_sExpandRLHidden; ///< hidden redlines
bool m_bIsInBodyText;
sal_uInt16 m_nSubType;
@@ -88,15 +90,19 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override;
virtual std::unique_ptr<SwField> Copy() const override;
+ using SwFormulaField::GetValue; // hide it, don't use
+ virtual void SetValue(const double& rVal) override; // hide it
public:
SwGetExpField( SwGetExpFieldType*, const OUString& rFormel,
sal_uInt16 nSubType, sal_uLong nFormat);
- virtual void SetValue( const double& rVal ) override;
+ double GetValue(SwRootFrame const* pLayout) const;
+ void SetValue(const double& rVal, SwRootFrame const* pLayout);
+
virtual void SetLanguage(LanguageType nLng) override;
- inline void ChgExpStr(const OUString& rExpand);
+ void ChgExpStr(const OUString& rExpand, SwRootFrame const*
pLayout);
/// Called by formatting.
inline bool IsInBodyText() const;
@@ -124,9 +130,6 @@ public:
void SetLateInitialization() { m_bLateInitialization =
true;}
};
-inline void SwGetExpField::ChgExpStr(const OUString& rExpand)
- { m_sExpand = rExpand;}
-
/// Called by formatting.
inline bool SwGetExpField::IsInBodyText() const
{ return m_bIsInBodyText; }
@@ -175,7 +178,7 @@ public:
void SetDelimiter( const OUString& s ) { m_sDelim = s; }
sal_uInt8 GetOutlineLvl() const { return m_nLevel; }
void SetOutlineLvl( sal_uInt8 n ) { m_nLevel = n; }
- void SetChapter( SwSetExpField& rField, const SwNode& rNd );
+ void SetChapter(SwSetExpField& rField, const SwNode& rNd, SwRootFrame
const* pLayout);
virtual void QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich )
const override;
virtual void PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich
) override;
@@ -195,7 +198,9 @@ inline const OUString& SwSetExpFieldType::GetSetRefName()
const
class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
{
+ double m_fValueRLHidden; ///< SwValueField; hidden redlines
OUString msExpand;
+ OUString msExpandRLHidden; ///< hidden redlines
OUString maPText;
bool mbInput;
sal_uInt16 mnSeqNo;
@@ -204,6 +209,8 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
virtual OUString ExpandImpl(SwRootFrame const* pLayout) const override;
virtual std::unique_ptr<SwField> Copy() const override;
+ using SwFormulaField::GetValue; // hide it, don't use
+ virtual void SetValue(const double& rVal) override; // hide it
public:
SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong
nFormat = 0);
@@ -211,11 +218,12 @@ public:
void SetFormatField(SwFormatField & rFormatField);
SwFormatField* GetFormatField() { return mpFormatField;}
- virtual void SetValue( const double& rVal ) override;
+ double GetValue(SwRootFrame const* pLayout) const;
+ void SetValue(const double& rVal, SwRootFrame const* pLayout);
- inline const OUString& GetExpStr() const;
+ const OUString& GetExpStr(SwRootFrame const* pLayout) const;
- inline void ChgExpStr( const OUString& rExpand );
+ void ChgExpStr(const OUString& rExpand, SwRootFrame const*
pLayout);
inline void SetPromptText(const OUString& rStr);
inline const OUString& GetPromptText() const;
@@ -244,12 +252,6 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich
) override;
};
-inline const OUString& SwSetExpField::GetExpStr() const
- { return msExpand; }
-
-inline void SwSetExpField::ChgExpStr( const OUString& rExpand )
- { msExpand = rExpand; }
-
inline void SwSetExpField::SetPromptText(const OUString& rStr)
{ maPText = rStr; }
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index f24fd9688238..e089f88ec7fb 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -22,6 +22,9 @@
#include <IDocumentUndoRedo.hxx>
#include <IDocumentState.hxx>
#include <IDocumentLayoutAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
+#include <redline.hxx>
+#include <rootfrm.hxx>
#include <dbmgr.hxx>
#include <chpfld.hxx>
#include <dbfld.hxx>
@@ -78,13 +81,41 @@ namespace
#endif
+ bool IsFieldDeleted(IDocumentRedlineAccess const& rIDRA,
+ SwRootFrame const& rLayout, SwTextField const& rTextField)
+ {
+ SwTextNode const& rNode(rTextField.GetTextNode());
+ bool const isInBody(
+ rNode.GetNodes().GetEndOfExtras().GetIndex() < rNode.GetIndex());
+ if (!isInBody && nullptr == rNode.getLayoutFrame(&rLayout))
+ { // see SwDocUpdateField::GetBodyNode() - fields in hidden sections
+ // don't have layout frames but must be updated, so use the same
+ // check as there, but do it again because GetBodyNode() checks
+ // for *any* layout...
+ return true;
+ }
+ SwRedlineTable::size_type tmp;
+ SwPosition const pos(const_cast<SwTextNode&>(rTextField.GetTextNode()),
+ rTextField.GetStart());
+ SwRangeRedline const*const pRedline(rIDRA.GetRedline(pos, &tmp));
+ return (pRedline
+ && pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE
+ && *pRedline->GetPoint() != *pRedline->GetMark());
+ }
+
void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const SetGetExpField&
rSGEField,
- SwDBManager* pMgr )
+ SwDBManager* pMgr, SwRootFrame const*const pLayout)
{
const SwTextField* pTextField = rSGEField.GetTextField();
if( !pTextField )
return ;
+ if (pLayout && pLayout->IsHideRedlines()
+ && IsFieldDeleted(rDoc.getIDocumentRedlineAccess(), *pLayout,
*pTextField))
+ {
+ return;
+ }
+
const SwField* pField = pTextField->GetFormatField().GetField();
const SwFieldIds nFieldWhich = pField->GetTyp()->Which();
@@ -92,10 +123,10 @@ namespace
{
SwSbxValue aValue;
if( nsSwGetSetExpType::GSE_EXPR & pField->GetSubType() )
- aValue.PutDouble( static_cast<const
SwSetExpField*>(pField)->GetValue() );
+ aValue.PutDouble( static_cast<const
SwSetExpField*>(pField)->GetValue(pLayout) );
else
// Extension to calculate with Strings
- aValue.PutString( static_cast<const
SwSetExpField*>(pField)->GetExpStr() );
+ aValue.PutString( static_cast<const
SwSetExpField*>(pField)->GetExpStr(pLayout) );
// set the new value in Calculator
rCalc.VarChange( pField->GetTyp()->GetName(), aValue );
@@ -666,6 +697,13 @@ void DocumentFieldsManager::UpdateTableFields(
SfxPoolItem* pHt )
}
}
+ SwRootFrame const* pLayout(nullptr);
+ for (SwRootFrame const*const pLay : m_rDoc.GetAllLayouts())
+ {
+ assert(!pLayout || pLay->IsHideRedlines() ==
pLayout->IsHideRedlines()); // TODO
+ pLayout = pLay;
+ }
+
// all fields/boxes are now invalid, so we can start to calculate
if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
TBL_CALC != static_cast<SwTableFormulaUpdate*>(pHt)->m_eFlags
))
@@ -715,16 +753,14 @@ void DocumentFieldsManager::UpdateTableFields(
SfxPoolItem* pHt )
// is in the special section, that's expensive!
Point aPt; // return the first frame of the
layout - Tab.Headline!!
std::pair<Point, bool> const tmp(aPt, true);
- pFrame = rTextNd.getLayoutFrame(
-
m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(),
- nullptr, &tmp);
+ pFrame = rTextNd.getLayoutFrame(pLayout, nullptr,
&tmp);
if( pFrame )
{
SwPosition aPos( *pTableNd );
if( GetBodyTextNode( m_rDoc, aPos, *pFrame ) )
FieldsToCalc( *pCalc, SetGetExpField(
aPos.nNode, pFormatField->GetTextField(),
- &aPos.nContent ));
+ &aPos.nContent), pLayout);
else
pFrame = nullptr;
}
@@ -734,10 +770,11 @@ void DocumentFieldsManager::UpdateTableFields(
SfxPoolItem* pHt )
// create index to determine the TextNode
SwNodeIndex aIdx( rTextNd );
FieldsToCalc( *pCalc,
- SetGetExpField( aIdx, pFormatField->GetTextField()
));
+ SetGetExpField(aIdx, pFormatField->GetTextField()),
+ pLayout);
}
- SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+ SwTableCalcPara aPara(*pCalc, pTableNd->GetTable(),
pLayout);
pField->CalcField( aPara );
if( aPara.IsStackOverflow() )
{
@@ -789,12 +826,12 @@ void DocumentFieldsManager::UpdateTableFields(
SfxPoolItem* pHt )
std::pair<Point, bool> const tmp(aPt, true);
if (pCNd && nullptr != (pFrame = pCNd->getLayoutFrame(
-
m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(),
- nullptr, &tmp)))
+ pLayout, nullptr, &tmp)))
{
SwPosition aPos( *pCNd );
if( GetBodyTextNode( m_rDoc, aPos, *pFrame ) )
- FieldsToCalc( *pCalc, SetGetExpField(
aPos.nNode ));
+ FieldsToCalc(*pCalc,
SetGetExpField(aPos.nNode),
+ pLayout);
else
pFrame = nullptr;
}
@@ -803,10 +840,10 @@ void DocumentFieldsManager::UpdateTableFields(
SfxPoolItem* pHt )
{
// create index to determine the TextNode
SwNodeIndex aIdx( *pTableNd );
- FieldsToCalc( *pCalc, SetGetExpField( aIdx ));
+ FieldsToCalc(*pCalc, SetGetExpField(aIdx), pLayout);
}
- SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+ SwTableCalcPara aPara(*pCalc, pTableNd->GetTable(),
pLayout);
pFormula->Calc( aPara, nValue );
if( aPara.IsStackOverflow() )
@@ -859,6 +896,39 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
return ;
}
+ SwRootFrame const* pLayout(nullptr);
+ SwRootFrame const* pLayoutRLHidden(nullptr);
+ for (SwRootFrame const*const pLay : m_rDoc.GetAllLayouts())
+ {
+ if (pLay->IsHideRedlines())
+ {
+ pLayoutRLHidden = pLay;
+ }
+ else
+ {
+ pLayout = pLay;
+ }
+ }
+ if (pLayout || !pLayoutRLHidden) // always calc *something*...
+ {
+ UpdateExpFieldsImpl(pUpdateField, pLayout);
+ }
+ if (pLayoutRLHidden)
+ {
+ UpdateExpFieldsImpl(pUpdateField, pLayoutRLHidden);
+ }
+
+ // update reference fields
+ if( bUpdRefFields )
+ UpdateRefFields();
+
+ mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+ mpUpdateFields->SetFieldsDirty( false );
+}
+
+void DocumentFieldsManager::UpdateExpFieldsImpl(
+ SwTextField * pUpdateField, SwRootFrame const*const pLayout)
+{
SwFieldIds nWhich;
// Hash table for all string replacements is filled on-the-fly.
@@ -925,6 +995,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
}
}
+ IDocumentRedlineAccess const& rIDRA(m_rDoc.getIDocumentRedlineAccess());
std::unordered_map<SwSetExpFieldType const*, SwTextNode const*>
SetExpOutlineNodeMap;
for (std::unique_ptr<SetGetExpField> const& it :
*mpUpdateFields->GetSortList())
@@ -967,6 +1038,12 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
continue;
}
+ if (pLayout && pLayout->IsHideRedlines()
+ && IsFieldDeleted(rIDRA, *pLayout, *pTextField))
+ {
+ continue;
+ }
+
SwFormatField* pFormatField =
const_cast<SwFormatField*>(&pTextField->GetFormatField());
const SwField* pField = pFormatField->GetField();
@@ -1058,7 +1135,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
&& pGField->IsInBodyText() )
{
OUString aNew = LookString( aHashStrTable,
pGField->GetFormula() );
- pGField->ChgExpStr( aNew );
+ pGField->ChgExpStr( aNew, pLayout );
}
}
else
@@ -1072,7 +1149,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
// only update one field
if( !pUpdateField || pUpdateField == pTextField )
- pSField->ChgExpStr( aNew );
+ pSField->ChgExpStr( aNew, pLayout );
// lookup the field's name
aNew =
static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
@@ -1081,12 +1158,12 @@ void DocumentFieldsManager::UpdateExpFields(
SwTextField* pUpdateField, bool bUp
HashStr* pFnd = aHashStrTable.Find( aNew, &nPos );
if( pFnd )
// Modify entry in the hash table
- pFnd->aSetStr = pSField->GetExpStr();
+ pFnd->aSetStr = pSField->GetExpStr(pLayout);
else
{
// insert new entry
aHashStrTable[nPos].reset( new HashStr( aNew,
- pSField->GetExpStr(),
+ pSField->GetExpStr(pLayout),
aHashStrTable[nPos].release() ) );
pFnd = aHashStrTable[nPos].get();
}
@@ -1109,7 +1186,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
SwSbxValue aValue = aCalc.Calculate(
pGField->GetFormula());
if(!aValue.IsVoidValue())
- pGField->SetValue(aValue.GetDouble() );
+ pGField->SetValue(aValue.GetDouble(), pLayout);
}
}
else
@@ -1129,7 +1206,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField*
pUpdateField, bool bUp
pSeqNd = m_rDoc.GetNodes()[ it->GetNode() ];
const SwTextNode* pOutlNd = pSeqNd->
- FindOutlineNodeOfLevel( nLvl );
+ FindOutlineNodeOfLevel(nLvl, pLayout);
auto const
iter(SetExpOutlineNodeMap.find(pSFieldTyp));
if (iter == SetExpOutlineNodeMap.end()
|| iter->second != pOutlNd)
@@ -1148,10 +1225,10 @@ void DocumentFieldsManager::UpdateExpFields(
SwTextField* pUpdateField, bool bUp
// only update one field
if( !aValue.IsVoidValue() && (!pUpdateField ||
pUpdateField == pTextField) )
{
- pSField->SetValue( nErg );
+ pSField->SetValue(nErg, pLayout);
if( pSeqNd )
- pSFieldTyp->SetChapter( *pSField, *pSeqNd );
+ pSFieldTyp->SetChapter(*pSField, *pSeqNd, pLayout);
}
}
}
@@ -1175,13 +1252,6 @@ void DocumentFieldsManager::UpdateExpFields(
SwTextField* pUpdateField, bool bUp
#if HAVE_FEATURE_DBCONNECTIVITY
pMgr->CloseAll(false);
#endif
-
- // update reference fields
- if( bUpdRefFields )
- UpdateRefFields();
-
- mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
- mpUpdateFields->SetFieldsDirty( false );
}
/// Insert field type that was marked as deleted
@@ -1429,7 +1499,8 @@ void DocumentFieldsManager::SetFixFields( const DateTime*
pNewDateTime )
m_rDoc.getIDocumentState().ResetModified();
}
-void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const SetGetExpField&
rToThisField )
+void DocumentFieldsManager::FieldsToCalc(SwCalc& rCalc,
+ const SetGetExpField& rToThisField, SwRootFrame const*const pLayout)
{
// create the sorted list of all SetFields
mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
@@ -1449,7 +1520,7 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc,
const SetGetExpField& r
&rToThisField);
for (auto it = mpUpdateFields->GetSortList()->begin(); it != itLast;
++it)
{
- lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
+ lcl_CalcField(m_rDoc, rCalc, **it, pMgr, pLayout);
}
}
#if HAVE_FEATURE_DBCONNECTIVITY
@@ -1470,6 +1541,22 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc,
sal_uLong nLastNd, sal_
pMgr->CloseAll(false);
#endif
+ SwRootFrame const* pLayout(nullptr);
+ SwRootFrame const* pLayoutRLHidden(nullptr);
+ for (SwRootFrame const*const pLay : m_rDoc.GetAllLayouts())
+ {
+ if (pLay->IsHideRedlines())
+ {
+ pLayoutRLHidden = pLay;
+ }
+ else
+ {
+ pLayout = pLay;
+ }
+ }
+
+ // note this is not duplicate of the other FieldsToCalc because there is
+ // (currently) no SetGetExpField that compares only a position
for(auto it = mpUpdateFields->GetSortList()->begin();
it != mpUpdateFields->GetSortList()->end() &&
( (*it)->GetNode() < nLastNd ||
@@ -1477,7 +1564,14 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc,
sal_uLong nLastNd, sal_
);
++it )
{
- lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
+ if (pLayout || !pLayoutRLHidden) // always calc *something*...
+ {
+ lcl_CalcField( m_rDoc, rCalc, **it, pMgr, pLayout );
+ }
+ if (pLayoutRLHidden)
+ {
+ lcl_CalcField( m_rDoc, rCalc, **it, pMgr, pLayoutRLHidden );
+ }
}
#if HAVE_FEATURE_DBCONNECTIVITY
@@ -1486,12 +1580,14 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc&
rCalc, sal_uLong nLastNd, sal_
}
void DocumentFieldsManager::FieldsToExpand( SwHashTable<HashStr> & rHashTable,
- const SetGetExpField& rToThisField )
+ const SetGetExpField& rToThisField, SwRootFrame const& rLayout)
{
// create the sorted list of all SetFields
mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_EXPAND );
mbNewFieldLst = false;
+ IDocumentRedlineAccess const& rIDRA(m_rDoc.getIDocumentRedlineAccess());
+
// Hash table for all string replacements is filled on-the-fly.
// Try to fabricate an uneven number.
sal_uInt16 nTableSize = ((mpUpdateFields->GetSortList()->size() / 7) + 1)
* 7;
@@ -1506,6 +1602,12 @@ void DocumentFieldsManager::FieldsToExpand(
SwHashTable<HashStr> & rHashTable,
if( !pTextField )
continue;
+ if (rLayout.IsHideRedlines()
+ && IsFieldDeleted(rIDRA, rLayout, *pTextField))
+ {
+ continue;
+ }
+
const SwField* pField = pTextField->GetFormatField().GetField();
switch( pField->GetTyp()->Which() )
{
@@ -1522,7 +1624,7 @@ void DocumentFieldsManager::FieldsToExpand(
SwHashTable<HashStr> & rHashTable,
// #i3141# - update expression of field as in method
// <SwDoc::UpdateExpFields(..)> for string/text fields
- pSField->ChgExpStr( aNew );
+ pSField->ChgExpStr(aNew, &rLayout);
// look up the field's name
aNew =
static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
@@ -1531,11 +1633,11 @@ void DocumentFieldsManager::FieldsToExpand(
SwHashTable<HashStr> & rHashTable,
SwHash* pFnd = rHashTable.Find( aNew, &nPos );
if( pFnd )
// modify entry in the hash table
- static_cast<HashStr*>(pFnd)->aSetStr =
pSField->GetExpStr();
+ static_cast<HashStr*>(pFnd)->aSetStr =
pSField->GetExpStr(&rLayout);
else
// insert the new entry
rHashTable[nPos].reset( new HashStr( aNew,
- pSField->GetExpStr(), rHashTable[nPos].release() )
);
+ pSField->GetExpStr(&rLayout),
rHashTable[nPos].release()));
}
break;
case SwFieldIds::Database:
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 836ae5c24ef6..2edf4762c3e4 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -163,7 +163,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara )
const
switch ( pField->GetTyp()->Which() )
{
case SwFieldIds::SetExp:
- nRet = static_cast<const SwSetExpField*>(pField)->GetValue();
+ nRet = static_cast<const
SwSetExpField*>(pField)->GetValue(rCalcPara.m_pLayout);
break;
case SwFieldIds::User:
nRet = static_cast<const SwUserField*>(pField)->GetValue();
@@ -251,10 +251,15 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara )
const
// structure needed for calculation of tables
-SwTableCalcPara::SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable )
- : m_pLastTableBox( nullptr ), m_nStackCount( 0 ), m_nMaxSize(
cMAXSTACKSIZE ),
- m_pBoxStack( new SwTableSortBoxes ),
- m_rCalc( rCalculator ), m_pTable( &rTable )
+SwTableCalcPara::SwTableCalcPara(SwCalc& rCalculator, const SwTable& rTable,
+ SwRootFrame const*const pLayout)
+ : m_pLastTableBox(nullptr)
+ , m_nStackCount( 0 )
+ , m_nMaxSize( cMAXSTACKSIZE )
+ , m_pLayout(pLayout)
+ , m_pBoxStack( new SwTableSortBoxes )
+ , m_rCalc( rCalculator )
+ , m_pTable( &rTable )
{
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 9884be99aee3..dc7706c1652b 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -283,7 +283,9 @@ void SwGetExpFieldType::Modify( const SfxPoolItem*, const
SfxPoolItem* pNew )
SwGetExpField::SwGetExpField(SwGetExpFieldType* pTyp, const OUString& rFormel,
sal_uInt16 nSub, sal_uLong nFormat)
- : SwFormulaField( pTyp, nFormat, 0.0 ),
+ : SwFormulaField( pTyp, nFormat, 0.0 )
+ , m_fValueRLHidden(0.0)
+ ,
m_bIsInBodyText( true ),
m_nSubType(nSub),
m_bLateInitialization( false )
@@ -291,12 +293,24 @@ SwGetExpField::SwGetExpField(SwGetExpFieldType* pTyp,
const OUString& rFormel,
SetFormula( rFormel );
}
-OUString SwGetExpField::ExpandImpl(SwRootFrame const*const) const
+void SwGetExpField::ChgExpStr(const OUString& rExpand, SwRootFrame const*const
pLayout)
+{
+ if (!pLayout || pLayout->IsHideRedlines())
+ {
+ m_sExpandRLHidden = rExpand;
+ }
+ if (!pLayout || !pLayout->IsHideRedlines())
+ {
+ m_sExpand = rExpand;
+ }
+}
+
+OUString SwGetExpField::ExpandImpl(SwRootFrame const*const pLayout) const
{
if(m_nSubType & nsSwExtendedSubType::SUB_CMD)
return GetFormula();
- return m_sExpand;
+ return (pLayout && pLayout->IsHideRedlines()) ? m_sExpandRLHidden :
m_sExpand;
}
OUString SwGetExpField::GetFieldName() const
@@ -314,6 +328,7 @@ std::unique_ptr<SwField> SwGetExpField::Copy() const
std::unique_ptr<SwGetExpField> pTmp(new
SwGetExpField(static_cast<SwGetExpFieldType*>(GetTyp()),
GetFormula(), m_nSubType,
GetFormat()));
pTmp->SetLanguage(GetLanguage());
+ pTmp->m_fValueRLHidden = m_fValueRLHidden;
pTmp->SwValueField::SetValue(GetValue());
pTmp->m_sExpand = m_sExpand;
pTmp->m_bIsInBodyText = m_bIsInBodyText;
@@ -356,25 +371,27 @@ void SwGetExpField::ChangeExpansion( const SwFrame&
rFrame, const SwTextField& r
}
}
+ SwRootFrame const& rLayout(*rFrame.getRootFrame());
+ OUString & rExpand(rLayout.IsHideRedlines() ? m_sExpandRLHidden :
m_sExpand);
SetGetExpField aEndField( aPos.nNode, &rField, &aPos.nContent );
if(GetSubType() & nsSwGetSetExpType::GSE_STRING)
{
SwHashTable<HashStr> aHashTable(0);
- rDoc.getIDocumentFieldsAccess().FieldsToExpand( aHashTable, aEndField
);
- m_sExpand = LookString( aHashTable, GetFormula() );
+ rDoc.getIDocumentFieldsAccess().FieldsToExpand(aHashTable, aEndField,
rLayout);
+ rExpand = LookString( aHashTable, GetFormula() );
}
else
{
// fill calculator with values
SwCalc aCalc( rDoc );
- rDoc.getIDocumentFieldsAccess().FieldsToCalc(aCalc, aEndField);
+ rDoc.getIDocumentFieldsAccess().FieldsToCalc(aCalc, aEndField,
&rLayout);
// calculate value
- SetValue(aCalc.Calculate(GetFormula()).GetDouble());
+ SetValue(aCalc.Calculate(GetFormula()).GetDouble(), &rLayout);
// analyse based on format
- m_sExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(
- GetValue(), GetFormat(), GetLanguage());
+ rExpand = static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(
+ GetValue(&rLayout), GetFormat(),
GetLanguage());
}
}
@@ -447,6 +464,7 @@ bool SwGetExpField::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
{
case FIELD_PROP_DOUBLE:
SwValueField::SetValue(*o3tl::doAccess<double>(rAny));
+ m_fValueRLHidden = *o3tl::doAccess<double>(rAny);
break;
case FIELD_PROP_FORMAT:
rAny >>= nTmp;
@@ -478,7 +496,7 @@ bool SwGetExpField::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
{
OUString sTmp;
rAny >>= sTmp;
- ChgExpStr(sTmp);
+ ChgExpStr(sTmp, nullptr);
break;
}
default:
@@ -513,6 +531,23 @@ OUString SwSetExpFieldType::GetName() const
return m_sName;
}
+const OUString& SwSetExpField::GetExpStr(SwRootFrame const*const pLayout) const
+{
+ return (pLayout && pLayout->IsHideRedlines()) ? msExpandRLHidden :
msExpand;
+}
+
+void SwSetExpField::ChgExpStr(const OUString& rExpand, SwRootFrame const*const
pLayout)
+{
+ if (!pLayout || pLayout->IsHideRedlines())
+ {
+ msExpandRLHidden = rExpand;
+ }
+ if (!pLayout || !pLayout->IsHideRedlines())
+ {
+ msExpand = rExpand;
+ }
+}
+
void SwSetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* )
{
// do not expand further
@@ -605,9 +640,10 @@ size_t SwSetExpFieldType::GetSeqFieldList(SwSeqFieldList&
rList,
return rList.Count();
}
-void SwSetExpFieldType::SetChapter( SwSetExpField& rField, const SwNode& rNd )
+void SwSetExpFieldType::SetChapter(SwSetExpField& rField, const SwNode& rNd,
+ SwRootFrame const*const pLayout)
{
- const SwTextNode* pTextNd = rNd.FindOutlineNodeOfLevel( m_nLevel );
+ const SwTextNode* pTextNd = rNd.FindOutlineNodeOfLevel(m_nLevel, pLayout);
if( pTextNd )
{
SwNumRule * pRule = pTextNd->GetNumRule();
@@ -615,19 +651,17 @@ void SwSetExpFieldType::SetChapter( SwSetExpField&
rField, const SwNode& rNd )
if (pRule)
{
// --> OD 2005-11-02 #i51089 - TUNING#
- if ( pTextNd->GetNum() )
+ if (SwNodeNum const*const pNum = pTextNd->GetNum(pLayout))
{
- const SwNodeNum & aNum = *(pTextNd->GetNum());
-
// only get the number, without pre-/post-fixstrings
- OUString sNumber( pRule->MakeNumString(aNum, false ));
+ OUString const sNumber(pRule->MakeNumString(*pNum, false));
if( !sNumber.isEmpty() )
- rField.ChgExpStr( sNumber + m_sDelim + rField.GetExpStr()
);
+ rField.ChgExpStr(sNumber + m_sDelim +
rField.GetExpStr(pLayout), pLayout);
}
else
{
- OSL_FAIL( "<SwSetExpFieldType::SetChapter(..)> - text node
with numbering rule, but without number. This is a serious defect" );
+ OSL_ENSURE(pTextNd->GetNum(nullptr),
"<SwSetExpFieldType::SetChapter(..)> - text node with numbering rule, but
without number. This is a serious defect");
}
}
}
@@ -774,8 +808,10 @@ bool SwSeqFieldList::SeekEntry( const SeqFieldLstElem&
rNew, size_t* pP ) const
SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const OUString& rFormel,
sal_uLong nFormat)
- : SwFormulaField( pTyp, nFormat, 0.0 ), mnSeqNo( USHRT_MAX ),
- mnSubType(0)
+ : SwFormulaField( pTyp, nFormat, 0.0 )
+ , m_fValueRLHidden(0.0)
+ , mnSeqNo( USHRT_MAX )
+ , mnSubType(0)
, mpFormatField(nullptr)
{
SetFormula(rFormel);
@@ -784,6 +820,7 @@ SwSetExpField::SwSetExpField(SwSetExpFieldType* pTyp, const
OUString& rFormel,
if( IsSequenceField() )
{
SwValueField::SetValue(1.0);
+ m_fValueRLHidden = 1.0;
if( rFormel.isEmpty() )
{
SetFormula(pTyp->GetName() + "+1");
@@ -796,7 +833,7 @@ void SwSetExpField::SetFormatField(SwFormatField &
rFormatField)
mpFormatField = &rFormatField;
}
-OUString SwSetExpField::ExpandImpl(SwRootFrame const*const) const
+OUString SwSetExpField::ExpandImpl(SwRootFrame const*const pLayout) const
{
if (mnSubType & nsSwExtendedSubType::SUB_CMD)
{ // we need the CommandString
@@ -804,7 +841,7 @@ OUString SwSetExpField::ExpandImpl(SwRootFrame const*const)
const
}
if(!(mnSubType & nsSwExtendedSubType::SUB_INVISIBLE))
{ // value is visible
- return msExpand;
+ return (pLayout && pLayout->IsHideRedlines()) ? msExpandRLHidden :
msExpand;
}
return OUString();
}
@@ -836,7 +873,9 @@ std::unique_ptr<SwField> SwSetExpField::Copy() const
std::unique_ptr<SwSetExpField> pTmp(new
SwSetExpField(static_cast<SwSetExpFieldType*>(GetTyp()),
GetFormula(), GetFormat()));
pTmp->SwValueField::SetValue(GetValue());
+ pTmp->m_fValueRLHidden = m_fValueRLHidden;
pTmp->msExpand = msExpand;
+ pTmp->msExpandRLHidden = msExpandRLHidden;
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
pTmp->SetLanguage(GetLanguage());
pTmp->maPText = maPText;
@@ -871,6 +910,32 @@ void SwSetExpField::SetValue( const double& rAny )
GetFormat(), GetLanguage());
}
+void SwSetExpField::SetValue(const double& rValue, SwRootFrame const*const
pLayout)
+{
+ if (!pLayout || !pLayout->IsHideRedlines())
+ {
+ SetValue(rValue);
+ }
+ if (!pLayout || pLayout->IsHideRedlines())
+ {
+ m_fValueRLHidden = rValue;
+ if (IsSequenceField())
+ {
+ msExpandRLHidden = FormatNumber(rValue,
static_cast<SvxNumType>(GetFormat()), GetLanguage());
+ }
+ else
+ {
+ msExpandRLHidden =
static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(
+ rValue, GetFormat(), GetLanguage());
+ }
+ }
+}
+
+double SwSetExpField::GetValue(SwRootFrame const* pLayout) const
+{
+ return (pLayout && pLayout->IsHideRedlines()) ? m_fValueRLHidden :
GetValue();
+}
+
void SwGetExpField::SetValue( const double& rAny )
{
SwValueField::SetValue(rAny);
@@ -878,6 +943,25 @@ void SwGetExpField::SetValue( const double& rAny )
GetLanguage());
}
+void SwGetExpField::SetValue(const double& rValue, SwRootFrame const*const
pLayout)
+{
+ if (!pLayout || !pLayout->IsHideRedlines())
+ {
+ SetValue(rValue);
+ }
+ if (!pLayout || pLayout->IsHideRedlines())
+ {
+ m_fValueRLHidden = rValue;
+ m_sExpandRLHidden =
static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(
+ rValue, GetFormat(), GetLanguage());
+ }
+}
+
+double SwGetExpField::GetValue(SwRootFrame const* pLayout) const
+{
+ return (pLayout && pLayout->IsHideRedlines()) ? m_fValueRLHidden :
GetValue();
+}
+
/** Find the index of the reference text following the current field
*
* @param rFormat
@@ -1021,6 +1105,7 @@ bool SwSetExpField::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
double fVal = 0.0;
rAny >>= fVal;
SetValue(fVal);
+ m_fValueRLHidden = fVal;
}
break;
case FIELD_PROP_SUBTYPE:
@@ -1044,7 +1129,7 @@ bool SwSetExpField::PutValue( const uno::Any& rAny,
sal_uInt16 nWhichId )
{
OUString sTmp;
rAny >>= sTmp;
- ChgExpStr( sTmp );
+ ChgExpStr(sTmp, nullptr);
}
break;
default:
@@ -1101,7 +1186,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny,
sal_uInt16 nWhichId ) const
rAny <<= GetInputFlag();
break;
case FIELD_PROP_PAR4:
- rAny <<= GetExpStr();
+ rAny <<= GetExpStr(nullptr);
break;
default:
return SwField::QueryValue(rAny, nWhichId);
diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx
b/sw/source/core/inc/DocumentFieldsManager.hxx
index 0475eb345492..c73345f669c5 100644
--- a/sw/source/core/inc/DocumentFieldsManager.hxx
+++ b/sw/source/core/inc/DocumentFieldsManager.hxx
@@ -56,8 +56,8 @@ public:
virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen)
override;
virtual void SetFixFields(const DateTime* pNewDateTime) override;
virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16
nLastCnt) override;
- virtual void FieldsToCalc(SwCalc& rCalc, const SetGetExpField&
rToThisField) override;
- virtual void FieldsToExpand(SwHashTable<HashStr>& rTable, const
SetGetExpField& rToThisField) override;
+ virtual void FieldsToCalc(SwCalc& rCalc, const SetGetExpField&
rToThisField, SwRootFrame const* pLayout) override;
+ virtual void FieldsToExpand(SwHashTable<HashStr>& rTable, const
SetGetExpField& rToThisField, SwRootFrame const& rLayout) override;
virtual bool IsNewFieldLst() const override;
virtual void SetNewFieldLst( bool bFlag) override;
virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField)
override;
@@ -95,6 +95,8 @@ private:
DocumentFieldsManager(DocumentFieldsManager const&) = delete;
DocumentFieldsManager& operator=(DocumentFieldsManager const&) = delete;
+ void UpdateExpFieldsImpl(SwTextField* pField, SwRootFrame const* pLayout);
+
SwDoc& m_rDoc;
bool mbNewFieldLst; //< TRUE: Rebuild field-list.
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index b8ada47916cd..4fe387ba3b59 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1730,7 +1730,7 @@ void SAL_CALL SwXTextField::attach(
pSEField->SetInputFlag(m_pImpl->m_pProps->bBool1);
pSEField->SetPromptText(m_pImpl->m_pProps->sPar3);
if (!m_pImpl->m_pProps->sPar4.isEmpty())
- pSEField->ChgExpStr(m_pImpl->m_pProps->sPar4);
+ pSEField->ChgExpStr(m_pImpl->m_pProps->sPar4, nullptr);
}
break;
@@ -1772,7 +1772,7 @@ void SAL_CALL SwXTextField::attach(
xField.reset(pGEField);
//TODO: evaluate SubType!
if (!m_pImpl->m_pProps->sPar4.isEmpty())
- pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4);
+ pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4, nullptr);
// #i82544#
if (bSetGetExpFieldUninitialized)
pGEField->SetLateInitialization();
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 51f6ca542053..49c506b3d5d6 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1393,7 +1393,7 @@ eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*,
OUString& rStr )
}
SwSetExpField aField( static_cast<SwSetExpFieldType*>(m_pNumFieldType),
OUString(),
GetNumberPara( rStr ) );
- aField.SetValue( ++m_nFieldNum );
+ aField.SetValue( ++m_nFieldNum, nullptr );
m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM,
SwFormatField( aField ) );
return eF_ResT::OK;
}
commit e30b61e9f0790cbab74eae09b80bbda8d43e155d
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Mon Nov 12 14:39:08 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Nov 13 15:44:10 2018 +0100
sw: booleans are hard, let's go shopping
Has been like that since CVS import...
Change-Id: Iefa49407de90bace5eea2f86170ba8cd29b1cfe7
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 0a3a8a47a8c3..f24fd9688238 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1578,7 +1578,7 @@ void DocumentFieldsManager::SetNewFieldLst(bool bFlag)
void DocumentFieldsManager::InsDelFieldInFieldLst( bool bIns, const
SwTextField& rField )
{
- if( !mbNewFieldLst || !m_rDoc.IsInDtor() )
+ if (!mbNewFieldLst && !m_rDoc.IsInDtor())
mpUpdateFields->InsDelFieldInFieldLst( bIns, rField );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
