summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorRelease Engineering <releng@openoffice.org>2011-02-18 11:14:19 +0100
committerRelease Engineering <releng@openoffice.org>2011-02-18 11:14:19 +0100
commit9108e80cb4435bcaa878317d32e06c511594cdb1 (patch)
tree21a95a2946a26803e8b18925ca728b924241e4a7 /extensions/source
parent16680c16eb84b5315dbbeeb61b3693c4d567640a (diff)
parent2c0dad4acd41464a6942c11d2ef6f23d29615e1f (diff)
merged DEV300
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx8
-rw-r--r--extensions/source/ole/unoobjw.cxx2
-rw-r--r--extensions/source/oooimprovement/onlogrotate_job.cxx44
3 files changed, 27 insertions, 27 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..496ec6fea8db 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;
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: