sc/source/ui/docshell/datastream.cxx | 14 +++++--------- sc/source/ui/inc/datastream.hxx | 4 +--- 2 files changed, 6 insertions(+), 12 deletions(-)
New commits: commit fdef94da800a80e32cb8494f7a123162b59a962a Author: Kohei Yoshida <[email protected]> Date: Wed Dec 18 14:15:29 2013 -0500 Just do hard-recalc on stream refresh. That takes care of all our needs. Change-Id: I9a454089843d1373153988a29843b95db22ee284 diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 9121d48..cbf8957 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -370,23 +370,19 @@ void DataStream::StopImport() return; mbRunning = false; - Repaint(); + Refresh(); } -void DataStream::Repaint() +void DataStream::Refresh() { SCROW nEndRow = mpEndRange ? mpEndRange->aEnd.Row() : MAXROW; ScRange aRange(maStartRange.aStart); aRange.aEnd = ScAddress(maStartRange.aEnd.Col(), nEndRow, maStartRange.aStart.Tab()); - mpDocShell->PostPaint(aRange, PAINT_GRID); mnRepaintCounter = 0; -} -void DataStream::Broadcast() -{ - mpDoc->BroadcastCells(maBroadcastRanges, SC_HINT_DATACHANGED); - maBroadcastRanges.RemoveAll(); + // Hard recalc will repaint the grid area. + mpDocShell->DoHardRecalc(true); } void DataStream::MoveData() @@ -541,7 +537,7 @@ bool DataStream::ImportData() } if (mnRepaintCounter > 200) - Repaint(); + Refresh(); return mbRunning; } diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 494a73e..86be03b 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -79,8 +79,7 @@ public: void StopImport(); private: - void Repaint(); - void Broadcast(); + void Refresh(); private: ScDocShell* mpDocShell; @@ -97,7 +96,6 @@ private: size_t mnRepaintCounter; SCROW mnCurRow; ScRange maStartRange; - ScRangeList maBroadcastRanges; boost::scoped_ptr<ScRange> mpEndRange; rtl::Reference<datastreams::CallerThread> mxThread; rtl::Reference<datastreams::ReaderThread> mxReaderThread; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
