[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/svtools sc/source

[Michael Stahl]

 dbaccess/source/ui/app/AppControllerDnD.cxx |    2 +-
 include/svtools/fileview.hxx                |    1 +
 sc/source/filter/oox/threadpool.cxx         |    6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit dfe593b30a1fafeb3deeb51753b5cac25cbcd4b0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 27 20:50:44 2013 +0100

    sc: no such thing as std::vector::find
    
    Change-Id: I11bb688a8e0affda9ed78a61d9aba3d244914f8c

diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx
index 9de1a14..8349661 100644
--- a/sc/source/filter/oox/threadpool.cxx
+++ b/sc/source/filter/oox/threadpool.cxx
@@ -9,6 +9,9 @@
 
 #include "threadpool.hxx"
 
+#include <algorithm>
+
+
 class ThreadPool::ThreadWorker : public salhelper::Thread
 {
     ThreadPool    *mpPool;
@@ -102,7 +105,8 @@ void ThreadPool::waitUntilWorkersDone()
     {
         rtl::Reference< ThreadWorker > xWorker = maWorkers.back();
         maWorkers.pop_back();
-        assert( maWorkers.find( xWorker ) == maWorkers.end() );
+        assert(std::find(maWorkers.begin(), maWorkers.end(), xWorker)
+                == maWorkers.end());
         xWorker->signalNewWork();
         aGuard.clear();
         { // unlocked
commit a74b3e89c9b853338506249b0fac8d5f54909de7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 27 20:47:18 2013 +0100

    QueryDeleteDlg_Impl: add GetResult() that was removed in ...
    
    02d4eb7438a83982b2602ea1d83d5accb1fe11f6
    
    Change-Id: I45b5691a3dc4cf2444e0daf8cb2ae0134532f596

diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index b712ca6..906e341 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -219,7 +219,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
                     aDlg.EnableAllButton();
 
                 if ( aDlg.Execute() == RET_OK )
-                    eResult = aDlg.GetResult();
+                    eResult = aDlg.GetQueryDeleteResult();
                 else
                     return;
 
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 8b90816..6135385 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -240,6 +240,7 @@ public:
                             QueryDeleteDlg_Impl( Window* pParent,
                                                  const OUString& rName );
 
+    QueryDeleteResult_Impl  GetQueryDeleteResult() const { return m_eResult; }
     void                    EnableAllButton() { m_pAllButton->Enable(true); }
 };