From f7a8454152e71470e693de7d62cb669282cda52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Sch=C3=B6nheit?= Date: Thu, 26 Apr 2001 11:36:28 +0000 Subject: [PATCH] layout --- forms/source/component/FormComponent.cxx | 11 +++++------ forms/source/component/FormattedField.cxx | 10 +++++----- forms/source/component/ListBox.cxx | 24 +++++++++++------------ 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index e5a9efcfb8c6..871274e38b66 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FormComponent.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fs $ $Date: 2001-04-10 08:49:26 $ + * last change: $Author: fs $ $Date: 2001-04-26 12:36:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -142,14 +142,13 @@ OControl::OControl(const Reference& // das Aggregat selbst den Refcount erhoeht increment(m_refCount); { - m_xAggregate = Reference( - _rxFactory->createInstance(_sService), UNO_QUERY); - m_xControl = Reference(m_xAggregate, UNO_QUERY); + m_xAggregate = Reference(_rxFactory->createInstance(_sService), UNO_QUERY); + m_xControl = Reference(m_xAggregate, UNO_QUERY); } if (m_xAggregate.is()) { - m_xAggregate->setDelegator(static_cast(this)); + m_xAggregate->setDelegator(static_cast(this)); } // Refcount wieder bei NULL diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index ad8cc4ab0ae8..4237983f39ee 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FormattedField.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: fs $ $Date: 2001-04-02 10:28:06 $ + * last change: $Author: fs $ $Date: 2001-04-26 12:36:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -416,11 +416,11 @@ IMPL_LINK(OFormattedControl, OnKeyPressed, void*, EMPTYARG) { m_nKeyEvent = 0; - Reference xFComp(getModel(), UNO_QUERY); + Reference xFComp(getModel(), UNO_QUERY); InterfaceRef xParent = xFComp->getParent(); - Reference xSubmit(xParent, UNO_QUERY); + Reference xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) - xSubmit->submit( Reference (), MouseEvent() ); + xSubmit->submit( Reference (), MouseEvent() ); return 0L; } diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 17e2a7b1bd5a..a75becae6d3e 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ListBox.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: fs $ $Date: 2001-04-02 13:32:00 $ + * last change: $Author: fs $ $Date: 2001-04-26 12:36:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1214,7 +1214,7 @@ OListBoxControl::OListBoxControl(const Reference& _rxFacto xListbox->addItemListener(this); } // Refcount bei 2 fuer angemeldete Listener - sal_Int32 n = decrement(m_refCount); + decrement(m_refCount); m_aChangeTimer.SetTimeout(500); m_aChangeTimer.SetTimeoutHdl(LINK(this,OListBoxControl,OnTimeout)); @@ -1248,10 +1248,10 @@ StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(Runtim //------------------------------------------------------------------------------ void SAL_CALL OListBoxControl::focusGained(const FocusEvent& _rEvent) throw(RuntimeException) { - ::osl::ClearableMutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); if (m_aChangeListeners.getLength()) // only if there are listeners { - Reference xSet(getModel(), UNO_QUERY); + Reference xSet(getModel(), UNO_QUERY); if (xSet.is()) { // memorize the current selection for posting the change event @@ -1274,17 +1274,17 @@ void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw( ::osl::ClearableMutexGuard aGuard(m_aMutex); if (m_aChangeTimer.IsActive()) { - Reference xSet(getModel(), UNO_QUERY); - m_aCurrentSelection = xSet->getPropertyValue(PROPERTY_SELECT_SEQ); + Reference xSet(getModel(), UNO_QUERY); + m_aCurrentSelection = xSet->getPropertyValue(PROPERTY_SELECT_SEQ); - m_aChangeTimer.Stop(); - m_aChangeTimer.Start(); + m_aChangeTimer.Stop(); + m_aChangeTimer.Start(); } else { if (m_aChangeListeners.getLength() && m_aCurrentSelection.hasValue()) { - Reference xSet(getModel(), UNO_QUERY); + Reference xSet(getModel(), UNO_QUERY); if (xSet.is()) { // Has the selection been changed? @@ -1344,7 +1344,7 @@ void OListBoxControl::disposing() if (m_aChangeTimer.IsActive()) m_aChangeTimer.Stop(); - EventObject aEvt(static_cast< XWeak*>(this)); + EventObject aEvt(static_cast< XWeak*>(this)); m_aChangeListeners.disposeAndClear(aEvt); OBoundControl::disposing(); @@ -1353,7 +1353,7 @@ void OListBoxControl::disposing() //------------------------------------------------------------------------------ IMPL_LINK(OListBoxControl, OnTimeout, void*, EMPTYTAG) { - EventObject aEvt(static_cast< XWeak*>(this)); + EventObject aEvt(static_cast< XWeak*>(this)); NOTIFY_LISTENERS(m_aChangeListeners, XChangeListener, changed, aEvt); return 1; }