diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2015-07-05 12:05:26 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-15 07:46:01 +0000 |
| commit | b0fde7a912ff3aa370496802f20895b1158b072c (patch) | |
| tree | 7b53cc78cc2291ccf2a28083082b37fefb8a2185 | |
| parent | 82da70787ac12ec9d5791eeac6b48535737ad5b3 (diff) | |
tdf#38837 Reduce power consumption by minimizing idle timers
Both the document statistics- and state-manager have their
own modified flags. There is a cyclic dependency between the
the two in that updating the document's statistics also marks
the document as modified. Of course when a document is edited
the statistics modified flag is set to trigger an update.
To avoid a perpetual cycle, the statistics manager resets the
document's modified state to that before setting the new
statistics. However, this doesn't reset the statistics
modified flag, which was set when the document was modified
by setting the new statistics. Hence, the statistics thinks
there are modifications in the document when there isn't.
This patch is to make DocumentStateManager::ResetModified()
symmetrical to DocumentStateManager::SetModified() by
reseting the modified flag of the statistics manager.
The idle CPU drops to nil on unmodified documents after this.
However, for modified documents the statistics is recalculated
perpetually until the document is saved. This will need a
different patch to fix.
Change-Id: Ib5936bc1acbda34fcac6a00ec46eaa31e4363885
Reviewed-on: https://gerrit.libreoffice.org/16774
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/doc/DocumentStateManager.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index 601525073574..ede8ef96e834 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -65,6 +65,7 @@ void DocumentStateManager::ResetModified() // Bit 1: -> new state sal_IntPtr nCall = mbModified ? 1 : 0; mbModified = false; + m_rDoc.GetDocumentStatisticsManager().GetDocStat().bModified = false; m_rDoc.GetIDocumentUndoRedo().SetUndoNoModifiedPosition(); if( nCall && m_rDoc.GetOle2Link().IsSet() ) { diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 2530fa2608e6..7a3d9be84173 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -480,7 +480,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) // Remember and preserve Modified-Flag without calling the Link // (for OLE; after Statement from MM) - bool bIsModified = m_pDoc->getIDocumentState().IsModified(); + const bool bIsModified = m_pDoc->getIDocumentState().IsModified(); m_pDoc->GetIDocumentUndoRedo().LockUndoNoModifiedPosition(); Link<> aOldOLELnk( m_pDoc->GetOle2Link() ); m_pDoc->SetOle2Link( Link<>() ); |