[Libreoffice-commits] core.git: sc/source

[Matúš Kukan]

 sc/source/ui/miscdlgs/datastreams.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 73c5e9824690b2fc38976d5e53e1fd10a16dc47b
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Wed Nov 20 17:59:15 2013 +0100

    fix: overriding virtual function differs from 'osl::Thread::terminate'
    
    Change-Id: Ic291f9cdc7413d125a79a1e79ef8215de32bce3b

diff --git a/sc/source/ui/miscdlgs/datastreams.cxx 
b/sc/source/ui/miscdlgs/datastreams.cxx
index 9d66ee3..59d3b39 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();
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits