strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ofz#35787 Timeout

Browse source 
1m14.061s -> 0m3.975s

Change-Id: I96e6f2c60017ba57062bd56c2e80604e117b3b99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118381
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-07-04 20:02:01 +01:00
parent 34fcf3b6e0
commit 0dc7b1cbb9
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/inc/SwNodeNum.hxx
View file

@ -39,7 +39,7 @@ public:
void ChangeNumRule(SwNumRule& rNumRule);
SwTextNode* GetTextNode() const { return mpTextNode; }
virtual bool IsNotificationEnabled() const override;
virtual bool IsNotificationEnabled(const SwDoc& rDoc) const override;
virtual bool IsContinuous() const override;

2
sw/inc/SwNumberTree.hxx
View file

@ -354,7 +354,7 @@ protected:
@retval true Notification enabled in general.
@retval false else
*/
virtual bool IsNotificationEnabled() const = 0;
virtual bool IsNotificationEnabled(const SwDoc& rDoc) const = 0;
// #i64010# - made pure virtual
virtual bool HasCountedChildren() const = 0;

20
sw/source/core/SwNumberTree/SwNodeNum.cxx
View file

@ -122,22 +122,26 @@ void SwNodeNum::PostRemove()
}
}
bool SwNodeNum::IsNotifiable(const SwDoc& /*rDoc*/) const
bool SwNodeNum::IsNotifiable(const SwDoc& rDoc) const
{
bool aResult = true;
bool aResult;
if ( GetTextNode() )
aResult = GetTextNode()->IsNotifiable();
if (const SwTextNode* pTextNode = GetTextNode())
aResult = pTextNode->IsNotifiable();
else
aResult = IsNotificationEnabled(rDoc);
return aResult;
}
bool SwNodeNum::IsNotificationEnabled() const
bool SwNodeNum::IsNotificationEnabled(const SwDoc& rDoc) const
{
bool aResult = true;
bool aResult;
if ( GetTextNode() )
aResult = GetTextNode()->IsNotificationEnabled();
if (const SwTextNode* pTextNode = GetTextNode())
aResult = pTextNode->IsNotificationEnabled();
else
aResult = !rDoc.IsInReading() && !rDoc.IsInDtor();
return aResult;
}

2
sw/source/core/SwNumberTree/SwNumberTree.cxx
View file

@ -487,7 +487,7 @@ void SwNumberTreeNode::AddChild(SwNumberTreeNode* pChild,
if (aResult.second)
{
pChild->mpParent = this;
bool bNotification = pChild->IsNotificationEnabled();
bool bNotification = pChild->IsNotificationEnabled(rDoc);
tSwNumberTreeChildren::iterator aInsertedIt = aResult.first;
if (aInsertedIt != mChildren.begin())

2
sw/source/core/txtnode/ndtxt.cxx
View file

@ -4204,7 +4204,7 @@ bool SwTextNode::IsNotifiable() const
bool SwTextNode::IsNotificationEnabled() const
{
const SwDoc& rDoc = GetDoc();
return !(rDoc.IsInReading() || rDoc.IsInDtor());
return !rDoc.IsInReading() && !rDoc.IsInDtor();
}
void SwTextNode::SetCountedInList( bool bCounted )