INTEGRATION: CWS warnings01 (1.5.4); FILE MERGED
2005/10/25 09:12:55 pl 1.5.4.1: #i55991# removed warnings for solaris platform
This commit is contained in:
parent
fea2bd9e75
commit
9b199c020f
1 changed files with 7 additions and 7 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: statusindicator.cxx,v $
|
||||
*
|
||||
* $Revision: 1.5 $
|
||||
* $Revision: 1.6 $
|
||||
*
|
||||
* last change: $Author: rt $ $Date: 2005-09-09 09:19:09 $
|
||||
* last change: $Author: hr $ $Date: 2006-06-19 23:10:00 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -132,12 +132,12 @@ Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( Runtime
|
|||
// Attention:
|
||||
// Don't use mutex or guard in this method!!! Is a method of XInterface.
|
||||
Any aReturn ;
|
||||
Reference< XInterface > xDelegator = BaseContainerControl::impl_getDelegator();
|
||||
if ( xDelegator.is() == sal_True )
|
||||
Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
|
||||
if ( xDel.is() )
|
||||
{
|
||||
// If an delegator exist, forward question to his queryInterface.
|
||||
// Delegator will ask his own queryAggregation!
|
||||
aReturn = xDelegator->queryInterface( rType );
|
||||
aReturn = xDel->queryInterface( rType );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -348,7 +348,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
|
|||
// XLayoutConstrains
|
||||
//____________________________________________________________________________________________________________
|
||||
|
||||
Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& rNewSize ) throw( RuntimeException )
|
||||
Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
|
||||
{
|
||||
return getPreferredSize () ;
|
||||
}
|
||||
|
@ -375,7 +375,7 @@ void SAL_CALL StatusIndicator::createPeer ( const Reference< XToolkit > & rToolk
|
|||
// XControl
|
||||
//____________________________________________________________________________________________________________
|
||||
|
||||
sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > & rModel ) throw( RuntimeException )
|
||||
sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
|
||||
{
|
||||
// We have no model.
|
||||
return sal_False ;
|
||||
|
|
Loading…
Reference in a new issue