summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2013-11-20 17:59:15 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2013-11-20 18:00:06 +0100
commit73c5e9824690b2fc38976d5e53e1fd10a16dc47b (patch)
tree85f7af6ebb88af45a34a9a7e0508b1fc39f459f7 /sc/source/ui
parent55b489ccbaf8bb17082d75a27e48b158008446ac (diff)
fix: overriding virtual function differs from 'osl::Thread::terminate'
Change-Id: Ic291f9cdc7413d125a79a1e79ef8215de32bce3b
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/miscdlgs/datastreams.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/miscdlgs/datastreams.cxx b/sc/source/ui/miscdlgs/datastreams.cxx
index 9d66ee362ea2..59d3b39d6099 100644
--- a/sc/source/ui/miscdlgs/datastreams.cxx
+++ b/sc/source/ui/miscdlgs/datastreams.cxx
@@ -92,7 +92,7 @@ public:
}
}
- void terminate()
+ void endThread()
{
mbTerminateReading = true;
maProduceResume.set();
@@ -157,7 +157,7 @@ DataStreams::~DataStreams()
mxThread->maStart.set();
mxThread->join();
if (mxReaderThread.is())
- mxReaderThread->terminate();
+ mxReaderThread->endThread();
}
OString DataStreams::ConsumeLine()
@@ -226,7 +226,7 @@ void DataStreams::Set(SvStream *pStream, bool bValuesInLine,
const OUString& rRange, sal_Int32 nLimit, MoveEnum eMove)
{
if (mxReaderThread.is())
- mxReaderThread->terminate();
+ mxReaderThread->endThread();
mxReaderThread = new datastreams::ReaderThread( pStream );
mxReaderThread->launch();