summaryrefslogtreecommitdiff
path: root/UnoControls/source
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-10-31 21:34:25 -0700
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-11-01 00:16:13 -0500
commitddec70f39e40eea43b8a3380edbb2086dcfb73ac (patch)
tree96f66959f84ae5dd7c72addd5f7bbe7e7fb3d4e1 /UnoControls/source
parenta62ff01d8c447928a85b6eeeb2d3d1ab4251490a (diff)
Macro Cleanup in UNO land.
Diffstat (limited to 'UnoControls/source')
-rw-r--r--UnoControls/source/base/basecontrol.cxx16
-rw-r--r--UnoControls/source/base/multiplexer.cxx71
-rw-r--r--UnoControls/source/base/registercontrols.cxx2
-rw-r--r--UnoControls/source/controls/OConnectionPointHelper.cxx11
-rw-r--r--UnoControls/source/controls/progressbar.cxx127
-rw-r--r--UnoControls/source/controls/progressmonitor.cxx159
-rw-r--r--UnoControls/source/controls/statusindicator.cxx73
-rw-r--r--UnoControls/source/inc/OConnectionPointContainerHelper.hxx54
-rw-r--r--UnoControls/source/inc/OConnectionPointHelper.hxx66
-rw-r--r--UnoControls/source/inc/framecontrol.hxx150
-rw-r--r--UnoControls/source/inc/progressbar.hxx119
-rw-r--r--UnoControls/source/inc/progressmonitor.hxx172
-rw-r--r--UnoControls/source/inc/statusindicator.hxx133
13 files changed, 549 insertions, 604 deletions
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index bea92783dcde..f26250bed987 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -164,14 +164,14 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
if ( pTypeCollection == NULL )
{
// Create a static typecollection ...
- static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XPaintListener >*)NULL ) ,
- ::getCppuType(( const Reference< XWindowListener>*)NULL ) ,
- ::getCppuType(( const Reference< XView >*)NULL ) ,
- ::getCppuType(( const Reference< XWindow >*)NULL ) ,
- ::getCppuType(( const Reference< XServiceInfo >*)NULL ) ,
- ::getCppuType(( const Reference< XControl >*)NULL ) ,
- OComponentHelper::getTypes()
- );
+ static OTypeCollection aTypeCollection( ::getCppuType(( const Reference< XPaintListener >*)NULL ) ,
+ ::getCppuType(( const Reference< XWindowListener>*)NULL ) ,
+ ::getCppuType(( const Reference< XView >*)NULL ) ,
+ ::getCppuType(( const Reference< XWindow >*)NULL ) ,
+ ::getCppuType(( const Reference< XServiceInfo >*)NULL ) ,
+ ::getCppuType(( const Reference< XControl >*)NULL ) ,
+ OComponentHelper::getTypes()
+ );
// ... and set his address to static pointer!
pTypeCollection = &aTypeCollection ;
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 3fe037c4d6d0..4ac7156eb2ae 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -276,35 +276,8 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
// XFcousListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException )
{
-/*
- OInterfaceContainerHelper * pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< XFocusListener >*)0) );
- if( pCont )
- {
- OInterfaceIteratorHelper aIt( *pCont );
- FocusEvent aEvt = e;
- // Reamark: The control is the event source not the peer. We must change
- // the source of the event
- xControl.queryHardRef( ((XInterface*)NULL)->getSmartUik(), aEvt.Source );
- //.is the control not destroyed
- if( aEvt.Source.is() )
- {
- if( aIt.hasMoreElements() )
- {
- XFocusListener * pListener = (XFocusListener *)aIt.next();
- try
- {
- pListener->focusGained( aEvt );
- }
- catch( RuntimeException, e )
- {
- // ignore all usr system exceptions from the listener
- }
- }
- }
- }
-*/
MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
}
@@ -312,7 +285,7 @@ void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw
// XFcousListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
}
@@ -321,7 +294,7 @@ void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw(
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
}
@@ -330,7 +303,7 @@ void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) th
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
}
@@ -339,7 +312,7 @@ void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) thro
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
}
@@ -348,7 +321,7 @@ void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) thro
// XWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
}
@@ -357,7 +330,7 @@ void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) thr
// XKeyListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
}
@@ -366,7 +339,7 @@ void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UN
// XKeyListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
}
@@ -375,7 +348,7 @@ void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( U
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
}
@@ -384,7 +357,7 @@ void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
}
@@ -393,7 +366,7 @@ void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) thro
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
}
@@ -402,7 +375,7 @@ void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw
// XMouseListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
}
@@ -411,7 +384,7 @@ void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw(
// XMouseMotionListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
}
@@ -420,7 +393,7 @@ void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw
// XMouseMotionListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
}
@@ -429,7 +402,7 @@ void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw(
// XPaintListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException )
{
MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
}
@@ -438,7 +411,7 @@ void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw(
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
}
@@ -447,7 +420,7 @@ void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) thro
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
}
@@ -456,7 +429,7 @@ void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) t
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
}
@@ -465,7 +438,7 @@ void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) th
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
}
@@ -474,7 +447,7 @@ void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
}
@@ -483,7 +456,7 @@ void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
}
@@ -492,7 +465,7 @@ void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
// XTopWindowListener
//____________________________________________________________________________________________________________
-void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException )
{
MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
}
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index ffe3a6eac1d6..e8f58b8fa7f2 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -112,7 +112,7 @@ using namespace ::com::sun::star::registry ;
sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \
\
/* Create new key with new name. */ \
- xNewKey = xKey->createKey( sKeyName ); \
+ xNewKey = xKey->createKey( sKeyName ); \
\
/* If this new key valid ... */ \
if ( xNewKey.is () ) \
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index 71ff451b28b6..a8b174b01a3a 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -57,10 +57,11 @@ namespace unocontrols{
// construct/destruct
//______________________________________________________________________________________________________________
-OConnectionPointHelper::OConnectionPointHelper( Mutex& aMutex ,
- OConnectionPointContainerHelper* pContainerImplementation ,
- UNO3_TYPE aType )
- : m_aSharedMutex ( aMutex )
+OConnectionPointHelper::OConnectionPointHelper(
+ Mutex& aMutex ,
+ OConnectionPointContainerHelper* pContainerImplementation ,
+ Type aType
+) : m_aSharedMutex ( aMutex )
, m_oContainerWeakReference ( pContainerImplementation )
, m_pContainerImplementation ( pContainerImplementation )
, m_aInterfaceType ( aType )
@@ -82,7 +83,7 @@ Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw(
// Ask for my own supported interfaces ...
Any aReturn ( ::cppu::queryInterface( aType ,
- static_cast< XConnectionPoint* > ( this )
+ static_cast< XConnectionPoint* > ( this )
)
);
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 4c33127925b0..7d05435e48b2 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -67,14 +67,14 @@ namespace unocontrols{
ProgressBar::ProgressBar( const Reference< XMultiServiceFactory >& xFactory )
: BaseControl ( xFactory )
- , m_bHorizontal ( DEFAULT_HORIZONTAL )
- , m_aBlockSize ( DEFAULT_BLOCKDIMENSION )
- , m_nForegroundColor ( DEFAULT_FOREGROUNDCOLOR )
- , m_nBackgroundColor ( DEFAULT_BACKGROUNDCOLOR )
- , m_nMinRange ( DEFAULT_MINRANGE )
- , m_nMaxRange ( DEFAULT_MAXRANGE )
- , m_nBlockValue ( DEFAULT_BLOCKVALUE )
- , m_nValue ( DEFAULT_VALUE )
+ , m_bHorizontal ( PROGRESSBAR_DEFAULT_HORIZONTAL )
+ , m_aBlockSize ( PROGRESSBAR_DEFAULT_BLOCKDIMENSION )
+ , m_nForegroundColor ( PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR )
+ , m_nBackgroundColor ( PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR )
+ , m_nMinRange ( PROGRESSBAR_DEFAULT_MINRANGE )
+ , m_nMaxRange ( PROGRESSBAR_DEFAULT_MAXRANGE )
+ , m_nBlockValue ( PROGRESSBAR_DEFAULT_BLOCKVALUE )
+ , m_nValue ( PROGRESSBAR_DEFAULT_VALUE )
{
}
@@ -153,9 +153,9 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException )
if ( pTypeCollection == NULL )
{
// Create a static typecollection ...
- static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XControlModel >*)NULL ) ,
- ::getCppuType(( const Reference< XProgressBar >*)NULL ) ,
- BaseControl::getTypes()
+ static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XControlModel >*) NULL ) ,
+ ::getCppuType(( const Reference< XProgressBar >*) NULL ) ,
+ BaseControl::getTypes()
);
// ... and set his address to static pointer!
pTypeCollection = &aTypeCollection ;
@@ -174,8 +174,8 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
Any aReturn ( ::cppu::queryInterface( aType ,
- static_cast< XControlModel* > ( this ) ,
- static_cast< XProgressBar* > ( this )
+ static_cast< XControlModel* > ( this ) ,
+ static_cast< XProgressBar* > ( this )
)
);
@@ -312,7 +312,13 @@ sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
// XWindow
//____________________________________________________________________________________________________________
-void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+void SAL_CALL ProgressBar::setPosSize (
+ sal_Int32 nX,
+ sal_Int32 nY,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
+ sal_Int16 nFlags
+) throw( RuntimeException )
{
// Take old size BEFORE you set the new values at baseclass!
// You will control changes. At the other way, the values are the same!
@@ -409,9 +415,9 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
for ( sal_Int16 i=1; i<=nBlockCount; ++i )
{
// step free field
- nBlockStart += FREESPACE ;
+ nBlockStart += PROGRESSBAR_FREESPACE ;
// paint block
- rGraphics->drawRect (nBlockStart, nY+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 ;
}
@@ -427,20 +433,20 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGra
for ( sal_Int16 i=1; i<=nBlockCount; ++i )
{
// step free field
- nBlockStart -= FREESPACE ;
+ nBlockStart -= PROGRESSBAR_FREESPACE ;
// paint block
- rGraphics->drawRect (nX+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 ( LINECOLOR_SHADOW ) ;
+ rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_SHADOW ) ;
rGraphics->drawLine ( nX, nY, impl_getWidth(), nY ) ;
rGraphics->drawLine ( nX, nY, nX , impl_getHeight() ) ;
- rGraphics->setLineColor ( LINECOLOR_BRIGHT ) ;
+ 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 ) ;
}
@@ -463,16 +469,16 @@ void ProgressBar::impl_recalcRange ()
if( nWindowWidth > nWindowHeight )
{
m_bHorizontal = sal_True ;
- fBlockHeight = (nWindowHeight-(2*FREESPACE)) ;
+ fBlockHeight = (nWindowHeight-(2*PROGRESSBAR_FREESPACE)) ;
fBlockWidth = fBlockHeight ;
- fMaxBlocks = nWindowWidth/(fBlockWidth+FREESPACE);
+ fMaxBlocks = nWindowWidth/(fBlockWidth+PROGRESSBAR_FREESPACE);
}
else
{
m_bHorizontal = sal_False ;
- fBlockWidth = (nWindowWidth-(2*FREESPACE)) ;
+ fBlockWidth = (nWindowWidth-(2*PROGRESSBAR_FREESPACE)) ;
fBlockHeight = fBlockWidth ;
- fMaxBlocks = nWindowHeight/(fBlockHeight+FREESPACE);
+ fMaxBlocks = nWindowHeight/(fBlockHeight+PROGRESSBAR_FREESPACE);
}
double fRange = m_nMaxRange-m_nMinRange ;
@@ -481,79 +487,6 @@ void ProgressBar::impl_recalcRange ()
m_nBlockValue = fBlockValue ;
m_aBlockSize.Height = (sal_Int32)fBlockHeight;
m_aBlockSize.Width = (sal_Int32)fBlockWidth ;
-/*
- // Calculate count of blocks for actual size
- // (prevent error "division by zero")
- if ( nHeight == 0 )
- {
- nHeight = 1 ;
- }
-
- nMaxBlock = nWidth / nHeight ;
- nMaxBlock *= 2 ;
-
- // prevent error "division by zero"
- if ( nMaxBlock == 0 )
- {
- nMaxBlock = 1 ;
- }
-
- // Calculate new value and new size for ONE block.
-
- // Do not a calculation like this: "m_nBlockValue=(m_nMaxRange-m_nMinRange)/nMaxBlock" !
- // If difference between m_nMaxRange and m_nMinRange to large, it give an overflow and a
- // following error "division by zero" in method "paint() ... nBlockCount=nDifference/m_nBlockValue ..."
-
- // Overflow ? => example: _I32_MAX - _I32_MIN = -1 and not _UI32_MAX !!!
-
- m_nBlockValue = ( m_nMaxRange / nMaxBlock ) - ( m_nMinRange / nMaxBlock ) ;
- m_aBlockSize.Height = ( nHeight - ( FREESPACE * 2 ) ) ;
- m_aBlockSize.Width = ( ( nWidth / nMaxBlock ) - FREESPACE ) ;
- }
- else
- {
- // Don't forget to save this state! Used in "ProgressBar::paint()"
- m_bHorizontal = sal_False ;
-
- double fBlockWidth = (nHeight-(2*FREESPACE)) ;
- double fBlockHeight = fBlockWidth ;
- double fRange = m_nMaxRange-m_nMinRange ;
- double fBlockValue = fRange/(fBlockWidth+FREESPACE);
-
- m_nBlockValue = fBlockValue ;
- m_aBlockSize.Height = (sal_Int32)fBlockHeight;
- m_aBlockSize.Width = (sal_Int32)fBlockWidth ;
-
- // Calculate count of blocks for actual size
- // (prevent error "division by zero")
- if ( nWidth == 0 )
- {
- nWidth = 1 ;
- }
-
- nMaxBlock = nHeight / nWidth ;
- nMaxBlock *= 2 ;
-
- // prevent error "division by zero"
- if ( nMaxBlock == 0 )
- {
- nMaxBlock = 1 ;
- }
-
- // Calculate new value and new size for ONE block.
-
- // Do not a calculation like this: "m_nBlockValue=(m_nMaxRange-m_nMinRange)/nMaxBlock" !
- // If difference between m_nMaxRange and m_nMinRange to large, it give an overflow and a
- // following error "division by zero" in method "paint() ... nBlockCount=nDifference/m_nBlockValue ..."
-
- // Overflow ? => example: _I32_MAX - _I32_MIN = -1 and not _UI32_MAX !!!
-
- m_nBlockValue = ( m_nMaxRange / nMaxBlock ) - ( m_nMinRange / nMaxBlock ) ;
- m_aBlockSize.Height = ( ( nHeight / nMaxBlock ) - FREESPACE ) ;
- m_aBlockSize.Width = ( nWidth - ( FREESPACE * 2 ) ) ;
-
- }
-*/
}
} // namespace unocontrols
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 6cc8acdde3f0..bf6dc153a933 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -74,12 +74,12 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
++m_refCount ;
// Create instances for fixedtext, button and progress ...
- m_xTopic_Top = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
- m_xText_Top = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
- m_xTopic_Bottom = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
- m_xText_Bottom = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
- m_xButton = Reference< XButton > ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_SERVICENAME ) ), UNO_QUERY ) ;
- m_xProgressBar = Reference< XProgressBar > ( xFactory->createInstance ( OUString::createFromAscii( SERVICENAME_PROGRESSBAR ) ), UNO_QUERY ) ;
+ m_xTopic_Top = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
+ m_xText_Top = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
+ m_xTopic_Bottom = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
+ m_xText_Bottom = Reference< XFixedText > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME ) ), UNO_QUERY ) ;
+ m_xButton = Reference< XButton > ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_SERVICENAME ) ), UNO_QUERY ) ;
+ m_xProgressBar = Reference< XProgressBar > ( xFactory->createInstance ( OUString::createFromAscii( SERVICENAME_PROGRESSBAR ) ), UNO_QUERY ) ;
// ... cast controls to Reference< XControl > (for "setModel"!) ...
Reference< XControl > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY ) ;
@@ -90,11 +90,11 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
Reference< XControl > xRef_ProgressBar ( m_xProgressBar , UNO_QUERY ) ;
// ... set models ...
- xRef_Topic_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
- xRef_Text_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
- xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
- xRef_Text_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
- xRef_Button->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_MODELNAME ) ), UNO_QUERY ) ) ;
+ xRef_Topic_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
+ xRef_Text_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
+ xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
+ xRef_Text_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
+ xRef_Button->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_MODELNAME ) ), UNO_QUERY ) ) ;
// ProgressBar has no model !!!
// ... and add controls to basecontainercontrol!
@@ -112,11 +112,11 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
// Reset to defaults !!!
// (progressbar take automaticly its own defaults)
- m_xButton->setLabel ( OUString::createFromAscii( DEFAULT_BUTTONLABEL ) ) ;
- m_xTopic_Top->setText ( OUString::createFromAscii( DEFAULT_TOPIC ) ) ;
- m_xText_Top->setText ( OUString::createFromAscii( DEFAULT_TEXT ) ) ;
- m_xTopic_Bottom->setText ( OUString::createFromAscii( DEFAULT_TOPIC ) ) ;
- m_xText_Bottom->setText ( OUString::createFromAscii( DEFAULT_TEXT ) ) ;
+ m_xButton->setLabel ( OUString::createFromAscii( DEFAULT_BUTTONLABEL ) ) ;
+ m_xTopic_Top->setText ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TOPIC ) ) ;
+ m_xText_Top->setText ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TEXT ) ) ;
+ m_xTopic_Bottom->setText ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TOPIC ) ) ;
+ m_xText_Bottom->setText ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TEXT ) ) ;
--m_refCount ;
@@ -201,11 +201,11 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException )
if ( pTypeCollection == NULL )
{
// Create a static typecollection ...
- static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XLayoutConstrains >*)NULL ) ,
- ::getCppuType(( const Reference< XButton >*)NULL ) ,
- ::getCppuType(( const Reference< XProgressMonitor >*)NULL ) ,
- BaseContainerControl::getTypes()
- );
+ static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XLayoutConstrains >*)NULL ) ,
+ ::getCppuType(( const Reference< XButton >*)NULL ) ,
+ ::getCppuType(( const Reference< XProgressMonitor >*)NULL ) ,
+ BaseContainerControl::getTypes()
+ );
// ... and set his address to static pointer!
pTypeCollection = &aTypeCollection ;
}
@@ -222,10 +222,10 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti
{
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
- Any aReturn ( ::cppu::queryInterface( aType ,
- static_cast< XLayoutConstrains* > ( this ) ,
- static_cast< XButton* > ( this ) ,
- static_cast< XProgressMonitor* > ( this )
+ Any aReturn ( ::cppu::queryInterface( aType ,
+ static_cast< XLayoutConstrains* > ( this ) ,
+ static_cast< XButton* > ( this ) ,
+ static_cast< XProgressMonitor* > ( this )
)
);
@@ -243,7 +243,11 @@ Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( Runti
// XProgressMonitor
//____________________________________________________________________________________________________________
-void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::addText(
+ const OUString& rTopic,
+ const OUString& rText,
+ sal_Bool bbeforeProgress
+) throw( RuntimeException )
{
// Safe impossible cases
// Check valid call of this method.
@@ -324,7 +328,11 @@ void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbe
// XProgressMonitor
//____________________________________________________________________________________________________________
-void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress ) throw( RuntimeException )
+void SAL_CALL ProgressMonitor::updateText (
+ const OUString& rTopic,
+ const OUString& rText,
+ sal_Bool bbeforeProgress
+) throw( RuntimeException )
{
// Safe impossible cases
// Check valid call of this method.
@@ -490,7 +498,7 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr
Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
{
- return Size (DEFAULT_WIDTH, DEFAULT_HEIGHT) ;
+ return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT) ;
}
//____________________________________________________________________________________________________________
@@ -520,10 +528,10 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
sal_Int32 nWidth = 0 ;
sal_Int32 nHeight = 0 ;
- nWidth = 3 * FREEBORDER ;
+ nWidth = 3 * PROGRESSMONITOR_FREEBORDER ;
nWidth += aProgressBarSize.Width ;
- nHeight = 6 * FREEBORDER ;
+ nHeight = 6 * PROGRESSMONITOR_FREEBORDER ;
nHeight += aTopicSize_Top.Height ;
nHeight += aProgressBarSize.Height ;
nHeight += aTopicSize_Bottom.Height;
@@ -531,13 +539,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
nHeight += aButtonSize.Height ;
// norm to minimum
- if ( nWidth<DEFAULT_WIDTH )
+ if ( nWidth < PROGRESSMONITOR_DEFAULT_WIDTH )
{
- nWidth = DEFAULT_WIDTH ;
+ nWidth = PROGRESSMONITOR_DEFAULT_WIDTH ;
}
- if ( nHeight<DEFAULT_HEIGHT )
+ if ( nHeight < PROGRESSMONITOR_DEFAULT_HEIGHT )
{
- nHeight = DEFAULT_HEIGHT ;
+ nHeight = PROGRESSMONITOR_DEFAULT_HEIGHT ;
}
// return to caller
@@ -686,19 +694,19 @@ void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference<
MutexGuard aGuard ( m_aMutex ) ;
// paint shadowed border around the progressmonitor
- rGraphics->setLineColor ( LINECOLOR_SHADOW ) ;
+ 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 ( LINECOLOR_BRIGHT ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT ) ;
rGraphics->drawLine ( nX, nY, impl_getWidth(), nY ) ;
rGraphics->drawLine ( nX, nY, nX , impl_getHeight() ) ;
// Paint 3D-line
- rGraphics->setLineColor ( LINECOLOR_SHADOW ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW ) ;
rGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
- rGraphics->setLineColor ( LINECOLOR_BRIGHT ) ;
+ rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT ) ;
rGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
}
}
@@ -762,66 +770,66 @@ void ProgressMonitor::impl_recalcLayout ()
// 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 = FREEBORDER ;
- nY_Topic_Top = FREEBORDER ;
- nWidth_Topic_Top = 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 = 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+FREEBORDER ;
- nY_Text_Top = nY_Topic_Top ;
- nWidth_Text_Top = Max ( aTextSize_Top.Width, aTextSize_Bottom.Width ) ;
+ nX_Text_Top = nX_Topic_Top+nWidth_Topic_Top+PROGRESSMONITOR_FREEBORDER;
+ nY_Text_Top = nY_Topic_Top ;
+ nWidth_Text_Top = Max ( aTextSize_Top.Width, aTextSize_Bottom.Width ) ;
// Fix size of this column to minimum!
- sal_Int32 nSummaryWidth = nWidth_Text_Top+nWidth_Topic_Top+(3*FREEBORDER) ;
- if ( nSummaryWidth < DEFAULT_WIDTH )
- nWidth_Text_Top = DEFAULT_WIDTH-nWidth_Topic_Top-(3*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*FREEBORDER) ;
+ 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+FREEBORDER ;
- nWidth_ProgressBar = FREEBORDER+nWidth_Topic_Top+nWidth_Text_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+FREEBORDER ;
+ 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+FREEBORDER ;
+ 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_3DLine = nX_Topic_Top ;
- nY_3DLine = nY_Topic_Bottom+nHeight_Topic_Bottom+(FREEBORDER/2) ;
+ nY_3DLine = nY_Topic_Bottom+nHeight_Topic_Bottom+(PROGRESSMONITOR_FREEBORDER/2) ;
nWidth_3DLine = nWidth_ProgressBar ;
nHeight_3DLine = 1 ; // Height for ONE line ! (But we paint two lines!)
// Oriented by progressbar.
nX_Button = nX_ProgressBar+nWidth_ProgressBar-nWidth_Button ;
- nY_Button = nY_Topic_Bottom+nHeight_Topic_Bottom+FREEBORDER ;
+ nY_Button = nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER ;
// Calc offsets to center controls
sal_Int32 nDx ;
sal_Int32 nDy ;
- nDx = ( (2*FREEBORDER)+nWidth_ProgressBar ) ;
- nDy = ( (6*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) ;
@@ -844,26 +852,26 @@ void ProgressMonitor::impl_recalcLayout ()
Reference< XWindow > xRef_Button ( m_xButton , UNO_QUERY ) ;
Reference< XWindow > xRef_ProgressBar ( m_xProgressBar , 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 ) ;
- xRef_ProgressBar->setPosSize ( nDx+nX_ProgressBar , nDy+nY_ProgressBar , nWidth_ProgressBar , nHeight_ProgressBar , 15 ) ;
+ 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 ) ;
+ xRef_ProgressBar->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+(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 ...
Reference< XGraphics > xGraphics = impl_getGraphicsPeer () ;
- xGraphics->setLineColor ( LINECOLOR_SHADOW ) ;
+ xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW ) ;
xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
- xGraphics->setLineColor ( LINECOLOR_BRIGHT ) ;
+ xGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_BRIGHT ) ;
xGraphics->drawLine ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
}
@@ -881,7 +889,7 @@ void ProgressMonitor::impl_rebuildFixedText ()
// 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!!!
@@ -1033,8 +1041,11 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, s
#ifdef DBG_UTIL
// addText, updateText
-sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, const OUString& rText, sal_Bool /*bbeforeProgress*/ )
-{
+sal_Bool ProgressMonitor::impl_debug_checkParameter (
+ const OUString& rTopic,
+ const OUString& rText,
+ sal_Bool /*bbeforeProgress*/
+) {
// Check "rTopic"
if ( &rTopic == NULL ) return sal_False ; // NULL-pointer for reference ???!!!
if ( rTopic.getLength () < 1 ) return sal_False ; // ""
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 8dbd6f2d03f7..70b195931c18 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -87,7 +87,7 @@ StatusIndicator::StatusIndicator( const Reference< XMultiServiceFactory >& xFact
xProgressWindow->setVisible( sal_True );
// Reset to defaults !!!
// (progressbar take automaticly its own defaults)
- m_xText->setText( OUString::createFromAscii( DEFAULT_TEXT ) );
+ m_xText->setText( OUString::createFromAscii( STATUSINDICATOR_DEFAULT_TEXT ) );
--m_refCount ;
}
@@ -170,9 +170,9 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException )
if ( pTypeCollection == NULL )
{
// Create a static typecollection ...
- static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XLayoutConstrains >*)NULL ) ,
- ::getCppuType(( const Reference< XStatusIndicator >*)NULL ) ,
- BaseContainerControl::getTypes()
+ static OTypeCollection aTypeCollection ( ::getCppuType(( const Reference< XLayoutConstrains >*)NULL ) ,
+ ::getCppuType(( const Reference< XStatusIndicator >*)NULL ) ,
+ BaseContainerControl::getTypes()
);
// ... and set his address to static pointer!
pTypeCollection = &aTypeCollection ;
@@ -190,9 +190,9 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti
{
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by OComponentHelper!
- Any aReturn ( ::cppu::queryInterface( aType ,
- static_cast< XLayoutConstrains* > ( this ) ,
- static_cast< XStatusIndicator* > ( this )
+ Any aReturn ( ::cppu::queryInterface( aType ,
+ static_cast< XLayoutConstrains* > ( this ) ,
+ static_cast< XStatusIndicator* > ( this )
)
);
@@ -284,7 +284,7 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
{
- return Size (DEFAULT_WIDTH, DEFAULT_HEIGHT) ;
+ return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT) ;
}
//____________________________________________________________________________________________________________
@@ -304,16 +304,16 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
// calc preferred size of status indicator
sal_Int32 nWidth = impl_getWidth() ;
- sal_Int32 nHeight = (2*FREEBORDER)+aTextSize.Height ;
+ sal_Int32 nHeight = (2*STATUSINDICATOR_FREEBORDER)+aTextSize.Height ;
// norm to minimum
- if ( nWidth<DEFAULT_WIDTH )
+ if ( nWidth<STATUSINDICATOR_DEFAULT_WIDTH )
{
- nWidth = DEFAULT_WIDTH ;
+ nWidth = STATUSINDICATOR_DEFAULT_WIDTH ;
}
- if ( nHeight<DEFAULT_HEIGHT )
+ if ( nHeight<STATUSINDICATOR_DEFAULT_HEIGHT )
{
- nHeight = DEFAULT_HEIGHT ;
+ nHeight = STATUSINDICATOR_DEFAULT_HEIGHT ;
}
// return to caller
@@ -333,7 +333,10 @@ Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr
// XControl
//____________________________________________________________________________________________________________
-void SAL_CALL StatusIndicator::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent ) throw( RuntimeException )
+void SAL_CALL StatusIndicator::createPeer (
+ const Reference< XToolkit > & rToolkit,
+ const Reference< XWindowPeer > & rParent
+) throw( RuntimeException )
{
if( getPeer().is() == sal_False )
{
@@ -395,7 +398,13 @@ void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
// XWindow
//____________________________________________________________________________________________________________
-void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+void SAL_CALL StatusIndicator::setPosSize (
+ sal_Int32 nX,
+ sal_Int32 nY,
+ sal_Int32 nWidth,
+ sal_Int32 nHeight,
+ sal_Int16 nFlags
+) throw( RuntimeException )
{
Rectangle aBasePosSize = getPosSize () ;
BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
@@ -473,25 +482,25 @@ void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference<
// background = gray
Reference< XWindowPeer > xPeer( impl_getPeerWindow(), UNO_QUERY );
if( xPeer.is() == sal_True )
- xPeer->setBackground( BACKGROUNDCOLOR );
+ xPeer->setBackground( STATUSINDICATOR_BACKGROUNDCOLOR );
// FixedText background = gray
Reference< XControl > xTextControl( m_xText, UNO_QUERY );
xPeer = xTextControl->getPeer();
if( xPeer.is() == sal_True )
- xPeer->setBackground( BACKGROUNDCOLOR );
+ xPeer->setBackground( STATUSINDICATOR_BACKGROUNDCOLOR );
// Progress background = gray
xPeer = Reference< XWindowPeer >( m_xProgressBar, UNO_QUERY );
if( xPeer.is() == sal_True )
- xPeer->setBackground( BACKGROUNDCOLOR );
+ xPeer->setBackground( STATUSINDICATOR_BACKGROUNDCOLOR );
// paint shadow border
- rGraphics->setLineColor ( LINECOLOR_BRIGHT );
+ rGraphics->setLineColor ( STATUSINDICATOR_LINECOLOR_BRIGHT );
rGraphics->drawLine ( nX, nY, impl_getWidth(), nY );
rGraphics->drawLine ( nX, nY, nX , impl_getHeight() );
- rGraphics->setLineColor ( LINECOLOR_SHADOW );
+ rGraphics->setLineColor ( STATUSINDICATOR_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 );
}
@@ -520,24 +529,24 @@ void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
Reference< XLayoutConstrains > xTextLayout ( m_xText, UNO_QUERY );
Size aTextSize = xTextLayout->getPreferredSize();
- if( aWindowSize.Width < DEFAULT_WIDTH )
+ if( aWindowSize.Width < STATUSINDICATOR_DEFAULT_WIDTH )
{
- aWindowSize.Width = DEFAULT_WIDTH;
+ aWindowSize.Width = STATUSINDICATOR_DEFAULT_WIDTH;
}
- if( aWindowSize.Height < DEFAULT_HEIGHT )
+ if( aWindowSize.Height < STATUSINDICATOR_DEFAULT_HEIGHT )
{
- aWindowSize.Height = DEFAULT_HEIGHT;
+ aWindowSize.Height = STATUSINDICATOR_DEFAULT_HEIGHT;
}
// calc position and size of child controls
- nX_Text = FREEBORDER ;
- nY_Text = FREEBORDER ;
+ nX_Text = STATUSINDICATOR_FREEBORDER ;
+ nY_Text = STATUSINDICATOR_FREEBORDER ;
nWidth_Text = aTextSize.Width ;
nHeight_Text = aTextSize.Height ;
- nX_ProgressBar = nX_Text+nWidth_Text+FREEBORDER ;
+ nX_ProgressBar = nX_Text+nWidth_Text+STATUSINDICATOR_FREEBORDER ;
nY_ProgressBar = nY_Text ;
- nWidth_ProgressBar = aWindowSize.Width-nWidth_Text-(3*FREEBORDER) ;
+ nWidth_ProgressBar = aWindowSize.Width-nWidth_Text-(3*STATUSINDICATOR_FREEBORDER) ;
nHeight_ProgressBar = nHeight_Text ;
// Set new position and size on all controls
@@ -548,14 +557,6 @@ void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
xProgressWindow->setPosSize ( nX_ProgressBar, nY_ProgressBar, nWidth_ProgressBar, nHeight_ProgressBar , 15 ) ;
}
-//____________________________________________________________________________________________________________
-// debug methods
-//____________________________________________________________________________________________________________
-
-#if OSL_DEBUG_LEVEL > 1
-
-#endif // #if OSL_DEBUG_LEVEL > 1
-
} // namespace unocontrols
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 9b9e9e53bd95..e0cc5a9b70b9 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -48,20 +48,8 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_XCONNECTIONPOINTCONTAINER ::com::sun::star::lang::XConnectionPointContainer
-#define UNO3_XCONNECTIONPOINT ::com::sun::star::lang::XConnectionPoint
-#define UNO3_MUTEX ::osl::Mutex
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_XINTERFACE ::com::sun::star::uno::XInterface
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_LISTENEREXISTEXCEPTION ::com::sun::star::lang::ListenerExistException
-#define UNO3_INVALIDLISTENEREXCEPTION ::com::sun::star::lang::InvalidListenerException
-#define UNO3_WEAKREFERENCE ::com::sun::star::uno::WeakReference
-#define UNO3_OWEAKOBJECT ::cppu::OWeakObject
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
//______________________________________________________________________________________________________________
// defines
@@ -71,8 +59,8 @@ namespace unocontrols{
// class declaration OConnectionPointContainerHelper
//______________________________________________________________________________________________________________
-class OConnectionPointContainerHelper : public UNO3_XCONNECTIONPOINTCONTAINER
- , public UNO3_OWEAKOBJECT
+class OConnectionPointContainerHelper : public CSS_LANG::XConnectionPointContainer
+ , public ::cppu::OWeakObject
{
//______________________________________________________________________________________________________________
@@ -98,7 +86,7 @@ public:
@onerror
*/
- OConnectionPointContainerHelper( UNO3_MUTEX& aMutex );
+ OConnectionPointContainerHelper( ::osl::Mutex& aMutex );
/**_________________________________________________________________________________________________________
@short
@@ -132,7 +120,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -183,7 +172,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -198,7 +188,9 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
+ const CSS_UNO::Type& aType
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -213,8 +205,10 @@ public:
@onerror
*/
- virtual void SAL_CALL advise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL advise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -229,8 +223,10 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL unadvise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -245,7 +241,7 @@ public:
@onerror
*/
- UNO3_OMULTITYPEINTERFACECONTAINERHELPER& impl_getMultiTypeContainer();
+ ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer();
//______________________________________________________________________________________________________________
// private variables
@@ -253,11 +249,15 @@ public:
private:
- UNO3_MUTEX& m_aSharedMutex ;
- UNO3_OMULTITYPEINTERFACECONTAINERHELPER m_aMultiTypeContainer ; // Container to hold listener
+ ::osl::Mutex& m_aSharedMutex ;
+ ::cppu::OMultiTypeInterfaceContainerHelper m_aMultiTypeContainer ; // Container to hold listener
}; // class OConnectionPointContainerHelper
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_LANG
+
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index abcda4e2024a..b36147e727cb 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -49,21 +49,8 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_XCONNECTIONPOINTCONTAINER ::com::sun::star::lang::XConnectionPointContainer
-#define UNO3_XCONNECTIONPOINT ::com::sun::star::lang::XConnectionPoint
-#define UNO3_MUTEX ::osl::Mutex
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_XINTERFACE ::com::sun::star::uno::XInterface
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_LISTENEREXISTEXCEPTION ::com::sun::star::lang::ListenerExistException
-#define UNO3_INVALIDLISTENEREXCEPTION ::com::sun::star::lang::InvalidListenerException
-#define UNO3_WEAKREFERENCE ::com::sun::star::uno::WeakReference
-#define UNO3_OWEAKOBJECT ::cppu::OWeakObject
-#define UNO3_OCONNECTIONPOINTCONTAINERHELPER OConnectionPointContainerHelper
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
//______________________________________________________________________________________________________________
// defines
@@ -73,8 +60,8 @@ namespace unocontrols{
// class declaration OConnectionPointHelper
//______________________________________________________________________________________________________________
-class OConnectionPointHelper : public UNO3_XCONNECTIONPOINT
- , public UNO3_OWEAKOBJECT
+class OConnectionPointHelper : public CSS_LANG::XConnectionPoint
+ , public ::cppu::OWeakObject
{
//______________________________________________________________________________________________________________
@@ -100,9 +87,9 @@ public:
@onerror
*/
- OConnectionPointHelper( UNO3_MUTEX& aMutex ,
- UNO3_OCONNECTIONPOINTCONTAINERHELPER* pContainerImplementation ,
- UNO3_TYPE aType );
+ OConnectionPointHelper( ::osl::Mutex& aMutex ,
+ OConnectionPointContainerHelper* pContainerImplementation ,
+ CSS_UNO::Type aType );
/**_________________________________________________________________________________________________________
@short
@@ -136,7 +123,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -187,7 +175,8 @@ public:
@onerror
*/
- virtual UNO3_TYPE SAL_CALL getConnectionType() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Type SAL_CALL getConnectionType()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -202,7 +191,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > SAL_CALL getConnectionPointContainer() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_LANG::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -217,9 +207,13 @@ public:
@onerror
*/
- virtual void SAL_CALL advise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_LISTENEREXISTEXCEPTION ,
- UNO3_INVALIDLISTENEREXCEPTION ,
- UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL advise(
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw (
+ CSS_LANG::ListenerExistException,
+ CSS_LANG::InvalidListenerException ,
+ CSS_UNO::RuntimeException
+ );
/**_________________________________________________________________________________________________________
@short
@@ -234,7 +228,8 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL unadvise( const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener )
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -249,7 +244,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XINTERFACE > > SAL_CALL getConnections() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_UNO::XInterface > > SAL_CALL getConnections()
+ throw( CSS_UNO::RuntimeException );
//______________________________________________________________________________________________________________
// private methods
@@ -293,15 +289,19 @@ private:
private:
- UNO3_MUTEX& m_aSharedMutex ;
- UNO3_WEAKREFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
+ ::osl::Mutex& m_aSharedMutex ;
+ CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
// It is a ring-reference => and must be a wekreference!
- UNO3_OCONNECTIONPOINTCONTAINERHELPER* m_pContainerImplementation ;
- UNO3_TYPE m_aInterfaceType ;
- UNO3_REFERENCE< UNO3_XINTERFACE > m_xLock ;
+ OConnectionPointContainerHelper* m_pContainerImplementation ;
+ CSS_UNO::Type m_aInterfaceType ;
+ CSS_UNO::Reference< CSS_UNO::XInterface > m_xLock ;
}; // class OConnectionPointHelper
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_LANG
+
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTHELPER_HXX
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index d60a1c9e341f..5d068ad0cfa1 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -55,31 +55,11 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException
-#define UNO3_IPROPERTYARRAYHELPER ::cppu::IPropertyArrayHelper
-#define UNO3_OBROADCASTHELPER ::cppu::OBroadcastHelper
-#define UNO3_OCONNECTIONPOINTCONTAINERHELPER OConnectionPointContainerHelper
-#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER ::cppu::OMultiTypeInterfaceContainerHelper
-#define UNO3_OPROPERTYSETHELPER ::cppu::OPropertySetHelper
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_PROPERTY ::com::sun::star::beans::Property
-#define UNO3_PROPERTYVALUE ::com::sun::star::beans::PropertyValue
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_WINDOWDESCRIPTOR ::com::sun::star::awt::WindowDescriptor
-#define UNO3_XCONNECTIONPOINT ::com::sun::star::lang::XConnectionPoint
-#define UNO3_XCONNECTIONPOINTCONTAINER ::com::sun::star::lang::XConnectionPointContainer
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XFRAME ::com::sun::star::frame::XFrame
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_XINTERFACE ::com::sun::star::uno::XInterface
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPROPERTYSETINFO ::com::sun::star::beans::XPropertySetInfo
-#define UNO3_XTOOLKIT ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER ::com::sun::star::awt::XWindowPeer
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
+#define CSS_BEANS ::com::sun::star::beans
+#define CSS_AWT ::com::sun::star::awt
+#define CSS_FRAME ::com::sun::star::frame
//______________________________________________________________________________________________________________
// defines
@@ -100,11 +80,11 @@ namespace unocontrols{
// class
//______________________________________________________________________________________________________________
-class FrameControl : public UNO3_XCONTROLMODEL
- , public UNO3_XCONNECTIONPOINTCONTAINER
+class FrameControl : public CSS_AWT::XControlModel
+ , public CSS_LANG::XConnectionPointContainer
, public BaseControl // This order is neccessary for right initialization of m_aMutex!
- , public UNO3_OBROADCASTHELPER
- , public UNO3_OPROPERTYSETHELPER
+ , public ::cppu::OBroadcastHelper
+ , public ::cppu::OPropertySetHelper
{
//______________________________________________________________________________________________________________
@@ -130,7 +110,7 @@ public:
@onerror
*/
- FrameControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ FrameControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_________________________________________________________________________________________________________
@short
@@ -164,7 +144,9 @@ public:
@onerror
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface(
+ const CSS_UNO::Type& aType
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -215,7 +197,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XAggregation
@@ -234,7 +217,9 @@ public:
@onerror
*/
- UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ CSS_UNO::Any SAL_CALL queryAggregation(
+ const CSS_UNO::Type& aType
+ ) throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XControl
@@ -253,8 +238,10 @@ public:
@onerror
*/
- virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit ,
- const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL createPeer(
+ const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+ ) throw ( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -269,7 +256,9 @@ public:
@onerror
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel(
+ const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -284,7 +273,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XComponent
@@ -303,7 +293,7 @@ public:
@onerror
*/
- virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XView
@@ -322,7 +312,9 @@ public:
@onerror
*/
- virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setGraphics(
+ const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -337,7 +329,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XConnectionPointContainer
@@ -356,7 +349,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -371,7 +365,9 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
+ const CSS_UNO::Type& aType
+ ) throw ( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -386,8 +382,10 @@ public:
@onerror
*/
- virtual void SAL_CALL advise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL advise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -402,8 +400,10 @@ public:
@onerror
*/
- virtual void SAL_CALL unadvise( const UNO3_TYPE& aType ,
- const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL unadvise(
+ const CSS_UNO::Type& aType ,
+ const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+ ) throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// impl but public methods to register service!
@@ -422,7 +422,7 @@ public:
@onerror
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_________________________________________________________________________________________________________
@short
@@ -437,7 +437,7 @@ public:
@onerror
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//______________________________________________________________________________________________________________
// protected methods
@@ -462,10 +462,12 @@ protected:
@onerror
*/
- virtual sal_Bool SAL_CALL convertFastPropertyValue( UNO3_ANY& rConvertedValue ,
- UNO3_ANY& rOldValue ,
- sal_Int32 nHandle ,
- const UNO3_ANY& rValue ) throw( UNO3_ILLEGALARGUMENTEXCEPTION );
+ virtual sal_Bool SAL_CALL convertFastPropertyValue(
+ CSS_UNO::Any& rConvertedValue ,
+ CSS_UNO::Any& rOldValue ,
+ sal_Int32 nHandle ,
+ const CSS_UNO::Any& rValue
+ ) throw( CSS_LANG::IllegalArgumentException );
/**_________________________________________________________________________________________________________
@short
@@ -480,8 +482,10 @@ protected:
@onerror
*/
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const UNO3_ANY& rValue ) throw ( ::com::sun::star::uno::Exception );
+ virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
+ sal_Int32 nHandle ,
+ const CSS_UNO::Any& rValue
+ ) throw ( ::com::sun::star::uno::Exception );
/**_________________________________________________________________________________________________________
@short
@@ -496,8 +500,8 @@ protected:
@onerror
*/
- virtual void SAL_CALL getFastPropertyValue( UNO3_ANY& rValue ,
- sal_Int32 nHandle ) const ;
+ virtual void SAL_CALL getFastPropertyValue( CSS_UNO::Any& rValue ,
+ sal_Int32 nHandle ) const ;
/**_________________________________________________________________________________________________________
@short
@@ -512,7 +516,7 @@ protected:
@onerror
*/
- virtual UNO3_IPROPERTYARRAYHELPER& SAL_CALL getInfoHelper();
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
//__________________________________________________________________________________________________________
// XPropertySet
@@ -531,7 +535,8 @@ protected:
@onerror
*/
- UNO3_REFERENCE< UNO3_XPROPERTYSETINFO > SAL_CALL getPropertySetInfo() throw( UNO3_RUNTIMEEXCEPTION );
+ CSS_UNO::Reference< CSS_BEANS::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// BaseControl
@@ -550,7 +555,9 @@ protected:
@onerror
*/
- virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+ virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+ );
//______________________________________________________________________________________________________________
// private methods
@@ -571,9 +578,9 @@ private:
@onerror
*/
- void impl_createFrame( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xPeer ,
- const UNO3_OUSTRING& sURL ,
- const UNO3_SEQUENCE< UNO3_PROPERTYVALUE >& seqArguments );
+ void impl_createFrame( const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xPeer ,
+ const ::rtl::OUString& sURL ,
+ const CSS_UNO::Sequence< CSS_BEANS::PropertyValue >& seqArguments );
/**_________________________________________________________________________________________________________
@short
@@ -603,7 +610,7 @@ private:
@onerror
*/
- static const UNO3_SEQUENCE< UNO3_PROPERTY > impl_getStaticPropertyDescriptor();
+ static const CSS_UNO::Sequence< CSS_BEANS::Property > impl_getStaticPropertyDescriptor();
//______________________________________________________________________________________________________________
@@ -612,14 +619,21 @@ private:
private:
- UNO3_REFERENCE< UNO3_XFRAME > m_xFrame ;
- UNO3_OUSTRING m_sComponentURL ;
- UNO3_SEQUENCE< UNO3_PROPERTYVALUE > m_seqLoaderArguments ;
- UNO3_OMULTITYPEINTERFACECONTAINERHELPER m_aInterfaceContainer ;
- UNO3_OCONNECTIONPOINTCONTAINERHELPER m_aConnectionPointContainer ;
+ CSS_UNO::Reference< CSS_FRAME::XFrame > m_xFrame ;
+ ::rtl::OUString m_sComponentURL ;
+ CSS_UNO::Sequence< CSS_BEANS::PropertyValue > m_seqLoaderArguments ;
+ ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ;
+ OConnectionPointContainerHelper m_aConnectionPointContainer ;
}; // class FrameControl
+// The namespace alaises are only used in the header
+#undef CSS_UNO
+#undef CSS_LANG
+#undef CSS_BEANS
+#undef CSS_AWT
+#undef CSS_FRAME
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index 6ce5b7bf5872..97cad21816dd 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -47,17 +47,9 @@
namespace unocontrols{
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XPROGRESSBAR ::com::sun::star::awt::XProgressBar
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_SIZE ::com::sun::star::awt::Size
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_LANG ::com::sun::star::lang
+#define CSS_AWT ::com::sun::star::awt
//____________________________________________________________________________________________________________
// defines
@@ -65,24 +57,24 @@ namespace unocontrols{
#define SERVICENAME_PROGRESSBAR "com.sun.star.awt.XProgressBar"
#define IMPLEMENTATIONNAME_PROGRESSBAR "stardiv.UnoControls.ProgressBar"
-#define FREESPACE 4
-#define DEFAULT_HORIZONTAL sal_True
-#define DEFAULT_BLOCKDIMENSION Size(1,1)
-#define DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
-#define DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
-#define DEFAULT_MINRANGE INT_MIN
-#define DEFAULT_MAXRANGE INT_MAX
-#define DEFAULT_BLOCKVALUE 1
-#define DEFAULT_VALUE DEFAULT_MINRANGE
-#define LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define PROGRESSBAR_FREESPACE 4
+#define PROGRESSBAR_DEFAULT_HORIZONTAL sal_True
+#define PROGRESSBAR_DEFAULT_BLOCKDIMENSION Size(1,1)
+#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
+#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
+#define PROGRESSBAR_DEFAULT_MINRANGE INT_MIN
+#define PROGRESSBAR_DEFAULT_MAXRANGE INT_MAX
+#define PROGRESSBAR_DEFAULT_BLOCKVALUE 1
+#define PROGRESSBAR_DEFAULT_VALUE PROGRESSBAR_DEFAULT_MINRANGE
+#define PROGRESSBAR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+#define PROGRESSBAR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
//____________________________________________________________________________________________________________
// classes
//____________________________________________________________________________________________________________
-class ProgressBar : public UNO3_XCONTROLMODEL
- , public UNO3_XPROGRESSBAR
+class ProgressBar : public CSS_AWT::XControlModel
+ , public CSS_AWT::XProgressBar
, public BaseControl
{
@@ -109,7 +101,7 @@ public:
@onerror
*/
- ProgressBar( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ ProgressBar( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_________________________________________________________________________________________________________
@short
@@ -143,7 +135,8 @@ public:
@onerror
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -194,7 +187,8 @@ public:
@onerror
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XAggregation
@@ -213,7 +207,8 @@ public:
@onerror
*/
- UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XProgressBar
@@ -232,7 +227,8 @@ public:
@onerror
*/
- virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -247,7 +243,8 @@ public:
@onerror
*/
- virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
+ throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -262,7 +259,7 @@ public:
@onerror
*/
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -277,8 +274,10 @@ public:
@onerror
*/
- virtual void SAL_CALL setRange( sal_Int32 nMin ,
- sal_Int32 nMax ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setRange(
+ sal_Int32 nMin ,
+ sal_Int32 nMax
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -293,7 +292,7 @@ public:
@onerror
*/
- virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XWindow
@@ -312,11 +311,13 @@ public:
@onerror
*/
- virtual void SAL_CALL setPosSize( sal_Int32 nX ,
- sal_Int32 nY ,
- sal_Int32 nWidth ,
- sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setPosSize(
+ sal_Int32 nX ,
+ sal_Int32 nY ,
+ sal_Int32 nWidth ,
+ sal_Int32 nHeight ,
+ sal_Int16 nFlags
+ ) throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// XControl
@@ -335,7 +336,9 @@ public:
@onerror
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel(
+ const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+ ) throw( CSS_UNO::RuntimeException );
/**_________________________________________________________________________________________________________
@short
@@ -350,7 +353,8 @@ public:
@onerror
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//__________________________________________________________________________________________________________
// BaseControl
@@ -369,7 +373,7 @@ public:
@onerror
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_________________________________________________________________________________________________________
@short
@@ -384,7 +388,7 @@ public:
@onerror
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//____________________________________________________________________________________________________________
// protected methods
@@ -405,9 +409,11 @@ protected:
@onerror
*/
- virtual void impl_paint( sal_Int32 nX ,
- sal_Int32 nY ,
- const UNO3_REFERENCE< UNO3_XGRAPHICS >& xGraphics );
+ virtual void impl_paint(
+ sal_Int32 nX ,
+ sal_Int32 nY ,
+ const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics
+ );
/**_________________________________________________________________________________________________________
@short
@@ -430,17 +436,22 @@ protected:
private:
- sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
- UNO3_SIZE m_aBlockSize ; // width and height of a block [>=0,0]
- sal_Int32 m_nForegroundColor ; // (alpha,r,g,b)
- sal_Int32 m_nBackgroundColor ; // (alpha,r,g,b)
- sal_Int32 m_nMinRange ; // lowest value = 0% [long, <_nMaxRange]
- sal_Int32 m_nMaxRange ; // highest value = 100% [long, >_nMinRange]
- double m_nBlockValue ; // value for one block [long, >0]
- sal_Int32 m_nValue ; // value for progress [long]
+ sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
+ CSS_AWT::Size m_aBlockSize ; // width and height of a block [>=0,0]
+ sal_Int32 m_nForegroundColor ; // (alpha,r,g,b)
+ sal_Int32 m_nBackgroundColor ; // (alpha,r,g,b)
+ sal_Int32 m_nMinRange ; // lowest value = 0% [long, <_nMaxRange]
+ sal_Int32 m_nMaxRange ; // highest value = 100% [long, >_nMinRange]
+ double m_nBlockValue ; // value for one block [long, >0]
+ sal_Int32 m_nValue ; // value for progress [long]
}; // class ProgressBar
+// The namespace aliases are only used in the header
+#undef CSS_UNO
+#undef CSS_LANG
+#undef CSS_AWT
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 30d227071d39..08353d11f4a0 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -83,25 +83,9 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_RECTANGLE ::com::sun::star::awt::Rectangle
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_SIZE ::com::sun::star::awt::Size
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_XACTIONLISTENER ::com::sun::star::awt::XActionListener
-#define UNO3_XBUTTON ::com::sun::star::awt::XButton
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XFIXEDTEXT ::com::sun::star::awt::XFixedText
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_XLAYOUTCONSTRAINS ::com::sun::star::awt::XLayoutConstrains
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPROGRESSBAR ::com::sun::star::awt::XProgressBar
-#define UNO3_XPROGRESSMONITOR ::com::sun::star::awt::XProgressMonitor
-#define UNO3_XTOOLKIT ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER ::com::sun::star::awt::XWindowPeer
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_AWT ::com::sun::star::awt
+#define CSS_LANG ::com::sun::star::lang
//____________________________________________________________________________________________________________
// defines
@@ -109,9 +93,7 @@ namespace unocontrols{
#define SERVICENAME_PROGRESSMONITOR "com.sun.star.awt.XProgressMonitor"
#define IMPLEMENTATIONNAME_PROGRESSMONITOR "stardiv.UnoControls.ProgressMonitor"
-#define FREEBORDER 10 // border around and between the controls
-#define WIDTH_RELATION 4 // reserve 1/4 for button width and rest for progressbar width
-#define HEIGHT_RELATION 5 // reserve 1/5 for button and progressbar heigth and rest for text height
+#define PROGRESSMONITOR_FREEBORDER 10 // border around and between the controls
#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
#define BUTTON_SERVICENAME "com.sun.star.awt.UnoControlButton"
#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
@@ -120,17 +102,13 @@ namespace unocontrols{
#define CONTROLNAME_BUTTON "Button" // -||-
#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
#define DEFAULT_BUTTONLABEL "Abbrechen"
-#define DEFAULT_TOPIC "\0"
-#define DEFAULT_TEXT "\0"
-#define BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
-#define LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
-#define HEIGHT_PROGRESSBAR 15
-// Overwrite defines from basecontrol.hxx!!!
-#undef DEFAULT_WIDTH
-#undef DEFAULT_HEIGHT
-#define DEFAULT_WIDTH 350
-#define DEFAULT_HEIGHT 100
+#define PROGRESSMONITOR_DEFAULT_TOPIC "\0"
+#define PROGRESSMONITOR_DEFAULT_TEXT "\0"
+#define PROGRESSMONITOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
+#define PROGRESSMONITOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+#define PROGRESSMONITOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define PROGRESSMONITOR_DEFAULT_WIDTH 350
+#define PROGRESSMONITOR_DEFAULT_HEIGHT 100
//____________________________________________________________________________________________________________
// structs, types
@@ -139,8 +117,8 @@ namespace unocontrols{
/// Item of TextList
struct IMPL_TextlistItem
{
- UNO3_OUSTRING sTopic ; /// Left site of textline in dialog
- UNO3_OUSTRING sText ; /// Right site of textline in dialog
+ ::rtl::OUString sTopic ; /// Left site of textline in dialog
+ ::rtl::OUString sText ; /// Right site of textline in dialog
};
/// Define a list-class for struct IMPL_TextlistItem
@@ -151,9 +129,9 @@ DECLARE_LIST( IMPL_Textlist, IMPL_TextlistItem* )
// class declaration
//____________________________________________________________________________________________________________
-class ProgressMonitor : public UNO3_XLAYOUTCONSTRAINS
- , public UNO3_XBUTTON
- , public UNO3_XPROGRESSMONITOR
+class ProgressMonitor : public CSS_AWT::XLayoutConstrains
+ , public CSS_AWT::XButton
+ , public CSS_AWT::XProgressMonitor
, public BaseContainerControl
{
@@ -180,7 +158,7 @@ public:
@onerror
*/
- ProgressMonitor( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ ProgressMonitor( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_______________________________________________________________________________________________________
@short
@@ -214,7 +192,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -265,7 +244,7 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XAggregation
@@ -284,7 +263,8 @@ public:
@onerror -
*/
- virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XProgressMonitor
@@ -310,9 +290,11 @@ public:
RELEASE = nothing
*/
- virtual void SAL_CALL addText( const UNO3_OUSTRING& sTopic ,
- const UNO3_OUSTRING& sText ,
- sal_Bool bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL addText(
+ const ::rtl::OUString& sTopic ,
+ const ::rtl::OUString& sText ,
+ sal_Bool bbeforeProgress
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -327,8 +309,10 @@ public:
@onerror -
*/
- virtual void SAL_CALL removeText( const UNO3_OUSTRING& sTopic ,
- sal_Bool bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL removeText(
+ const ::rtl::OUString& sTopic ,
+ sal_Bool bbeforeProgress
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -343,9 +327,11 @@ public:
@onerror -
*/
- virtual void SAL_CALL updateText( const UNO3_OUSTRING& sTopic ,
- const UNO3_OUSTRING& sText ,
- sal_Bool bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL updateText(
+ const ::rtl::OUString& sTopic ,
+ const ::rtl::OUString& sText ,
+ sal_Bool bbeforeProgress
+ ) throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XProgressBar
@@ -364,7 +350,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -379,7 +365,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -394,7 +380,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -410,7 +396,7 @@ public:
*/
virtual void SAL_CALL setRange( sal_Int32 nMin ,
- sal_Int32 nMax ) throw( UNO3_RUNTIMEEXCEPTION );
+ sal_Int32 nMax ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -425,7 +411,7 @@ public:
@onerror -
*/
- virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XButton
@@ -444,7 +430,9 @@ public:
@onerror -
*/
- virtual void SAL_CALL addActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL addActionListener(
+ const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -459,7 +447,9 @@ public:
@onerror -
*/
- virtual void SAL_CALL removeActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL removeActionListener(
+ const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -474,7 +464,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL setLabel( const UNO3_OUSTRING& sLabel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -489,7 +479,8 @@ public:
@onerror -
*/
- virtual void SAL_CALL setActionCommand( const UNO3_OUSTRING& sCommand ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XLayoutConstrains
@@ -508,7 +499,7 @@ public:
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -523,7 +514,7 @@ public:
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -538,7 +529,8 @@ public:
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XControl
@@ -557,8 +549,10 @@ public:
@onerror -
*/
- virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit ,
- const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL createPeer(
+ const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -573,7 +567,8 @@ public:
@onerror -
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -588,7 +583,8 @@ public:
@onerror -
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XComponent
@@ -607,7 +603,7 @@ public:
@onerror -
*/
- virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// XWindow
@@ -630,7 +626,7 @@ public:
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( UNO3_RUNTIMEEXCEPTION );
+ sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException );
//________________________________________________________________________________________________________
// BaseControl
@@ -649,7 +645,7 @@ public:
@onerror -
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_______________________________________________________________________________________________________
@short -
@@ -664,7 +660,7 @@ public:
@onerror -
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//____________________________________________________________________________________________________________
// protected methods
@@ -685,9 +681,9 @@ protected:
@onerror -
*/
- virtual void impl_paint( sal_Int32 nX ,
- sal_Int32 nY ,
- const UNO3_REFERENCE< UNO3_XGRAPHICS >& xGraphics );
+ virtual void impl_paint( sal_Int32 nX ,
+ sal_Int32 nY ,
+ const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics );
//____________________________________________________________________________________________________________
// private methods
@@ -753,8 +749,7 @@ private:
@onerror -
*/
- IMPL_TextlistItem* impl_searchTopic( const UNO3_OUSTRING& sTopic ,
- sal_Bool bbeforeProgress );
+ IMPL_TextlistItem* impl_searchTopic( const ::rtl::OUString& sTopic , sal_Bool bbeforeProgress );
//____________________________________________________________________________________________________________
// debug methods
@@ -777,8 +772,8 @@ private:
#ifdef DBG_UTIL
- sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& sTopic, const UNO3_OUSTRING& sText, sal_Bool bbeforeProgress ); // addText, updateText
- sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& rTopic, sal_Bool bbeforeProgress ); // removeText
+ sal_Bool impl_debug_checkParameter( const ::rtl::OUString& sTopic, const ::rtl::OUString& sText, sal_Bool bbeforeProgress ); // addText, updateText
+ sal_Bool impl_debug_checkParameter( const ::rtl::OUString& rTopic, sal_Bool bbeforeProgress ); // removeText
#endif
//____________________________________________________________________________________________________________
@@ -787,20 +782,25 @@ private:
private:
- IMPL_Textlist* m_pTextlist_Top ; // Elements before progress
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xTopic_Top ; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xText_Top ;
+ IMPL_Textlist* m_pTextlist_Top ; // Elements before progress
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xTopic_Top ; // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText_Top ;
- IMPL_Textlist* m_pTextlist_Bottom ; // Elements below of progress
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xTopic_Bottom ; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xText_Bottom ;
+ IMPL_Textlist* m_pTextlist_Bottom ; // Elements below of progress
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xTopic_Bottom ; // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText_Bottom ;
- UNO3_REFERENCE< UNO3_XPROGRESSBAR > m_xProgressBar ;
- UNO3_REFERENCE< UNO3_XBUTTON > m_xButton ;
- UNO3_RECTANGLE m_a3DLine ;
+ CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar ;
+ CSS_UNO::Reference< CSS_AWT::XButton > m_xButton ;
+ CSS_AWT::Rectangle m_a3DLine ;
}; // class ProgressMonitor
+// The namespaces aliases are only used the this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index d89fecf90152..d8e888f9dc42 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -54,45 +54,28 @@
namespace unocontrols{
-#define UNO3_ANY ::com::sun::star::uno::Any
-#define UNO3_OUSTRING ::rtl::OUString
-#define UNO3_RECTANGLE ::com::sun::star::awt::Rectangle
-#define UNO3_REFERENCE ::com::sun::star::uno::Reference
-#define UNO3_RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define UNO3_SEQUENCE ::com::sun::star::uno::Sequence
-#define UNO3_SIZE ::com::sun::star::awt::Size
-#define UNO3_TYPE ::com::sun::star::uno::Type
-#define UNO3_XCONTROLMODEL ::com::sun::star::awt::XControlModel
-#define UNO3_XFIXEDTEXT ::com::sun::star::awt::XFixedText
-#define UNO3_XGRAPHICS ::com::sun::star::awt::XGraphics
-#define UNO3_XLAYOUTCONSTRAINS ::com::sun::star::awt::XLayoutConstrains
-#define UNO3_XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory
-#define UNO3_XPROGRESSBAR ::com::sun::star::awt::XProgressBar
-#define UNO3_XSTATUSINDICATOR ::com::sun::star::task::XStatusIndicator
-#define UNO3_XTOOLKIT ::com::sun::star::awt::XToolkit
-#define UNO3_XWINDOWPEER ::com::sun::star::awt::XWindowPeer
+#define CSS_UNO ::com::sun::star::uno
+#define CSS_AWT ::com::sun::star::awt
+#define CSS_LANG ::com::sun::star::lang
+#define CSS_TASK ::com::sun::star::task
//____________________________________________________________________________________________________________
// defines
//____________________________________________________________________________________________________________
-#define SERVICENAME_STATUSINDICATOR "com.sun.star.task.XStatusIndicator"
-#define IMPLEMENTATIONNAME_STATUSINDICATOR "stardiv.UnoControls.StatusIndicator"
-#undef FREEBORDER
-#define FREEBORDER 5 // border around and between the controls
-#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
-#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
-#define CONTROLNAME_TEXT "Text" // identifier the control in container
-#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
-#define DEFAULT_TEXT "\0"
-#define BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
-#define LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
-#define LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
-// Overwrite defines from basecontrol.hxx!!!
-#undef DEFAULT_WIDTH
-#undef DEFAULT_HEIGHT
-#define DEFAULT_WIDTH 300
-#define DEFAULT_HEIGHT 25
+#define SERVICENAME_STATUSINDICATOR "com.sun.star.task.XStatusIndicator"
+#define IMPLEMENTATIONNAME_STATUSINDICATOR "stardiv.UnoControls.StatusIndicator"
+#define STATUSINDICATOR_FREEBORDER 5 // border around and between the controls
+#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
+#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
+#define CONTROLNAME_TEXT "Text" // identifier the control in container
+#define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
+#define STATUSINDICATOR_DEFAULT_TEXT "\0"
+#define STATUSINDICATOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
+#define STATUSINDICATOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+#define STATUSINDICATOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+#define STATUSINDICATOR_DEFAULT_WIDTH 300
+#define STATUSINDICATOR_DEFAULT_HEIGHT 25
//____________________________________________________________________________________________________________
// structs, types
@@ -102,8 +85,8 @@ namespace unocontrols{
// class declaration
//____________________________________________________________________________________________________________
-class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
- , public UNO3_XSTATUSINDICATOR
+class StatusIndicator : public CSS_AWT::XLayoutConstrains
+ , public CSS_TASK::XStatusIndicator
, public BaseContainerControl
{
@@ -130,7 +113,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror
*/
- StatusIndicator( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+ StatusIndicator( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
/**_______________________________________________________________________________________________________
@short
@@ -164,7 +147,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -215,7 +199,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror A RuntimeException is thrown.
*/
- virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XAggregation
@@ -234,7 +219,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XStatusIndicator
@@ -253,8 +239,10 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL start( const UNO3_OUSTRING& sText ,
- sal_Int32 nRange ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL start(
+ const ::rtl::OUString& sText ,
+ sal_Int32 nRange
+ ) throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -269,7 +257,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL end() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL end() throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -284,7 +272,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL reset() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL reset() throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -299,7 +287,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL setText( const UNO3_OUSTRING& sText ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setText( const ::rtl::OUString& sText ) throw( CSS_UNO::RuntimeException );
/*-****************************************************************************************************//**
@short -
@@ -314,7 +302,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*//*-*****************************************************************************************************/
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XLayoutConstrains
@@ -333,7 +321,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -348,7 +336,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -363,7 +351,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XControl
@@ -382,8 +371,10 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit ,
- const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL createPeer(
+ const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit ,
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+ ) throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -398,7 +389,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+ virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+ throw( CSS_UNO::RuntimeException );
/**_______________________________________________________________________________________________________
@short -
@@ -413,7 +405,8 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+ throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XComponent
@@ -432,7 +425,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+ virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XWindow
@@ -455,7 +448,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw( UNO3_RUNTIMEEXCEPTION );
+ sal_Int16 nFlags ) throw( CSS_UNO::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// BaseControl
@@ -474,7 +467,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+ static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_______________________________________________________________________________________________________
@short -
@@ -489,7 +482,7 @@ class StatusIndicator : public UNO3_XLAYOUTCONSTRAINS
@onerror -
*/
- static const UNO3_OUSTRING impl_getStaticImplementationName();
+ static const ::rtl::OUString impl_getStaticImplementationName();
//____________________________________________________________________________________________________________
// protected methods
@@ -510,7 +503,9 @@ protected:
@onerror -
*/
- virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+ virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+ const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+ );
/**_______________________________________________________________________________________________________
@short -
@@ -525,7 +520,11 @@ protected:
@onerror -
*/
- virtual void impl_paint ( sal_Int32 nX, sal_Int32 nY, const UNO3_REFERENCE< UNO3_XGRAPHICS > & rGraphics );
+ virtual void impl_paint (
+ sal_Int32 nX,
+ sal_Int32 nY,
+ const CSS_UNO::Reference< CSS_AWT::XGraphics > & rGraphics
+ );
/**_______________________________________________________________________________________________________
@short -
@@ -540,7 +539,7 @@ protected:
@onerror -
*/
- virtual void impl_recalcLayout( const UNO3_WINDOWEVENT& aEvent );
+ virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
//____________________________________________________________________________________________________________
// debug methods
@@ -561,21 +560,23 @@ private:
@onerror -
*/
- #if OSL_DEBUG_LEVEL > 1
-
- #endif
-
//____________________________________________________________________________________________________________
// private variables
//____________________________________________________________________________________________________________
private:
- UNO3_REFERENCE< UNO3_XFIXEDTEXT > m_xText ;
- UNO3_REFERENCE< UNO3_XPROGRESSBAR > m_xProgressBar ;
+ CSS_UNO::Reference< CSS_AWT::XFixedText > m_xText ;
+ CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar ;
}; // class StatusIndicator
+// The name space aliases are only used in the header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+#undef CSS_TASK
+
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
generated by cgit (git 2.34.1) at 2025-01-13 14:39:22 +0000