summaryrefslogtreecommitdiff
path: root/UnoControls/source/controls
diff options
context:
space:
mode:
Diffstat (limited to 'UnoControls/source/controls')
-rw-r--r--UnoControls/source/controls/OConnectionPointContainerHelper.cxx14
-rw-r--r--UnoControls/source/controls/OConnectionPointHelper.cxx14
-rw-r--r--UnoControls/source/controls/framecontrol.cxx154
-rw-r--r--UnoControls/source/controls/progressbar.cxx148
-rw-r--r--UnoControls/source/controls/progressmonitor.cxx514
-rw-r--r--UnoControls/source/controls/statusindicator.cxx120
6 files changed, 482 insertions, 482 deletions
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index 2c578d37a003..d18ed4bc7452 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -23,11 +23,11 @@
// namespaces
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::cppu ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::lang ;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::cppu;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
namespace unocontrols{
@@ -63,7 +63,7 @@ Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType
aReturn = OWeakObject::queryInterface( aType );
}
- return aReturn ;
+ return aReturn;
}
// XInterface
@@ -114,7 +114,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon
xConnectionPoint = Reference< XConnectionPoint >( (OWeakObject*)pNewConnectionPoint, UNO_QUERY );
}
- return xConnectionPoint ;
+ return xConnectionPoint;
}
// XConnectionPointContainer
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index c776439c18bc..e5ca7836a238 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -23,11 +23,11 @@
// namespaces
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::cppu ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::lang ;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::cppu;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
namespace unocontrols{
@@ -68,7 +68,7 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw(
aReturn = OWeakObject::queryInterface( aType );
}
- return aReturn ;
+ return aReturn;
}
// XInterface
@@ -108,7 +108,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
}
// If container reference valid, return right type of supported interfaces of THIS connectionpoint.
- Type aReturnType = m_aInterfaceType ;
+ Type aReturnType = m_aInterfaceType;
// Don't forget this!
impl_UnlockContainer();
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index f6d94ef83515..7b50c3287e0a 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -32,15 +32,15 @@
// namespaces
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::cppu ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::beans ;
-using namespace ::com::sun::star::awt ;
-using namespace ::com::sun::star::frame ;
-using namespace ::com::sun::star::util ;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::cppu;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::util;
namespace unocontrols{
@@ -65,7 +65,7 @@ Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeExc
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
- Any aReturn ;
+ Any aReturn;
Reference< XInterface > xDel = BaseControl::impl_getDelegator();
if ( xDel.is() )
{
@@ -79,7 +79,7 @@ Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeExc
aReturn = queryAggregation( rType );
}
- return aReturn ;
+ return aReturn;
}
// XInterface
@@ -111,7 +111,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std:
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static OTypeCollection* pTypeCollection = NULL ;
+ static OTypeCollection* pTypeCollection = NULL;
if ( pTypeCollection == NULL )
{
@@ -128,7 +128,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std:
BaseControl::getTypes()
);
// ... and set his address to static pointer!
- pTypeCollection = &aTypeCollection ;
+ pTypeCollection = &aTypeCollection;
}
}
@@ -158,7 +158,7 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE
}
}
- return aReturn ;
+ return aReturn;
}
// XControl
@@ -181,7 +181,7 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo
sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception )
{
// We have no model.
- return sal_False ;
+ return sal_False;
}
// XControl
@@ -205,7 +205,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception )
sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception )
{
// it is not possible to print this control
- return sal_False ;
+ return sal_False;
}
// XView
@@ -257,7 +257,7 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
MutexGuard aGuard( Mutex::getGlobalMutex() );
Sequence< OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = SERVICENAME_FRAMECONTROL;
- return seqServiceNames ;
+ return seqServiceNames;
}
// impl but public method to register service
@@ -274,18 +274,18 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa
sal_Int32 nHandle ,
const Any& rValue ) throw( IllegalArgumentException )
{
- bool bReturn = false ;
+ bool bReturn = false;
switch (nHandle)
{
- case PROPERTYHANDLE_COMPONENTURL : rConvertedValue = rValue ;
- rOldValue <<= m_sComponentURL ;
- bReturn = true ;
- break ;
-
- case PROPERTYHANDLE_LOADERARGUMENTS : rConvertedValue = rValue ;
- rOldValue <<= m_seqLoaderArguments ;
- bReturn = true ;
- break ;
+ case PROPERTYHANDLE_COMPONENTURL : rConvertedValue = rValue;
+ rOldValue <<= m_sComponentURL;
+ bReturn = true;
+ break;
+
+ case PROPERTYHANDLE_LOADERARGUMENTS : rConvertedValue = rValue;
+ rOldValue <<= m_seqLoaderArguments;
+ bReturn = true;
+ break;
}
if ( !bReturn )
@@ -293,7 +293,7 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa
throw IllegalArgumentException();
}
- return bReturn ;
+ return bReturn;
}
// OPropertySetHelper
@@ -303,20 +303,20 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHan
throw ( ::com::sun::star::uno::Exception, std::exception )
{
// this method only set the value
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
switch (nHandle)
{
- case PROPERTYHANDLE_COMPONENTURL : rValue >>= m_sComponentURL ;
+ case PROPERTYHANDLE_COMPONENTURL : rValue >>= m_sComponentURL;
if (getPeer().is())
{
- impl_createFrame ( getPeer(), m_sComponentURL, m_seqLoaderArguments ) ;
+ impl_createFrame ( getPeer(), m_sComponentURL, m_seqLoaderArguments );
}
- break ;
+ break;
- case PROPERTYHANDLE_LOADERARGUMENTS : rValue >>= m_seqLoaderArguments ;
- break ;
+ case PROPERTYHANDLE_LOADERARGUMENTS : rValue >>= m_seqLoaderArguments;
+ break;
- default : OSL_ENSURE ( nHandle == -1, "This is an invalid property handle." ) ;
+ default : OSL_ENSURE ( nHandle == -1, "This is an invalid property handle." );
}
}
@@ -325,20 +325,20 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHan
void FrameControl::getFastPropertyValue( Any& rRet ,
sal_Int32 nHandle ) const
{
- MutexGuard aGuard ( Mutex::getGlobalMutex() ) ;
+ MutexGuard aGuard ( Mutex::getGlobalMutex() );
switch (nHandle)
{
- case PROPERTYHANDLE_COMPONENTURL : rRet <<= m_sComponentURL ;
- break ;
+ case PROPERTYHANDLE_COMPONENTURL : rRet <<= m_sComponentURL;
+ break;
- case PROPERTYHANDLE_LOADERARGUMENTS : rRet <<= m_seqLoaderArguments ;
- break ;
+ case PROPERTYHANDLE_LOADERARGUMENTS : rRet <<= m_seqLoaderArguments;
+ break;
- case PROPERTYHANDLE_FRAME : rRet <<= m_xFrame ;
- break ;
+ case PROPERTYHANDLE_FRAME : rRet <<= m_xFrame;
+ break;
- default : OSL_ENSURE ( nHandle == -1, "This is an invalid property handle." ) ;
+ default : OSL_ENSURE ( nHandle == -1, "This is an invalid property handle." );
}
}
@@ -347,12 +347,12 @@ void FrameControl::getFastPropertyValue( Any& rRet ,
IPropertyArrayHelper& FrameControl::getInfoHelper()
{
// Create a table that map names to index values.
- static OPropertyArrayHelper* pInfo ;
+ static OPropertyArrayHelper* pInfo;
if (!pInfo)
{
// global method must be guarded
- MutexGuard aGuard ( Mutex::getGlobalMutex() ) ;
+ MutexGuard aGuard ( Mutex::getGlobalMutex() );
if (!pInfo)
{
@@ -360,7 +360,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
}
}
- return *pInfo ;
+ return *pInfo;
}
// OPropertySetHelper
@@ -370,36 +370,36 @@ Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw(
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
- static Reference< XPropertySetInfo >* pInfo = (Reference< XPropertySetInfo >*)0 ;
+ static Reference< XPropertySetInfo >* pInfo = (Reference< XPropertySetInfo >*)0;
if ( pInfo == (Reference< XPropertySetInfo >*)0 )
{
// Ready for multithreading
- MutexGuard aGuard ( Mutex::getGlobalMutex () ) ;
+ MutexGuard aGuard ( Mutex::getGlobalMutex () );
// Control this pointer again, another instance can be faster then these!
if ( pInfo == (Reference< XPropertySetInfo >*)0 )
{
// Create structure of propertysetinfo for baseclass "OPropertySetHelper".
// (Use method "getInfoHelper()".)
- static Reference< XPropertySetInfo > xInfo ( createPropertySetInfo ( getInfoHelper () ) ) ;
- pInfo = &xInfo ;
+ static Reference< XPropertySetInfo > xInfo ( createPropertySetInfo ( getInfoHelper () ) );
+ pInfo = &xInfo;
}
}
- return ( *pInfo ) ;
+ return ( *pInfo );
}
// BaseControl
WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
{
- WindowDescriptor* pDescriptor = new WindowDescriptor ;
+ WindowDescriptor* pDescriptor = new WindowDescriptor;
- pDescriptor->Type = WindowClass_CONTAINER ;
- pDescriptor->ParentIndex = -1 ;
- pDescriptor->Parent = xParentPeer ;
- pDescriptor->Bounds = getPosSize () ;
- pDescriptor->WindowAttributes = 0 ;
+ pDescriptor->Type = WindowClass_CONTAINER;
+ pDescriptor->ParentIndex = -1;
+ pDescriptor->Parent = xParentPeer;
+ pDescriptor->Bounds = getPosSize ();
+ pDescriptor->WindowAttributes = 0;
- return pDescriptor ;
+ return pDescriptor;
}
// private method
@@ -408,50 +408,50 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee
const OUString& rURL ,
const Sequence< PropertyValue >& rArguments )
{
- Reference< XFrame2 > xOldFrame ;
- Reference< XFrame2 > xNewFrame ;
+ Reference< XFrame2 > xOldFrame;
+ Reference< XFrame2 > xNewFrame;
{
- MutexGuard aGuard ( m_aMutex ) ;
- xOldFrame = m_xFrame ;
+ MutexGuard aGuard ( m_aMutex );
+ xOldFrame = m_xFrame;
}
xNewFrame = Frame::create( impl_getComponentContext() );
- Reference< XWindow > xWP ( xPeer, UNO_QUERY ) ;
- xNewFrame->initialize ( xWP ) ;
+ Reference< XWindow > xWP ( xPeer, UNO_QUERY );
+ xNewFrame->initialize ( xWP );
// option
//xFrame->setName( "WhatYouWant" );
Reference< XURLTransformer > xTrans = URLTransformer::create( impl_getComponentContext() );
// load file
- URL aURL ;
- aURL.Complete = rURL ;
- xTrans->parseStrict( aURL ) ;
+ URL aURL;
+ aURL.Complete = rURL;
+ xTrans->parseStrict( aURL );
- Reference< XDispatch > xDisp = xNewFrame->queryDispatch ( aURL, OUString (), FrameSearchFlag::SELF ) ;
+ Reference< XDispatch > xDisp = xNewFrame->queryDispatch ( aURL, OUString (), FrameSearchFlag::SELF );
if (xDisp.is())
{
- xDisp->dispatch ( aURL, rArguments ) ;
+ xDisp->dispatch ( aURL, rArguments );
}
// set the frame
{
- MutexGuard aGuard ( m_aMutex ) ;
- m_xFrame = xNewFrame ;
+ MutexGuard aGuard ( m_aMutex );
+ m_xFrame = xNewFrame;
}
// notify the listeners
- sal_Int32 nFrameId = PROPERTYHANDLE_FRAME ;
- Any aNewFrame ( &xNewFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
- Any aOldFrame ( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
+ sal_Int32 nFrameId = PROPERTYHANDLE_FRAME;
+ Any aNewFrame ( &xNewFrame, ::getCppuType((const Reference< XFrame >*)0) );
+ Any aOldFrame ( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) );
- fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False ) ;
+ fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False );
if (xOldFrame.is())
{
- xOldFrame->dispose () ;
+ xOldFrame->dispose ();
}
}
@@ -494,7 +494,7 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
static const Sequence< Property > seqPropertys( pPropertys, PROPERTY_COUNT );
- return seqPropertys ;
+ return seqPropertys;
}
} // namespace unocontrols
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 33eedda5a3f1..28c7411d45f7 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -29,12 +29,12 @@
#include <math.h>
#include <limits.h>
-using namespace ::cppu ;
-using namespace ::osl ;
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::awt ;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::awt;
namespace unocontrols{
@@ -63,7 +63,7 @@ Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeExce
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
- Any aReturn ;
+ Any aReturn;
Reference< XInterface > xDel = BaseControl::impl_getDelegator();
if ( xDel.is() )
{
@@ -77,7 +77,7 @@ Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeExce
aReturn = queryAggregation( rType );
}
- return aReturn ;
+ return aReturn;
}
// XInterface
@@ -109,7 +109,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static OTypeCollection* pTypeCollection = NULL ;
+ static OTypeCollection* pTypeCollection = NULL;
if ( pTypeCollection == NULL )
{
@@ -125,7 +125,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::
BaseControl::getTypes()
);
// ... and set his address to static pointer!
- pTypeCollection = &aTypeCollection ;
+ pTypeCollection = &aTypeCollection;
}
}
@@ -151,7 +151,7 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
aReturn = BaseControl::queryAggregation( aType );
}
- return aReturn ;
+ return aReturn;
}
// XProgressBar
@@ -159,13 +159,13 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
// Safe color for later use.
- m_nForegroundColor = nColor ;
+ m_nForegroundColor = nColor;
// Repaint control
- impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+ impl_paint ( 0, 0, impl_getGraphicsPeer() );
}
// XProgressBar
@@ -173,13 +173,13 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime
void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
// Safe color for later use.
- m_nBackgroundColor = nColor ;
+ m_nBackgroundColor = nColor;
// Repaint control
- impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+ impl_paint ( 0, 0, impl_getGraphicsPeer() );
}
// XProgressBar
@@ -191,11 +191,11 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException
// 2) Values <= _nMaxRange
// Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
// save impossible cases
// This method is only defined for valid values
- DBG_ASSERT ( (( nValue >= m_nMinRange ) && ( nValue <= m_nMaxRange )), "ProgressBar::setValue()\nNot valid value.\n" ) ;
+ DBG_ASSERT ( (( nValue >= m_nMinRange ) && ( nValue <= m_nMaxRange )), "ProgressBar::setValue()\nNot valid value.\n" );
// If new value not valid ... do nothing in release version!
if (
@@ -204,10 +204,10 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException
)
{
// New value is ok => save this
- m_nValue = nValue ;
+ m_nValue = nValue;
// Repaint to display changes
- impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+ impl_paint ( 0, 0, impl_getGraphicsPeer() );
}
}
@@ -223,30 +223,30 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
// save impossible cases
// This method is only defined for valid values
// If you ignore this, the release version wil produce an error "division by zero" in "ProgressBar::setValue()"!
- DBG_ASSERT ( ( nMin != nMax ) , "ProgressBar::setRange()\nValues for MIN and MAX are the same. This is not allowed!\n" ) ;
+ DBG_ASSERT ( ( nMin != nMax ) , "ProgressBar::setRange()\nValues for MIN and MAX are the same. This is not allowed!\n" );
// Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
// control the values for min and max
if ( nMin < nMax )
{
// Take correct Min and Max
- m_nMinRange = nMin ;
- m_nMaxRange = nMax ;
+ m_nMinRange = nMin;
+ m_nMaxRange = nMax;
}
else
{
// Change Min and Max automaticly
- m_nMinRange = nMax ;
- m_nMaxRange = nMin ;
+ m_nMinRange = nMax;
+ m_nMaxRange = nMin;
}
// assure that m_nValue is within the range
if (!(m_nMinRange < m_nValue && m_nValue < m_nMaxRange))
m_nValue = m_nMinRange;
- impl_recalcRange () ;
+ impl_recalcRange ();
// Do not repaint the control at this place!!!
// An old "m_nValue" is set and can not be correct for this new range.
@@ -258,9 +258,9 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
- return ( m_nValue ) ;
+ return ( m_nValue );
}
// XWindow
@@ -275,8 +275,8 @@ void SAL_CALL ProgressBar::setPosSize (
{
// Take old size BEFORE you set the new values at baseclass!
// You will control changes. At the other way, the values are the same!
- Rectangle aBasePosSize = getPosSize () ;
- BaseControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
+ Rectangle aBasePosSize = getPosSize ();
+ BaseControl::setPosSize (nX, nY, nWidth, nHeight, nFlags);
// Do only, if size has changed.
if (
@@ -284,8 +284,8 @@ void SAL_CALL ProgressBar::setPosSize (
( nHeight != aBasePosSize.Height )
)
{
- impl_recalcRange ( ) ;
- impl_paint ( 0, 0, impl_getGraphicsPeer () ) ;
+ impl_recalcRange ( );
+ impl_paint ( 0, 0, impl_getGraphicsPeer () );
}
}
@@ -294,7 +294,7 @@ void SAL_CALL ProgressBar::setPosSize (
sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception )
{
// A model is not possible for this control.
- return sal_False ;
+ return sal_False;
}
// XControl
@@ -324,42 +324,42 @@ const OUString ProgressBar::impl_getStaticImplementationName()
void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
{
// save impossible cases
- DBG_ASSERT ( rGraphics.is(), "ProgressBar::paint()\nCalled with invalid Reference< XGraphics > ." ) ;
+ DBG_ASSERT ( rGraphics.is(), "ProgressBar::paint()\nCalled with invalid Reference< XGraphics > ." );
// This paint method ist not buffered !!
// Every request paint the completely control. ( but only, if peer exist )
if ( rGraphics.is () )
{
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
// Clear background
// (same color for line and fill)
- rGraphics->setFillColor ( m_nBackgroundColor ) ;
- rGraphics->setLineColor ( m_nBackgroundColor ) ;
- rGraphics->drawRect ( nX, nY, impl_getWidth(), impl_getHeight() ) ;
+ rGraphics->setFillColor ( m_nBackgroundColor );
+ rGraphics->setLineColor ( m_nBackgroundColor );
+ rGraphics->drawRect ( nX, nY, impl_getWidth(), impl_getHeight() );
// same color for line and fill for blocks
- rGraphics->setFillColor ( m_nForegroundColor ) ;
- rGraphics->setLineColor ( m_nForegroundColor ) ;
+ rGraphics->setFillColor ( m_nForegroundColor );
+ rGraphics->setLineColor ( m_nForegroundColor );
- sal_Int32 nBlockStart = 0 ; // = left site of new block
- sal_Int32 nBlockCount = m_nBlockValue!=0.00 ? (sal_Int32)((m_nValue-m_nMinRange)/m_nBlockValue) : 0 ; // = number of next block
+ sal_Int32 nBlockStart = 0; // = left site of new block
+ sal_Int32 nBlockCount = m_nBlockValue!=0.00 ? (sal_Int32)((m_nValue-m_nMinRange)/m_nBlockValue) : 0; // = number of next block
// Draw horizontal progressbar
// decision in "recalcRange()"
if (m_bHorizontal)
{
// Step to left side of window
- nBlockStart = nX ;
+ nBlockStart = nX;
for ( sal_Int16 i=1; i<=nBlockCount; ++i )
{
// step free field
- nBlockStart += PROGRESSBAR_FREESPACE ;
+ nBlockStart += PROGRESSBAR_FREESPACE;
// paint block
- rGraphics->drawRect (nBlockStart, nY+PROGRESSBAR_FREESPACE, m_aBlockSize.Width, m_aBlockSize.Height) ;
+ rGraphics->drawRect (nBlockStart, nY+PROGRESSBAR_FREESPACE, m_aBlockSize.Width, m_aBlockSize.Height);
// step next free field
- nBlockStart += m_aBlockSize.Width ;
+ nBlockStart += m_aBlockSize.Width;
}
}
// draw vertikal progressbar
@@ -367,28 +367,28 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
else
{
// step to bottom side of window
- nBlockStart = nY+impl_getHeight() ;
- nBlockStart -= m_aBlockSize.Height ;
+ nBlockStart = nY+impl_getHeight();
+ nBlockStart -= m_aBlockSize.Height;
for ( sal_Int16 i=1; i<=nBlockCount; ++i )
{
// step free field
- nBlockStart -= PROGRESSBAR_FREESPACE ;
+ nBlockStart -= PROGRESSBAR_FREESPACE;
// paint block
- rGraphics->drawRect (nX+PROGRESSBAR_FREESPACE, nBlockStart, m_aBlockSize.Width, m_aBlockSize.Height) ;
+ rGraphics->drawRect (nX+PROGRESSBAR_FREESPACE, nBlockStart, m_aBlockSize.Width, m_aBlockSize.Height);
// step next free field
nBlockStart -= m_aBlockSize.Height;
}
}
// Paint shadow border around the progressbar
- rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_SHADOW ) ;
- rGraphics->drawLine ( nX, nY, impl_getWidth(), nY ) ;
- rGraphics->drawLine ( nX, nY, nX , impl_getHeight() ) ;
+ rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_SHADOW );
+ rGraphics->drawLine ( nX, nY, impl_getWidth(), nY );
+ rGraphics->drawLine ( nX, nY, nX , impl_getHeight() );
- rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_BRIGHT ) ;
- rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY ) ;
- rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, nX , impl_getHeight()-1 ) ;
+ rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_BRIGHT );
+ rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY );
+ rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, nX , impl_getHeight()-1 );
}
}
@@ -396,35 +396,35 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
void ProgressBar::impl_recalcRange ()
{
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
- sal_Int32 nWindowWidth = impl_getWidth() ;
- sal_Int32 nWindowHeight = impl_getHeight() ;
- double fBlockHeight ;
- double fBlockWidth ;
- double fMaxBlocks ;
+ sal_Int32 nWindowWidth = impl_getWidth();
+ sal_Int32 nWindowHeight = impl_getHeight();
+ double fBlockHeight;
+ double fBlockWidth;
+ double fMaxBlocks;
if( nWindowWidth > nWindowHeight )
{
- m_bHorizontal = true ;
- fBlockHeight = (nWindowHeight-(2*PROGRESSBAR_FREESPACE)) ;
- fBlockWidth = fBlockHeight ;
+ m_bHorizontal = true;
+ fBlockHeight = (nWindowHeight-(2*PROGRESSBAR_FREESPACE));
+ fBlockWidth = fBlockHeight;
fMaxBlocks = nWindowWidth/(fBlockWidth+PROGRESSBAR_FREESPACE);
}
else
{
- m_bHorizontal = false ;
- fBlockWidth = (nWindowWidth-(2*PROGRESSBAR_FREESPACE)) ;
- fBlockHeight = fBlockWidth ;
+ m_bHorizontal = false;
+ fBlockWidth = (nWindowWidth-(2*PROGRESSBAR_FREESPACE));
+ fBlockHeight = fBlockWidth;
fMaxBlocks = nWindowHeight/(fBlockHeight+PROGRESSBAR_FREESPACE);
}
- double fRange = m_nMaxRange-m_nMinRange ;
- double fBlockValue = fRange/fMaxBlocks ;
+ double fRange = m_nMaxRange-m_nMinRange;
+ double fBlockValue = fRange/fMaxBlocks;
- m_nBlockValue = fBlockValue ;
+ m_nBlockValue = fBlockValue;
m_aBlockSize.Height = (sal_Int32)fBlockHeight;
- m_aBlockSize.Width = (sal_Int32)fBlockWidth ;
+ m_aBlockSize.Width = (sal_Int32)fBlockWidth;
}
} // namespace unocontrols
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 3a19291abdc3..c650dbed0ffe 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -31,12 +31,12 @@
#include "progressbar.hxx"
-using namespace ::cppu ;
-using namespace ::osl ;
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::awt ;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::awt;
using ::std::vector;
using ::std::find;
@@ -48,38 +48,38 @@ ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >
{
// Its not allowed to work with member in this method (refcounter !!!)
// But with a HACK (++refcount) its "OK" :-(
- ++m_refCount ;
+ ++m_refCount;
// Create instances for fixedtext, button and progress ...
- m_xTopic_Top = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY ) ;
- m_xText_Top = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY ) ;
- m_xTopic_Bottom = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY ) ;
- m_xText_Bottom = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY ) ;
- m_xButton = css::uno::Reference< XButton > ( rxContext->getServiceManager()->createInstanceWithContext( BUTTON_SERVICENAME, rxContext ), UNO_QUERY ) ;
+ m_xTopic_Top = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY );
+ m_xText_Top = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY );
+ m_xTopic_Bottom = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY );
+ m_xText_Bottom = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY );
+ m_xButton = css::uno::Reference< XButton > ( rxContext->getServiceManager()->createInstanceWithContext( BUTTON_SERVICENAME, rxContext ), UNO_QUERY );
m_xProgressBar = new ProgressBar(rxContext);
// ... cast controls to Reference< XControl > (for "setModel"!) ...
- css::uno::Reference< XControl > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Text_Top ( m_xText_Top , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Topic_Bottom ( m_xTopic_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Text_Bottom ( m_xText_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Button ( m_xButton , UNO_QUERY ) ;
+ css::uno::Reference< XControl > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Text_Top ( m_xText_Top , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Topic_Bottom ( m_xTopic_Bottom , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Text_Bottom ( m_xText_Bottom , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Button ( m_xButton , UNO_QUERY );
// ... set models ...
- xRef_Topic_Top->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) ) ;
- xRef_Text_Top->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) ) ;
- xRef_Topic_Bottom->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) ) ;
- xRef_Text_Bottom->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) ) ;
- xRef_Button->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( BUTTON_MODELNAME, rxContext ), UNO_QUERY ) ) ;
+ xRef_Topic_Top->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) );
+ xRef_Text_Top->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) );
+ xRef_Topic_Bottom->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) );
+ xRef_Text_Bottom->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_MODELNAME, rxContext ), UNO_QUERY ) );
+ xRef_Button->setModel ( css::uno::Reference< XControlModel > ( rxContext->getServiceManager()->createInstanceWithContext( BUTTON_MODELNAME, rxContext ), UNO_QUERY ) );
// ProgressBar has no model !!!
// ... and add controls to basecontainercontrol!
- addControl ( CONTROLNAME_TEXT, xRef_Topic_Top ) ;
- addControl ( CONTROLNAME_TEXT, xRef_Text_Top ) ;
- addControl ( CONTROLNAME_TEXT, xRef_Topic_Bottom ) ;
- addControl ( CONTROLNAME_TEXT, xRef_Text_Bottom ) ;
- addControl ( CONTROLNAME_BUTTON, xRef_Button ) ;
+ addControl ( CONTROLNAME_TEXT, xRef_Topic_Top );
+ addControl ( CONTROLNAME_TEXT, xRef_Text_Top );
+ addControl ( CONTROLNAME_TEXT, xRef_Topic_Bottom );
+ addControl ( CONTROLNAME_TEXT, xRef_Text_Bottom );
+ addControl ( CONTROLNAME_BUTTON, xRef_Button );
addControl ( CONTROLNAME_PROGRESSBAR, m_xProgressBar.get() );
// FixedText make it automaticly visible by himself ... but not the progressbar !!!
@@ -88,18 +88,18 @@ ProgressMonitor::ProgressMonitor( const css::uno::Reference< XComponentContext >
// Reset to defaults !!!
// (progressbar take automaticly its own defaults)
- m_xButton->setLabel ( DEFAULT_BUTTONLABEL ) ;
- m_xTopic_Top->setText ( PROGRESSMONITOR_DEFAULT_TOPIC ) ;
- m_xText_Top->setText ( PROGRESSMONITOR_DEFAULT_TEXT ) ;
- m_xTopic_Bottom->setText ( PROGRESSMONITOR_DEFAULT_TOPIC ) ;
- m_xText_Bottom->setText ( PROGRESSMONITOR_DEFAULT_TEXT ) ;
+ m_xButton->setLabel ( DEFAULT_BUTTONLABEL );
+ m_xTopic_Top->setText ( PROGRESSMONITOR_DEFAULT_TOPIC );
+ m_xText_Top->setText ( PROGRESSMONITOR_DEFAULT_TEXT );
+ m_xTopic_Bottom->setText ( PROGRESSMONITOR_DEFAULT_TOPIC );
+ m_xText_Bottom->setText ( PROGRESSMONITOR_DEFAULT_TEXT );
- --m_refCount ;
+ --m_refCount;
}
ProgressMonitor::~ProgressMonitor()
{
- impl_cleanMemory () ;
+ impl_cleanMemory ();
}
// XInterface
@@ -107,7 +107,7 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( Runtime
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
- Any aReturn ;
+ Any aReturn;
css::uno::Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
if ( xDel.is() )
{
@@ -121,7 +121,7 @@ Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( Runtime
aReturn = queryAggregation( rType );
}
- return aReturn ;
+ return aReturn;
}
// XInterface
@@ -150,7 +150,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, s
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static OTypeCollection* pTypeCollection = NULL ;
+ static OTypeCollection* pTypeCollection = NULL;
if ( pTypeCollection == NULL )
{
@@ -167,7 +167,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, s
BaseContainerControl::getTypes()
);
// ... and set his address to static pointer!
- pTypeCollection = &aTypeCollection ;
+ pTypeCollection = &aTypeCollection;
}
}
@@ -193,7 +193,7 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti
aReturn = BaseControl::queryAggregation( aType );
}
- return aReturn ;
+ return aReturn;
}
// XProgressMonitor
@@ -205,26 +205,26 @@ void SAL_CALL ProgressMonitor::addText(
{
// Safe impossible cases
// Check valid call of this method.
- DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ) , "ProgressMonitor::addText()\nCall without valid parameters!\n") ;
- DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != NULL ) , "ProgresMonitor::addText()\nThe text already exist.\n" ) ;
+ DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ) , "ProgressMonitor::addText()\nCall without valid parameters!\n");
+ DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != NULL ) , "ProgresMonitor::addText()\nThe text already exist.\n" );
// Do nothing (in Release), if topic already exist.
if ( impl_searchTopic ( rTopic, bbeforeProgress ) != NULL )
{
- return ;
+ return;
}
// Else ... take memory for new item ...
- IMPL_TextlistItem* pTextItem = new IMPL_TextlistItem ;
+ IMPL_TextlistItem* pTextItem = new IMPL_TextlistItem;
if ( pTextItem != NULL )
{
// Set values ...
- pTextItem->sTopic = rTopic ;
- pTextItem->sText = rText ;
+ pTextItem->sTopic = rTopic;
+ pTextItem->sText = rText;
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// ... and insert it in right list.
if ( bbeforeProgress == sal_True )
@@ -238,8 +238,8 @@ void SAL_CALL ProgressMonitor::addText(
}
// ... update window
- impl_rebuildFixedText () ;
- impl_recalcLayout () ;
+ impl_rebuildFixedText ();
+ impl_recalcLayout ();
}
// XProgressMonitor
@@ -247,15 +247,15 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
{
// Safe impossible cases
// Check valid call of this method.
- DBG_ASSERT ( impl_debug_checkParameter ( rTopic, bbeforeProgress ), "ProgressMonitor::removeText()\nCall without valid parameters!\n" ) ;
+ DBG_ASSERT ( impl_debug_checkParameter ( rTopic, bbeforeProgress ), "ProgressMonitor::removeText()\nCall without valid parameters!\n" );
// Search the topic ...
- IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress ) ;
+ IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress );
if ( pSearchItem != NULL )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// ... delete item from right list ...
if ( bbeforeProgress == sal_True )
@@ -273,11 +273,11 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
maTextlist_Bottom.erase(itr);
}
- delete pSearchItem ;
+ delete pSearchItem;
// ... and update window.
- impl_rebuildFixedText () ;
- impl_recalcLayout () ;
+ impl_rebuildFixedText ();
+ impl_recalcLayout ();
}
}
@@ -290,22 +290,22 @@ void SAL_CALL ProgressMonitor::updateText (
{
// Safe impossible cases
// Check valid call of this method.
- DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ), "ProgressMonitor::updateText()\nCall without valid parameters!\n" ) ;
+ DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ), "ProgressMonitor::updateText()\nCall without valid parameters!\n" );
// Search topic ...
- IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress ) ;
+ IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress );
if ( pSearchItem != NULL )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// ... update text ...
- pSearchItem->sText = rText ;
+ pSearchItem->sText = rText;
// ... and update window.
- impl_rebuildFixedText () ;
- impl_recalcLayout () ;
+ impl_rebuildFixedText ();
+ impl_recalcLayout ();
}
}
@@ -313,56 +313,56 @@ void SAL_CALL ProgressMonitor::updateText (
void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
- m_xProgressBar->setForegroundColor ( nColor ) ;
+ m_xProgressBar->setForegroundColor ( nColor );
}
// XProgressBar
void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
- m_xProgressBar->setBackgroundColor ( nColor ) ;
+ m_xProgressBar->setBackgroundColor ( nColor );
}
// XProgressBar
void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
- m_xProgressBar->setValue ( nValue ) ;
+ m_xProgressBar->setValue ( nValue );
}
// XProgressBar
void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
- m_xProgressBar->setRange ( nMin, nMax ) ;
+ m_xProgressBar->setRange ( nMin, nMax );
}
// XProgressBar
sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
- return m_xProgressBar->getValue () ;
+ return m_xProgressBar->getValue ();
}
// XButton
void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
if ( m_xButton.is () )
{
- m_xButton->addActionListener ( rListener ) ;
+ m_xButton->addActionListener ( rListener );
}
}
@@ -370,11 +370,11 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA
void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
if ( m_xButton.is () )
{
- m_xButton->removeActionListener ( rListener ) ;
+ m_xButton->removeActionListener ( rListener );
}
}
@@ -382,11 +382,11 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference<
void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
if ( m_xButton.is () )
{
- m_xButton->setLabel ( rLabel ) ;
+ m_xButton->setLabel ( rLabel );
}
}
@@ -394,30 +394,30 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim
void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
if ( m_xButton.is () )
{
- m_xButton->setActionCommand ( rCommand ) ;
+ m_xButton->setActionCommand ( rCommand );
}
}
// XLayoutConstrains
Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException, std::exception )
{
- return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT) ;
+ return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT);
}
// XLayoutConstrains
Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ClearableMutexGuard aGuard ( m_aMutex ) ;
+ ClearableMutexGuard aGuard ( m_aMutex );
// get information about required place of child controls
- css::uno::Reference< XLayoutConstrains > xTopicLayout_Top ( m_xTopic_Top , UNO_QUERY ) ;
- css::uno::Reference< XLayoutConstrains > xTopicLayout_Bottom ( m_xTopic_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XLayoutConstrains > xButtonLayout ( m_xButton , UNO_QUERY ) ;
+ css::uno::Reference< XLayoutConstrains > xTopicLayout_Top ( m_xTopic_Top , UNO_QUERY );
+ css::uno::Reference< XLayoutConstrains > xTopicLayout_Bottom ( m_xTopic_Bottom , UNO_QUERY );
+ css::uno::Reference< XLayoutConstrains > xButtonLayout ( m_xButton , UNO_QUERY );
Size aTopicSize_Top = xTopicLayout_Top->getPreferredSize ();
Size aTopicSize_Bottom = xTopicLayout_Bottom->getPreferredSize ();
@@ -425,37 +425,37 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std:
Rectangle aTempRectangle = m_xProgressBar->getPosSize();
Size aProgressBarSize = Size( aTempRectangle.Width, aTempRectangle.Height );
- aGuard.clear () ;
+ aGuard.clear ();
// calc preferred size of progressmonitor
- sal_Int32 nWidth = 3 * PROGRESSMONITOR_FREEBORDER ;
- nWidth += aProgressBarSize.Width ;
+ sal_Int32 nWidth = 3 * PROGRESSMONITOR_FREEBORDER;
+ nWidth += aProgressBarSize.Width;
- sal_Int32 nHeight = 6 * PROGRESSMONITOR_FREEBORDER ;
- nHeight += aTopicSize_Top.Height ;
- nHeight += aProgressBarSize.Height ;
+ sal_Int32 nHeight = 6 * PROGRESSMONITOR_FREEBORDER;
+ nHeight += aTopicSize_Top.Height;
+ nHeight += aProgressBarSize.Height;
nHeight += aTopicSize_Bottom.Height;
- nHeight += 2 ; // 1 for black line, 1 for white line = 3D-Line!
- nHeight += aButtonSize.Height ;
+ nHeight += 2; // 1 for black line, 1 for white line = 3D-Line!
+ nHeight += aButtonSize.Height;
// norm to minimum
if ( nWidth < PROGRESSMONITOR_DEFAULT_WIDTH )
{
- nWidth = PROGRESSMONITOR_DEFAULT_WIDTH ;
+ nWidth = PROGRESSMONITOR_DEFAULT_WIDTH;
}
if ( nHeight < PROGRESSMONITOR_DEFAULT_HEIGHT )
{
- nHeight = PROGRESSMONITOR_DEFAULT_HEIGHT ;
+ nHeight = PROGRESSMONITOR_DEFAULT_HEIGHT;
}
// return to caller
- return Size ( nWidth, nHeight ) ;
+ return Size ( nWidth, nHeight );
}
// XLayoutConstrains
Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception )
{
- return getPreferredSize () ;
+ return getPreferredSize ();
}
// XControl
@@ -463,13 +463,13 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit
{
if (!getPeer().is())
{
- BaseContainerControl::createPeer ( rToolkit, rParent ) ;
+ BaseContainerControl::createPeer ( rToolkit, rParent );
// If user forget to call "setPosSize()", we have still a correct size.
// And a "MinimumSize" IS A "MinimumSize"!
// We change not the position of control at this point.
- Size aDefaultSize = getMinimumSize () ;
- setPosSize ( 0, 0, aDefaultSize.Width, aDefaultSize.Height, PosSize::SIZE ) ;
+ Size aDefaultSize = getMinimumSize ();
+ setPosSize ( 0, 0, aDefaultSize.Width, aDefaultSize.Height, PosSize::SIZE );
}
}
@@ -477,54 +477,54 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit
sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception )
{
// We have no model.
- return sal_False ;
+ return sal_False;
}
// XControl
css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException, std::exception )
{
// We have no model.
- // return (XControlModel*)this ;
- return css::uno::Reference< XControlModel > () ;
+ // return (XControlModel*)this;
+ return css::uno::Reference< XControlModel > ();
}
// XComponent
void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// "removeControl()" control the state of a reference
- css::uno::Reference< XControl > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Text_Top ( m_xText_Top , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Topic_Bottom ( m_xTopic_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Text_Bottom ( m_xText_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XControl > xRef_Button ( m_xButton , UNO_QUERY ) ;
-
- removeControl ( xRef_Topic_Top ) ;
- removeControl ( xRef_Text_Top ) ;
- removeControl ( xRef_Topic_Bottom ) ;
- removeControl ( xRef_Text_Bottom ) ;
- removeControl ( xRef_Button ) ;
+ css::uno::Reference< XControl > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Text_Top ( m_xText_Top , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Topic_Bottom ( m_xTopic_Bottom , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Text_Bottom ( m_xText_Bottom , UNO_QUERY );
+ css::uno::Reference< XControl > xRef_Button ( m_xButton , UNO_QUERY );
+
+ removeControl ( xRef_Topic_Top );
+ removeControl ( xRef_Text_Top );
+ removeControl ( xRef_Topic_Bottom );
+ removeControl ( xRef_Text_Bottom );
+ removeControl ( xRef_Button );
removeControl ( m_xProgressBar.get() );
// do'nt use "...->clear ()" or "... = XFixedText ()"
// when other hold a reference at this object !!!
- xRef_Topic_Top->dispose () ;
- xRef_Text_Top->dispose () ;
- xRef_Topic_Bottom->dispose () ;
- xRef_Text_Bottom->dispose () ;
- xRef_Button->dispose () ;
+ xRef_Topic_Top->dispose ();
+ xRef_Text_Top->dispose ();
+ xRef_Topic_Bottom->dispose ();
+ xRef_Text_Bottom->dispose ();
+ xRef_Button->dispose ();
m_xProgressBar->dispose();
- BaseContainerControl::dispose () ;
+ BaseContainerControl::dispose ();
}
// XWindow
void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException, std::exception )
{
- Rectangle aBasePosSize = getPosSize () ;
- BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
+ Rectangle aBasePosSize = getPosSize ();
+ BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags);
// if position or size changed
if (
@@ -533,12 +533,12 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int3
)
{
// calc new layout for controls
- impl_recalcLayout () ;
+ impl_recalcLayout ();
// clear background (!)
// [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
getPeer()->invalidate(2);
// and repaint the control
- impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+ impl_paint ( 0, 0, impl_getGraphicsPeer() );
}
}
@@ -560,217 +560,217 @@ void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R
if (rGraphics.is())
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// paint shadowed border around the progressmonitor
- rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW ) ;
- rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY ) ;
- rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, nX , impl_getHeight()-1 ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW );
+ rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY );
+ rGraphics->drawLine ( impl_getWidth()-1, impl_getHeight()-1, nX , impl_getHeight()-1 );
- rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT ) ;
- rGraphics->drawLine ( nX, nY, impl_getWidth(), nY ) ;
- rGraphics->drawLine ( nX, nY, nX , impl_getHeight() ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT );
+ rGraphics->drawLine ( nX, nY, impl_getWidth(), nY );
+ rGraphics->drawLine ( nX, nY, nX , impl_getHeight() );
// Paint 3D-line
- rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW ) ;
- rGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW );
+ rGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y );
- rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT ) ;
- rGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT );
+ rGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 );
}
}
// private method
void ProgressMonitor::impl_recalcLayout ()
{
- sal_Int32 nX_Button ;
- sal_Int32 nY_Button ;
- sal_Int32 nWidth_Button ;
- sal_Int32 nHeight_Button ;
+ sal_Int32 nX_Button;
+ sal_Int32 nY_Button;
+ sal_Int32 nWidth_Button;
+ sal_Int32 nHeight_Button;
- sal_Int32 nX_ProgressBar ;
- sal_Int32 nY_ProgressBar ;
- sal_Int32 nWidth_ProgressBar ;
- sal_Int32 nHeight_ProgressBar ;
+ sal_Int32 nX_ProgressBar;
+ sal_Int32 nY_ProgressBar;
+ sal_Int32 nWidth_ProgressBar;
+ sal_Int32 nHeight_ProgressBar;
- sal_Int32 nX_Text_Top ;
- sal_Int32 nY_Text_Top ;
- sal_Int32 nWidth_Text_Top ;
- sal_Int32 nHeight_Text_Top ;
+ sal_Int32 nX_Text_Top;
+ sal_Int32 nY_Text_Top;
+ sal_Int32 nWidth_Text_Top;
+ sal_Int32 nHeight_Text_Top;
- sal_Int32 nX_Topic_Top ;
- sal_Int32 nY_Topic_Top ;
- sal_Int32 nWidth_Topic_Top ;
- sal_Int32 nHeight_Topic_Top ;
+ sal_Int32 nX_Topic_Top;
+ sal_Int32 nY_Topic_Top;
+ sal_Int32 nWidth_Topic_Top;
+ sal_Int32 nHeight_Topic_Top;
- sal_Int32 nX_Text_Bottom ;
- sal_Int32 nY_Text_Bottom ;
- sal_Int32 nWidth_Text_Bottom ;
- sal_Int32 nHeight_Text_Bottom ;
+ sal_Int32 nX_Text_Bottom;
+ sal_Int32 nY_Text_Bottom;
+ sal_Int32 nWidth_Text_Bottom;
+ sal_Int32 nHeight_Text_Bottom;
- sal_Int32 nX_Topic_Bottom ;
- sal_Int32 nY_Topic_Bottom ;
- sal_Int32 nWidth_Topic_Bottom ;
- sal_Int32 nHeight_Topic_Bottom ;
+ sal_Int32 nX_Topic_Bottom;
+ sal_Int32 nY_Topic_Bottom;
+ sal_Int32 nWidth_Topic_Bottom;
+ sal_Int32 nHeight_Topic_Bottom;
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// get information about required place of child controls
- css::uno::Reference< XLayoutConstrains > xTopicLayout_Top ( m_xTopic_Top , UNO_QUERY ) ;
- css::uno::Reference< XLayoutConstrains > xTextLayout_Top ( m_xText_Top , UNO_QUERY ) ;
- css::uno::Reference< XLayoutConstrains > xTopicLayout_Bottom ( m_xTopic_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XLayoutConstrains > xTextLayout_Bottom ( m_xText_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XLayoutConstrains > xButtonLayout ( m_xButton , UNO_QUERY ) ;
-
- Size aTopicSize_Top = xTopicLayout_Top->getPreferredSize () ;
- Size aTextSize_Top = xTextLayout_Top->getPreferredSize () ;
- Size aTopicSize_Bottom = xTopicLayout_Bottom->getPreferredSize () ;
- Size aTextSize_Bottom = xTextLayout_Bottom->getPreferredSize () ;
- Size aButtonSize = xButtonLayout->getPreferredSize () ;
+ css::uno::Reference< XLayoutConstrains > xTopicLayout_Top ( m_xTopic_Top , UNO_QUERY );
+ css::uno::Reference< XLayoutConstrains > xTextLayout_Top ( m_xText_Top , UNO_QUERY );
+ css::uno::Reference< XLayoutConstrains > xTopicLayout_Bottom ( m_xTopic_Bottom , UNO_QUERY );
+ css::uno::Reference< XLayoutConstrains > xTextLayout_Bottom ( m_xText_Bottom , UNO_QUERY );
+ css::uno::Reference< XLayoutConstrains > xButtonLayout ( m_xButton , UNO_QUERY );
+
+ Size aTopicSize_Top = xTopicLayout_Top->getPreferredSize ();
+ Size aTextSize_Top = xTextLayout_Top->getPreferredSize ();
+ Size aTopicSize_Bottom = xTopicLayout_Bottom->getPreferredSize ();
+ Size aTextSize_Bottom = xTextLayout_Bottom->getPreferredSize ();
+ Size aButtonSize = xButtonLayout->getPreferredSize ();
// calc position and size of child controls
// Button has preferred size!
- nWidth_Button = aButtonSize.Width ;
- nHeight_Button = aButtonSize.Height ;
+ nWidth_Button = aButtonSize.Width;
+ nHeight_Button = aButtonSize.Height;
// Left column before progressbar has preferred size and fixed position.
// But "Width" is oriented on left column below progressbar to!!! "max(...)"
- nX_Topic_Top = PROGRESSMONITOR_FREEBORDER ;
- nY_Topic_Top = PROGRESSMONITOR_FREEBORDER ;
- nWidth_Topic_Top = std::max( aTopicSize_Top.Width, aTopicSize_Bottom.Width ) ;
- nHeight_Topic_Top = aTopicSize_Top.Height ;
+ nX_Topic_Top = PROGRESSMONITOR_FREEBORDER;
+ nY_Topic_Top = PROGRESSMONITOR_FREEBORDER;
+ nWidth_Topic_Top = std::max( aTopicSize_Top.Width, aTopicSize_Bottom.Width );
+ nHeight_Topic_Top = aTopicSize_Top.Height;
// Right column before progressbar has relativ position to left column ...
// ... and a size as rest of dialog size!
nX_Text_Top = nX_Topic_Top+nWidth_Topic_Top+PROGRESSMONITOR_FREEBORDER;
- nY_Text_Top = nY_Topic_Top ;
- nWidth_Text_Top = std::max ( aTextSize_Top.Width, aTextSize_Bottom.Width ) ;
+ nY_Text_Top = nY_Topic_Top;
+ nWidth_Text_Top = std::max ( aTextSize_Top.Width, aTextSize_Bottom.Width );
// Fix size of this column to minimum!
- sal_Int32 nSummaryWidth = nWidth_Text_Top+nWidth_Topic_Top+(3*PROGRESSMONITOR_FREEBORDER) ;
+ sal_Int32 nSummaryWidth = nWidth_Text_Top+nWidth_Topic_Top+(3*PROGRESSMONITOR_FREEBORDER);
if ( nSummaryWidth < PROGRESSMONITOR_DEFAULT_WIDTH )
nWidth_Text_Top = PROGRESSMONITOR_DEFAULT_WIDTH-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER);
// Fix size of column to maximum!
if ( nSummaryWidth > impl_getWidth() )
- nWidth_Text_Top = impl_getWidth()-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER) ;
- nHeight_Text_Top = nHeight_Topic_Top ;
+ nWidth_Text_Top = impl_getWidth()-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER);
+ nHeight_Text_Top = nHeight_Topic_Top;
// Position of progressbar is relativ to columns before.
// Progressbar.Width = Dialog.Width !!!
// Progressbar.Height = Button.Height
- nX_ProgressBar = nX_Topic_Top ;
- nY_ProgressBar = nY_Topic_Top+nHeight_Topic_Top+PROGRESSMONITOR_FREEBORDER ;
- nWidth_ProgressBar = PROGRESSMONITOR_FREEBORDER+nWidth_Topic_Top+nWidth_Text_Top ;
- nHeight_ProgressBar = nHeight_Button ;
+ nX_ProgressBar = nX_Topic_Top;
+ nY_ProgressBar = nY_Topic_Top+nHeight_Topic_Top+PROGRESSMONITOR_FREEBORDER;
+ nWidth_ProgressBar = PROGRESSMONITOR_FREEBORDER+nWidth_Topic_Top+nWidth_Text_Top;
+ nHeight_ProgressBar = nHeight_Button;
// Oriented by left column before progressbar.
- nX_Topic_Bottom = nX_Topic_Top ;
- nY_Topic_Bottom = nY_ProgressBar+nHeight_ProgressBar+PROGRESSMONITOR_FREEBORDER ;
- nWidth_Topic_Bottom = nWidth_Topic_Top ;
- nHeight_Topic_Bottom = aTopicSize_Bottom.Height ;
+ nX_Topic_Bottom = nX_Topic_Top;
+ nY_Topic_Bottom = nY_ProgressBar+nHeight_ProgressBar+PROGRESSMONITOR_FREEBORDER;
+ nWidth_Topic_Bottom = nWidth_Topic_Top;
+ nHeight_Topic_Bottom = aTopicSize_Bottom.Height;
// Oriented by right column before progressbar.
- nX_Text_Bottom = nX_Topic_Bottom+nWidth_Topic_Bottom+PROGRESSMONITOR_FREEBORDER ;
- nY_Text_Bottom = nY_Topic_Bottom ;
- nWidth_Text_Bottom = nWidth_Text_Top ;
- nHeight_Text_Bottom = nHeight_Topic_Bottom ;
+ nX_Text_Bottom = nX_Topic_Bottom+nWidth_Topic_Bottom+PROGRESSMONITOR_FREEBORDER;
+ nY_Text_Bottom = nY_Topic_Bottom;
+ nWidth_Text_Bottom = nWidth_Text_Top;
+ nHeight_Text_Bottom = nHeight_Topic_Bottom;
// Oriented by progressbar.
- nX_Button = nX_ProgressBar+nWidth_ProgressBar-nWidth_Button ;
- nY_Button = nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER ;
+ nX_Button = nX_ProgressBar+nWidth_ProgressBar-nWidth_Button;
+ nY_Button = nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER;
// Calc offsets to center controls
- sal_Int32 nDx ;
- sal_Int32 nDy ;
+ sal_Int32 nDx;
+ sal_Int32 nDy;
- nDx = ( (2*PROGRESSMONITOR_FREEBORDER)+nWidth_ProgressBar ) ;
- nDy = ( (6*PROGRESSMONITOR_FREEBORDER)+nHeight_Topic_Top+nHeight_ProgressBar+nHeight_Topic_Bottom+2+nHeight_Button ) ;
+ nDx = ( (2*PROGRESSMONITOR_FREEBORDER)+nWidth_ProgressBar );
+ nDy = ( (6*PROGRESSMONITOR_FREEBORDER)+nHeight_Topic_Top+nHeight_ProgressBar+nHeight_Topic_Bottom+2+nHeight_Button );
// At this point use original dialog size to center controls!
- nDx = (impl_getWidth ()/2)-(nDx/2) ;
- nDy = (impl_getHeight()/2)-(nDy/2) ;
+ nDx = (impl_getWidth ()/2)-(nDx/2);
+ nDy = (impl_getHeight()/2)-(nDy/2);
if ( nDx<0 )
{
- nDx=0 ;
+ nDx=0;
}
if ( nDy<0 )
{
- nDy=0 ;
+ nDy=0;
}
// Set new position and size on all controls
- css::uno::Reference< XWindow > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY ) ;
- css::uno::Reference< XWindow > xRef_Text_Top ( m_xText_Top , UNO_QUERY ) ;
- css::uno::Reference< XWindow > xRef_Topic_Bottom ( m_xTopic_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XWindow > xRef_Text_Bottom ( m_xText_Bottom , UNO_QUERY ) ;
- css::uno::Reference< XWindow > xRef_Button ( m_xButton , UNO_QUERY ) ;
-
- xRef_Topic_Top->setPosSize ( nDx+nX_Topic_Top , nDy+nY_Topic_Top , nWidth_Topic_Top , nHeight_Topic_Top , 15 ) ;
- xRef_Text_Top->setPosSize ( nDx+nX_Text_Top , nDy+nY_Text_Top , nWidth_Text_Top , nHeight_Text_Top , 15 ) ;
- xRef_Topic_Bottom->setPosSize ( nDx+nX_Topic_Bottom , nDy+nY_Topic_Bottom , nWidth_Topic_Bottom , nHeight_Topic_Bottom , 15 ) ;
- xRef_Text_Bottom->setPosSize ( nDx+nX_Text_Bottom , nDy+nY_Text_Bottom , nWidth_Text_Bottom , nHeight_Text_Bottom , 15 ) ;
- xRef_Button->setPosSize ( nDx+nX_Button , nDy+nY_Button , nWidth_Button , nHeight_Button , 15 ) ;
+ css::uno::Reference< XWindow > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY );
+ css::uno::Reference< XWindow > xRef_Text_Top ( m_xText_Top , UNO_QUERY );
+ css::uno::Reference< XWindow > xRef_Topic_Bottom ( m_xTopic_Bottom , UNO_QUERY );
+ css::uno::Reference< XWindow > xRef_Text_Bottom ( m_xText_Bottom , UNO_QUERY );
+ css::uno::Reference< XWindow > xRef_Button ( m_xButton , UNO_QUERY );
+
+ xRef_Topic_Top->setPosSize ( nDx+nX_Topic_Top , nDy+nY_Topic_Top , nWidth_Topic_Top , nHeight_Topic_Top , 15 );
+ xRef_Text_Top->setPosSize ( nDx+nX_Text_Top , nDy+nY_Text_Top , nWidth_Text_Top , nHeight_Text_Top , 15 );
+ xRef_Topic_Bottom->setPosSize ( nDx+nX_Topic_Bottom , nDy+nY_Topic_Bottom , nWidth_Topic_Bottom , nHeight_Topic_Bottom , 15 );
+ xRef_Text_Bottom->setPosSize ( nDx+nX_Text_Bottom , nDy+nY_Text_Bottom , nWidth_Text_Bottom , nHeight_Text_Bottom , 15 );
+ xRef_Button->setPosSize ( nDx+nX_Button , nDy+nY_Button , nWidth_Button , nHeight_Button , 15 );
m_xProgressBar->setPosSize( nDx+nX_ProgressBar, nDy+nY_ProgressBar, nWidth_ProgressBar, nHeight_ProgressBar, 15 );
- m_a3DLine.X = nDx+nX_Topic_Top ;
- m_a3DLine.Y = nDy+nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2) ;
- m_a3DLine.Width = nWidth_ProgressBar ;
- m_a3DLine.Height = nHeight_ProgressBar ;
+ m_a3DLine.X = nDx+nX_Topic_Top;
+ m_a3DLine.Y = nDy+nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2);
+ m_a3DLine.Width = nWidth_ProgressBar;
+ m_a3DLine.Height = nHeight_ProgressBar;
// All childcontrols make an implicit repaint in setPosSize()!
// Make it also for this 3D-line ...
- css::uno::Reference< XGraphics > xGraphics = impl_getGraphicsPeer () ;
+ css::uno::Reference< XGraphics > xGraphics = impl_getGraphicsPeer ();
- xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW ) ;
- xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+ xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW );
+ xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y );
- xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT ) ;
- xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
+ xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT );
+ xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 );
}
// private method
void ProgressMonitor::impl_rebuildFixedText ()
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// Rebuild fixedtext before progress
// Rebuild left site of text
if (m_xTopic_Top.is())
{
- OUString aCollectString ;
+ OUString aCollectString;
// Collect all topics from list and format text.
// "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
for ( size_t n = 0; n < maTextlist_Top.size(); ++n )
{
IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
- aCollectString += pSearchItem->sTopic ;
+ aCollectString += pSearchItem->sTopic;
aCollectString += "\n";
}
aCollectString += "\0"; // It's better :-)
- m_xTopic_Top->setText ( aCollectString ) ;
+ m_xTopic_Top->setText ( aCollectString );
}
// Rebuild right site of text
if (m_xText_Top.is())
{
- OUString aCollectString ;
+ OUString aCollectString;
// Collect all topics from list and format text.
// "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
for ( size_t n = 0; n < maTextlist_Top.size(); ++n )
{
IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
- aCollectString += pSearchItem->sText ;
+ aCollectString += pSearchItem->sText;
aCollectString += "\n";
}
aCollectString += "\0"; // It's better :-)
- m_xText_Top->setText ( aCollectString ) ;
+ m_xText_Top->setText ( aCollectString );
}
// Rebuild fixedtext below progress
@@ -778,37 +778,37 @@ void ProgressMonitor::impl_rebuildFixedText ()
// Rebuild left site of text
if (m_xTopic_Bottom.is())
{
- OUString aCollectString ;
+ OUString aCollectString;
// Collect all topics from list and format text.
// "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
for ( size_t n = 0; n < maTextlist_Bottom.size(); ++n )
{
IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
- aCollectString += pSearchItem->sTopic ;
+ aCollectString += pSearchItem->sTopic;
aCollectString += "\n";
}
aCollectString += "\0"; // It's better :-)
- m_xTopic_Bottom->setText ( aCollectString ) ;
+ m_xTopic_Bottom->setText ( aCollectString );
}
// Rebuild right site of text
if (m_xText_Bottom.is())
{
- OUString aCollectString ;
+ OUString aCollectString;
// Collect all topics from list and format text.
// "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
for ( size_t n = 0; n < maTextlist_Bottom.size(); ++n )
{
IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
- aCollectString += pSearchItem->sText ;
+ aCollectString += pSearchItem->sText;
aCollectString += "\n";
}
aCollectString += "\0"; // It's better :-)
- m_xText_Bottom->setText ( aCollectString ) ;
+ m_xText_Bottom->setText ( aCollectString );
}
}
@@ -816,21 +816,21 @@ void ProgressMonitor::impl_rebuildFixedText ()
void ProgressMonitor::impl_cleanMemory ()
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// Delete all of lists.
- for ( size_t nPosition = 0; nPosition < maTextlist_Top.size() ; ++nPosition )
+ for ( size_t nPosition = 0; nPosition < maTextlist_Top.size(); ++nPosition )
{
IMPL_TextlistItem* pSearchItem = maTextlist_Top[ nPosition ];
- delete pSearchItem ;
+ delete pSearchItem;
}
maTextlist_Top.clear();
- for ( size_t nPosition = 0; nPosition < maTextlist_Bottom.size() ; ++nPosition )
+ for ( size_t nPosition = 0; nPosition < maTextlist_Bottom.size(); ++nPosition )
{
IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ nPosition ];
- delete pSearchItem ;
+ delete pSearchItem;
}
maTextlist_Bottom.clear();
}
@@ -839,40 +839,40 @@ void ProgressMonitor::impl_cleanMemory ()
IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, bool bbeforeProgress )
{
// Get right textlist for following operations.
- ::std::vector< IMPL_TextlistItem* >* pTextList ;
+ ::std::vector< IMPL_TextlistItem* >* pTextList;
// Ready for multithreading
- ClearableMutexGuard aGuard ( m_aMutex ) ;
+ ClearableMutexGuard aGuard ( m_aMutex );
if ( bbeforeProgress )
{
- pTextList = &maTextlist_Top ;
+ pTextList = &maTextlist_Top;
}
else
{
- pTextList = &maTextlist_Bottom ;
+ pTextList = &maTextlist_Bottom;
}
// Switch off guard.
- aGuard.clear () ;
+ aGuard.clear ();
// Search the topic in textlist.
size_t nPosition = 0;
size_t nCount = pTextList->size();
- for ( nPosition = 0; nPosition < nCount ; ++nPosition )
+ for ( nPosition = 0; nPosition < nCount; ++nPosition )
{
IMPL_TextlistItem* pSearchItem = pTextList->at( nPosition );
if ( pSearchItem->sTopic == rTopic )
{
// We have found this topic ... return a valid pointer.
- return pSearchItem ;
+ return pSearchItem;
}
}
// We have'nt found this topic ... return a nonvalid pointer.
- return NULL ;
+ return NULL;
}
// debug methods
@@ -885,30 +885,30 @@ bool ProgressMonitor::impl_debug_checkParameter (
bool /*bbeforeProgress*/
) {
// Check "rTopic"
- if ( &rTopic == NULL ) return false ; // NULL-pointer for reference ???!!!
- if ( rTopic.isEmpty() ) return false ; // ""
+ if ( &rTopic == NULL ) return false; // NULL-pointer for reference ???!!!
+ if ( rTopic.isEmpty() ) return false; // ""
// Check "rText"
- if ( &rText == NULL ) return false ; // NULL-pointer for reference ???!!!
- if ( rText.isEmpty() ) return false ; // ""
+ if ( &rText == NULL ) return false; // NULL-pointer for reference ???!!!
+ if ( rText.isEmpty() ) return false; // ""
// "bbeforeProgress" is valid in everyway!
// Parameter OK ... return sal_True.
- return true ;
+ return true;
}
// removeText
bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, bool /*bbeforeProgress*/ )
{
// Check "rTopic"
- if ( &rTopic == NULL ) return false ; // NULL-pointer for reference ???!!!
- if ( rTopic.isEmpty() ) return false ; // ""
+ if ( &rTopic == NULL ) return false; // NULL-pointer for reference ???!!!
+ if ( rTopic.isEmpty() ) return false; // ""
// "bbeforeProgress" is valid in everyway!
// Parameter OK ... return sal_True.
- return true ;
+ return true;
}
#endif // #ifdef DBG_UTIL
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index b0f4c5b1eb1b..8a0564705dab 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -26,13 +26,13 @@
#include "progressbar.hxx"
-using namespace ::cppu ;
-using namespace ::osl ;
-using namespace ::rtl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::lang ;
-using namespace ::com::sun::star::awt ;
-using namespace ::com::sun::star::task ;
+using namespace ::cppu;
+using namespace ::osl;
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::task;
namespace unocontrols{
@@ -43,7 +43,7 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >
{
// Its not allowed to work with member in this method (refcounter !!!)
// But with a HACK (++refcount) its "OK" :-(
- ++m_refCount ;
+ ++m_refCount;
// Create instances for fixedtext and progress ...
m_xText = css::uno::Reference< XFixedText > ( rxContext->getServiceManager()->createInstanceWithContext( FIXEDTEXT_SERVICENAME, rxContext ), UNO_QUERY );
@@ -62,7 +62,7 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >
// (progressbar take automaticly its own defaults)
m_xText->setText( STATUSINDICATOR_DEFAULT_TEXT );
- --m_refCount ;
+ --m_refCount;
}
StatusIndicator::~StatusIndicator() {}
@@ -73,7 +73,7 @@ Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( Runtime
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
- Any aReturn ;
+ Any aReturn;
css::uno::Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
if ( xDel.is() )
{
@@ -87,7 +87,7 @@ Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( Runtime
aReturn = queryAggregation( rType );
}
- return aReturn ;
+ return aReturn;
}
// XInterface
@@ -119,7 +119,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static OTypeCollection* pTypeCollection = NULL ;
+ static OTypeCollection* pTypeCollection = NULL;
if ( pTypeCollection == NULL )
{
@@ -135,7 +135,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s
BaseContainerControl::getTypes()
);
// ... and set his address to static pointer!
- pTypeCollection = &aTypeCollection ;
+ pTypeCollection = &aTypeCollection;
}
}
@@ -161,7 +161,7 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti
aReturn = BaseControl::queryAggregation( aType );
}
- return aReturn ;
+ return aReturn;
}
// XStatusIndicator
@@ -175,7 +175,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
m_xText->setText( sText );
m_xProgressBar->setRange( 0, nRange );
// force repaint ... fixedtext has changed !
- impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,impl_getWidth(),impl_getHeight(),0,0,0,0) ) ;
+ impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,impl_getWidth(),impl_getHeight(),0,0,0,0) );
}
// XStatusIndicator
@@ -230,7 +230,7 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception )
Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::exception )
{
- return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT) ;
+ return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT);
}
// XLayoutConstrains
@@ -238,37 +238,37 @@ Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::e
Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std::exception )
{
// Ready for multithreading
- ClearableMutexGuard aGuard ( m_aMutex ) ;
+ ClearableMutexGuard aGuard ( m_aMutex );
// get information about required place of child controls
css::uno::Reference< XLayoutConstrains > xTextLayout ( m_xText, UNO_QUERY );
Size aTextSize = xTextLayout->getPreferredSize();
- aGuard.clear () ;
+ aGuard.clear ();
// calc preferred size of status indicator
- sal_Int32 nWidth = impl_getWidth() ;
- sal_Int32 nHeight = (2*STATUSINDICATOR_FREEBORDER)+aTextSize.Height ;
+ sal_Int32 nWidth = impl_getWidth();
+ sal_Int32 nHeight = (2*STATUSINDICATOR_FREEBORDER)+aTextSize.Height;
// norm to minimum
if ( nWidth<STATUSINDICATOR_DEFAULT_WIDTH )
{
- nWidth = STATUSINDICATOR_DEFAULT_WIDTH ;
+ nWidth = STATUSINDICATOR_DEFAULT_WIDTH;
}
if ( nHeight<STATUSINDICATOR_DEFAULT_HEIGHT )
{
- nHeight = STATUSINDICATOR_DEFAULT_HEIGHT ;
+ nHeight = STATUSINDICATOR_DEFAULT_HEIGHT;
}
// return to caller
- return Size ( nWidth, nHeight ) ;
+ return Size ( nWidth, nHeight );
}
// XLayoutConstrains
Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception )
{
- return getPreferredSize () ;
+ return getPreferredSize ();
}
// XControl
@@ -285,8 +285,8 @@ void SAL_CALL StatusIndicator::createPeer (
// If user forget to call "setPosSize()", we have still a correct size.
// And a "MinimumSize" IS A "MinimumSize"!
// We change not the position of control at this point.
- Size aDefaultSize = getMinimumSize () ;
- setPosSize ( 0, 0, aDefaultSize.Width, aDefaultSize.Height, PosSize::SIZE ) ;
+ Size aDefaultSize = getMinimumSize ();
+ setPosSize ( 0, 0, aDefaultSize.Width, aDefaultSize.Height, PosSize::SIZE );
}
}
@@ -295,7 +295,7 @@ void SAL_CALL StatusIndicator::createPeer (
sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception )
{
// We have no model.
- return sal_False ;
+ return sal_False;
}
// XControl
@@ -303,8 +303,8 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XContro
css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException, std::exception )
{
// We have no model.
- // return (XControlModel*)this ;
- return css::uno::Reference< XControlModel > () ;
+ // return (XControlModel*)this;
+ return css::uno::Reference< XControlModel > ();
}
// XComponent
@@ -312,7 +312,7 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw
void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exception )
{
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// "removeControl()" control the state of a reference
css::uno::Reference< XControl > xTextControl ( m_xText , UNO_QUERY );
@@ -337,8 +337,8 @@ void SAL_CALL StatusIndicator::setPosSize (
sal_Int16 nFlags
) throw( RuntimeException, std::exception )
{
- Rectangle aBasePosSize = getPosSize () ;
- BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
+ Rectangle aBasePosSize = getPosSize ();
+ BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags);
// if position or size changed
if (
@@ -347,12 +347,12 @@ void SAL_CALL StatusIndicator::setPosSize (
)
{
// calc new layout for controls
- impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,nWidth,nHeight,0,0,0,0) ) ;
+ impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,nWidth,nHeight,0,0,0,0) );
// clear background (!)
// [Children were repainted in "recalcLayout" by setPosSize() automaticly!]
getPeer()->invalidate(2);
// and repaint the control
- impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+ impl_paint ( 0, 0, impl_getGraphicsPeer() );
}
}
@@ -378,15 +378,15 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const css::uno::Ref
// - if you will change the descriptor-values, you must override this virtuell function
// - the caller must release the memory for this dynamical descriptor !!!
- WindowDescriptor* pDescriptor = new WindowDescriptor ;
+ WindowDescriptor* pDescriptor = new WindowDescriptor;
- pDescriptor->Type = WindowClass_SIMPLE ;
- pDescriptor->WindowServiceName = "floatingwindow" ;
- pDescriptor->ParentIndex = -1 ;
- pDescriptor->Parent = xParentPeer ;
- pDescriptor->Bounds = getPosSize () ;
+ pDescriptor->Type = WindowClass_SIMPLE;
+ pDescriptor->WindowServiceName = "floatingwindow";
+ pDescriptor->ParentIndex = -1;
+ pDescriptor->Parent = xParentPeer;
+ pDescriptor->Bounds = getPosSize ();
- return pDescriptor ;
+ return pDescriptor;
}
// protected method
@@ -397,7 +397,7 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R
// Every request paint the completely control. ( but only, if peer exist )
if ( rGraphics.is () )
{
- MutexGuard aGuard (m_aMutex) ;
+ MutexGuard aGuard (m_aMutex);
// background = gray
css::uno::Reference< XWindowPeer > xPeer( impl_getPeerWindow(), UNO_QUERY );
@@ -430,17 +430,17 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const css::uno::R
void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
{
- sal_Int32 nX_ProgressBar ;
- sal_Int32 nY_ProgressBar ;
- sal_Int32 nWidth_ProgressBar ;
- sal_Int32 nHeight_ProgressBar ;
- sal_Int32 nX_Text ;
- sal_Int32 nY_Text ;
- sal_Int32 nWidth_Text ;
- sal_Int32 nHeight_Text ;
+ sal_Int32 nX_ProgressBar;
+ sal_Int32 nY_ProgressBar;
+ sal_Int32 nWidth_ProgressBar;
+ sal_Int32 nHeight_ProgressBar;
+ sal_Int32 nX_Text;
+ sal_Int32 nY_Text;
+ sal_Int32 nWidth_Text;
+ sal_Int32 nHeight_Text;
// Ready for multithreading
- MutexGuard aGuard ( m_aMutex ) ;
+ MutexGuard aGuard ( m_aMutex );
// get information about required place of child controls
Size aWindowSize ( aEvent.Width, aEvent.Height );
@@ -457,20 +457,20 @@ void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
}
// calc position and size of child controls
- nX_Text = STATUSINDICATOR_FREEBORDER ;
- nY_Text = STATUSINDICATOR_FREEBORDER ;
- nWidth_Text = aTextSize.Width ;
- nHeight_Text = aTextSize.Height ;
+ nX_Text = STATUSINDICATOR_FREEBORDER;
+ nY_Text = STATUSINDICATOR_FREEBORDER;
+ nWidth_Text = aTextSize.Width;
+ nHeight_Text = aTextSize.Height;
- nX_ProgressBar = nX_Text+nWidth_Text+STATUSINDICATOR_FREEBORDER ;
- nY_ProgressBar = nY_Text ;
- nWidth_ProgressBar = aWindowSize.Width-nWidth_Text-(3*STATUSINDICATOR_FREEBORDER) ;
- nHeight_ProgressBar = nHeight_Text ;
+ nX_ProgressBar = nX_Text+nWidth_Text+STATUSINDICATOR_FREEBORDER;
+ nY_ProgressBar = nY_Text;
+ nWidth_ProgressBar = aWindowSize.Width-nWidth_Text-(3*STATUSINDICATOR_FREEBORDER);
+ nHeight_ProgressBar = nHeight_Text;
// Set new position and size on all controls
css::uno::Reference< XWindow > xTextWindow ( m_xText , UNO_QUERY );
- xTextWindow->setPosSize ( nX_Text , nY_Text , nWidth_Text , nHeight_Text , 15 ) ;
+ xTextWindow->setPosSize ( nX_Text , nY_Text , nWidth_Text , nHeight_Text , 15 );
m_xProgressBar->setPosSize( nX_ProgressBar, nY_ProgressBar, nWidth_ProgressBar, nHeight_ProgressBar, 15 );
}