fwk167: Rebase to DEV300m103

4 files changed, 29 insertions, 29 deletions

diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 9956cfe86428..69d8835dcdd5 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -238,6 +238,9 @@ namespace dbp
         m_aExistingRadios.EnableMultiSelection(sal_True);
 
         getDialog()->defaultButton(&m_aMoveRight);
+
+        m_aExistingRadios.SetAccessibleRelationMemberOf(&m_aExistingRadios);
+        m_aExistingRadios.SetAccessibleRelationLabeledBy(&m_aExistingRadiosLabel);
     }
 
     //---------------------------------------------------------------------
@@ -368,6 +371,8 @@ namespace dbp
 
         announceControls(m_aDefSelYes, m_aDefSelNo, m_aDefSelection);
         m_aDefSelection.SetDropDownLineCount(10);
+        m_aDefSelection.SetAccessibleRelationLabeledBy( &m_aDefSelYes );
+        m_aDefSelection.SetAccessibleRelationMemberOf(&m_aDefaultSelectionLabel);
     }
 
     //---------------------------------------------------------------------
@@ -418,6 +423,9 @@ namespace dbp
         FreeResource();
 
         m_aOptions.SetSelectHdl(LINK(this, OOptionValuesPage, OnOptionSelected));
+
+        m_aOptions.SetAccessibleRelationMemberOf(&m_aOptions);
+        m_aOptions.SetAccessibleRelationLabeledBy(&m_aOptionsLabel);
     }
 
     //---------------------------------------------------------------------
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 5452a95129ff..182726cd95bc 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -915,7 +915,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
     HRESULT ret= S_OK;
     try
     {
-        Sequence<INT16>     outIndex;
+        Sequence<sal_Int16>     outIndex;
         Sequence<Any>   outParams;
         Any                 returnValue;
 
@@ -931,7 +931,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
         // try to write back out parameter
         if (outIndex.getLength() > 0)
         {
-            const INT16* pOutIndex = outIndex.getConstArray();
+            const sal_Int16* pOutIndex = outIndex.getConstArray();
             const Any* pOutParams = outParams.getConstArray();
 
             for (sal_Int32 i = 0; i < outIndex.getLength(); i++)
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index d83c43bfcfd8..e1f9cf717584 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <osl/mutex.hxx>
+#include <osl/conditn.hxx>
 #include <osl/thread.hxx>
 #include <osl/time.h>
 #include <cppuhelper/implbase1.hxx>
@@ -108,49 +108,41 @@ namespace
         public:
             OnLogRotateThread(Reference<XMultiServiceFactory> sf);
             virtual void SAL_CALL run();
-            OnLogRotateThread* disposing();
+            void stop();
 
         private:
             Reference<XMultiServiceFactory> m_ServiceFactory;
-            ::osl::Mutex m_ServiceFactoryMutex;
+            ::osl::Condition m_Stop;
     };
 
     OnLogRotateThread::OnLogRotateThread(Reference<XMultiServiceFactory> sf)
         : m_ServiceFactory(sf)
-    { }
+    {
+        OSL_ASSERT(sf.is());
+    }
 
     void SAL_CALL OnLogRotateThread::run()
     {
+        TimeValue wait_intervall = {30,0};
+        if (m_Stop.wait(&wait_intervall) == ::osl::Condition::result_timeout)
         {
-            ::osl::Thread::yield();
-            TimeValue wait_intervall = {30,0};
-            osl_waitThread(&wait_intervall);
-        }
-        {
-            ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
             try
             {
-                if(m_ServiceFactory.is())
+                if(Config(m_ServiceFactory).getInvitationAccepted())
                 {
-                    if(Config(m_ServiceFactory).getInvitationAccepted())
-                    {
-                        packLogs(m_ServiceFactory);
-                        uploadLogs(m_ServiceFactory);
-                    }
-                    else
-                        LogStorage(m_ServiceFactory).clear();
+                    packLogs(m_ServiceFactory);
+                    uploadLogs(m_ServiceFactory);
                 }
-                m_ServiceFactory.clear();
+                else
+                    LogStorage(m_ServiceFactory).clear();
             }
             catch(...) {}
         }
     }
 
-    OnLogRotateThread* OnLogRotateThread::disposing()
+    void OnLogRotateThread::stop()
     {
-        ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
-        m_ServiceFactory.clear();
-        return this;
+        m_Stop.set();
     }
 
     class OnLogRotateThreadWatcher : public ::cppu::WeakImplHelper1<XTerminateListener>
@@ -163,7 +155,7 @@ namespace
             }
             virtual ~OnLogRotateThreadWatcher()
             {
-                m_Thread->disposing()->terminate();
+                m_Thread->stop();
                 m_Thread->join();
             };
 
@@ -172,13 +164,13 @@ namespace
                 { };
             virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException)
             {
-                m_Thread->disposing()->terminate();
+                m_Thread->stop();
                 m_Thread->join();
             };
             // XEventListener
             virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException)
             {
-                m_Thread->disposing()->terminate();
+                m_Thread->stop();
                 m_Thread->join();
             };
         private:
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index be5879bf238d..e78ddf2322cf 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -109,7 +109,7 @@ UnxPluginComm::~UnxPluginComm()
         int status = 16777216;
         pid_t nExit = waitpid( m_nCommPID, &status, WUNTRACED );
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", nExit, m_nCommPID, WEXITSTATUS(status) );
+        fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", (int)nExit, (int)m_nCommPID, (int)WEXITSTATUS(status) );
 #else
         (void)nExit;
 #endif