summaryrefslogtreecommitdiff
path: root/UnoControls/source/base/basecontainercontrol.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:08:28 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 22:08:28 +0000
commit1789390d3dbc706af066fb4f6561f6d9793b3801 (patch)
treee336818af1eea30a6a8b8a82ceb90cef4f1b9c2f /UnoControls/source/base/basecontainercontrol.cxx
parent8af1e21265481c05370c36033ddd389f67df3cee (diff)
INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED
2005/10/25 09:12:20 pl 1.4.4.1: #i55991# removed warnings for solaris platform
Diffstat (limited to 'UnoControls/source/base/basecontainercontrol.cxx')
-rw-r--r--UnoControls/source/base/basecontainercontrol.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 7d921aa6f10c..f5a2bbfa9b95 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: basecontainercontrol.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 09:15:53 $
+ * last change: $Author: hr $ $Date: 2006-06-19 23:08:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -93,12 +93,12 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
Any aReturn ;
- Reference< XInterface > xDelegator = BaseControl::impl_getDelegator();
- if ( xDelegator.is() == sal_True )
+ Reference< XInterface > xDel = BaseControl::impl_getDelegator();
+ if ( xDel.is() == sal_True )
{
// If an delegator exist, forward question to his queryInterface.
// Delegator will ask his own queryAggregation!
- aReturn = xDelegator->queryInterface( rType );
+ aReturn = xDel->queryInterface( rType );
}
else
{
@@ -205,7 +205,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >&
// XControl
//____________________________________________________________________________________________________________
-sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& xModel ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException )
{
// This object has NO model.
return sal_False ;
@@ -228,7 +228,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
{
- // Zuerst der Welt mitteilen, da der Container wegfliegt. Dieses ist um einiges
+ // Zuerst der Welt mitteilen, da� der Container wegfliegt. Dieses ist um einiges
// schneller wenn die Welt sowohl an den Controls als auch am Container horcht
// Ready for multithreading
@@ -592,7 +592,7 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen
// protected method
//____________________________________________________________________________________________________________
-void BaseContainerControl::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
+void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, const Reference< XGraphics > & /*rGraphics*/ )
{
/*
if (rGraphics.is())