[Libreoffice-commits] core.git: 2 commits - framework/source postprocess/qa

[Caolán McNamara]

 framework/source/fwi/threadhelp/transactionmanager.cxx |    2 +-
 postprocess/qa/services.cxx                            |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b1964a24a6cabdbd7b0633a85cc7e9cceac90c93
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 24 15:43:20 2014 +0100

    ReportDefinition is the one that is failing for me under Linux too
    
    Change-Id: I00480813d8c3703039a55a7a706937d33e8e8463

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 706010d..f6a07e4 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -38,7 +38,7 @@ public:
 void ServicesTest::test()
 {
     std::vector<OUString> blacklist;
-#if defined WNT
+
     // On Windows, blacklist the com.sun.star.report.ReportDefinition service,
     // as its reportdesign::OReportDefinition implementation (in
     // reportdesign/source/core/api/ReportDefinition.cxx) spawns a thread that
@@ -54,7 +54,6 @@ void ServicesTest::test()
     // ImplBorderWindow::ImplInit -> Window::ImplInit ->
     // WinSalInstance::CreateFrame -> ImplSendMessage -> SendMessageW):
     blacklist.push_back("com.sun.star.report.ReportDefinition");
-#endif
 
     Reference< XHierarchicalNameAccess > xTypeManager(
             m_xContext->getValueByName(
commit 1dac3254d554a38eafeec894e8e11eb163746281
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 24 15:49:13 2014 +0100

    allow a frame to go from init state to close
    
    without an intermediate working stage so it can be disposed after creation, but
    without a prior initialization like CppunitTest_services does
    
    Change-Id: If2679fd0ce3657e727e34cfb0752501fc82df936

diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 20bcdd6..3d001a8 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -74,7 +74,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
     // Change working mode first!
     if  (
             ( m_eWorkingMode == E_INIT        && eMode == E_WORK        ) ||
-            ( m_eWorkingMode == E_WORK        && eMode == E_BEFORECLOSE ) ||
+            ( (m_eWorkingMode == E_WORK || m_eWorkingMode == E_INIT) && eMode == E_BEFORECLOSE ) ||
             ( m_eWorkingMode == E_BEFORECLOSE && eMode == E_CLOSE       ) ||
             ( m_eWorkingMode == E_CLOSE       && eMode == E_INIT        )
         )