summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/uibase/inc/conttree.hxx1
-rw-r--r--sw/source/uibase/utlui/content.cxx16
2 files changed, 2 insertions, 15 deletions
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 525d11fe4fd2..4dd2bf4db31a 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -96,7 +96,6 @@ class SwContentTree
bool m_bIsOutlineMoveable :1;
bool m_bViewHasChanged :1;
bool m_bIsImageListInitialized : 1;
- bool m_bActiveDocModified :1;
static bool bIsInDrag;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index cde5b2292393..971e4a4b9677 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -800,7 +800,6 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
, m_bIsOutlineMoveable(true)
, m_bViewHasChanged(false)
, m_bIsImageListInitialized(false)
- , m_bActiveDocModified(false)
, m_bIsKeySpace(false)
{
SetHelpId(HID_NAVIGATOR_TREELIST);
@@ -1726,8 +1725,6 @@ void SwContentTree::Display( bool bActive )
sal_Int32 nDelta = pVScroll->GetThumbPos() - nOldScrollPos;
ScrollOutputArea( (short)nDelta );
}
-
- m_bActiveDocModified = false;
}
void SwContentTree::Clear()
@@ -2227,12 +2224,6 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh)
void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
{
- if (SFX_HINT_DOCCHANGED == rHint.GetId())
- {
- m_bActiveDocModified = true;
- return;
- }
-
SfxViewEventHint const*const pVEHint(dynamic_cast<SfxViewEventHint const*>(&rHint));
SwXTextView* pDyingShell = nullptr;
if (m_pActiveShell && pVEHint && pVEHint->GetEventName() == "OnViewClosed")
@@ -2447,11 +2438,8 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void)
else if( (m_bIsActive || (m_bIsConstant && pActShell == GetWrtShell())) &&
HasContentChanged())
{
- if (!m_bIsActive || m_bActiveDocModified)
- { // don't burn cpu and redraw and flicker if not modified
- FindActiveTypeAndRemoveUserData();
- Display(true);
- }
+ FindActiveTypeAndRemoveUserData();
+ Display(true);
}
}
else if(!pView && m_bIsActive && !m_bIsIdleClear)