diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:12:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:12:22 +0000 |
| commit | dff2ef2e88342899a554557448d9f79e47f67251 (patch) | |
| tree | 234d96f76c1dbddca0e6e2712a57b7ec902f0b53 | |
| parent | 23158d93da249baefb55099081214066e4914296 (diff) | |
INTEGRATION: CWS pj65 (1.15.22); FILE MERGED
2006/10/31 14:12:54 pjanik 1.15.22.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
| -rw-r--r-- | toolkit/source/controls/unocontrolcontainer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index c018055b6c5f..930cd715ed50 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unocontrolcontainer.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 12:28:48 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:12:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -415,7 +415,7 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyC throw( uno::RuntimeException) { // evt.PropertyName HAS to be "Step" because we only use the listener for that - sal_Int32 nDialogStep; + sal_Int32 nDialogStep = 0; evt.NewValue >>= nDialogStep; implUpdateVisibility( nDialogStep, mxControlContainer ); } @@ -799,8 +799,8 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM( "Step" ) ); if ( xInfo->hasPropertyByName( aPropName ) ) { - uno::Any aVal = xPSet->getPropertyValue( aPropName ); - sal_Int32 nDialogStep; + ::com::sun::star::uno::Any aVal = xPSet->getPropertyValue( aPropName ); + sal_Int32 nDialogStep = 0; aVal >>= nDialogStep; uno::Reference< awt::XControlContainer > xContainer = SAL_STATIC_CAST( awt::XControlContainer*, this ); |