diff options
Diffstat (limited to 'toolkit/source')
-rw-r--r-- | toolkit/source/awt/vclxgraphics.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtabcontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 2 |
9 files changed, 16 insertions, 10 deletions
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index df3a55ab56b8..76e100ed3f6d 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -87,7 +87,7 @@ void VCLXGraphics::SetOutputDevice( OutputDevice* pOutDev ) void VCLXGraphics::Init( OutputDevice* pOutDev ) { - DBG_ASSERT( !mpOutputDevice, "VCLXGraphics::Init allready has pOutDev !" ); + DBG_ASSERT( !mpOutputDevice, "VCLXGraphics::Init already has pOutDev !" ); mpOutputDevice = pOutDev; initAttrs(); diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx index b609abaa75bd..68dcb613f60f 100644 --- a/toolkit/source/awt/vclxtabcontrol.cxx +++ b/toolkit/source/awt/vclxtabcontrol.cxx @@ -430,7 +430,7 @@ awt::Size SAL_CALL VCLXTabControl::getMinimumSize() if ( !pTabControl ) return requestedSize; - // calculate size to accomodate all children + // calculate size to accommodate all children unsigned i = 0; for ( std::list<Box_Base::ChildData *>::const_iterator it = maChildren.begin(); it != maChildren.end(); it++, i++ ) diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 0a2b0db836ed..fb680124ae9f 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -981,7 +981,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, ::com::sun::star::uno::Any anyHandle = xSystemDepParent->getWindowHandle(processIdSeq, SYSTEM_DEPENDENT_TYPE); - // use sal_Int64 here to accomodate all int types + // use sal_Int64 here to accommodate all int types // uno::Any shift operator whill upcast if necessary sal_Int64 nWindowHandle = 0; sal_Bool bXEmbed = sal_False; @@ -1193,7 +1193,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( Window* pChildWindow = NULL; if ( nSystemType == SYSTEM_DEPENDENT_TYPE ) { - // use sal_Int64 here to accomodate all int types + // use sal_Int64 here to accommodate all int types // uno::Any shift operator whill upcast if necessary sal_Int64 nWindowHandle = 0; sal_Bool bXEmbed = sal_False; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 3a2d9d8876a9..f12721bdf7cd 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1368,7 +1368,7 @@ void VCLXWindow::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds, bool bWithDe for( iter = rIds.begin(); iter != rIds.end(); iter++) { if( *iter == BASEPROPERTY_FONTDESCRIPTOR ) { - // some properties are not included in the FontDescriptor, but everytime + // some properties are not included in the FontDescriptor, but every time // when we have a FontDescriptor we want to have these properties too. // => Easier to register the here, istead everywhere where I register the FontDescriptor... diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index ef29b3e7ba54..5d047ed638c0 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -58,7 +58,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) throw pException; } - // use sal_Int64 here to accomodate all int types + // use sal_Int64 here to accommodate all int types // uno::Any shift operator whill upcast if necessary sal_Int64 nHandle = 0; sal_Bool bXEmbed = sal_False; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 26a132b58adc..05311f3da8f9 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -4074,6 +4074,12 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com sal_Int16 n = sal_Int16(); if ( Value >>= n ) pComboBox->EnableAutocomplete( n != 0 ); + else + { + sal_Bool b = sal_Bool(); + if ( Value >>= b ) + pComboBox->EnableAutocomplete( b ); + } } break; case BASEPROPERTY_STRINGITEMLIST: diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 5f81ac520a74..08ca54ccdbd1 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -336,7 +336,7 @@ throw (::com::sun::star::uno::RuntimeException) OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no peer, but a windowResized event?" ); // #i87592 In design mode the drawing layer works with sizes with decoration. - // Therefore we have to substract them before writing back to the properties (model). + // Therefore we have to subtract them before writing back to the properties (model). if ( xDialogDevice.is() && mbDesignMode ) { DeviceInfo aDeviceInfo( xDialogDevice->getInfo() ); diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 32aaddec7388..868c302dbb96 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -686,7 +686,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent VCLXWindow* pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : NULL; VclListenerLock aNoVclEventMultiplexing( pPeer ); - // setting peer properties may result in an attemp to acquire the solar mutex, 'cause the peers + // setting peer properties may result in an attempt to acquire the solar mutex, 'cause the peers // usually don't have an own mutex but use the SolarMutex instead. // To prevent deadlocks resulting from this, we do this without our own mutex locked // 2000-11-03 - fs@openoffice.org @@ -1323,7 +1323,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer // this is necessary as our peer may lock the SolarMutex (actually, all currently known peers do), so calling // into the peer with our own mutex locked may cause deadlocks // (We _really_ need peers which do not use the SolarMutex. It's really pissing me off that from time to - // time deadlocks pop up because the low-level components like our peers use a mutex which ususally + // time deadlocks pop up because the low-level components like our peers use a mutex which usually // is locked at the top of the stack (it protects the global message looping). This is always dangerous, and // can not always be solved by tampering with other mutexes. // Unfortunately, the VCL used in the peers is not threadsafe, and by definition needs a locked SolarMutex.) diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 13dcd5eb5140..99ee8c193f07 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -467,7 +467,7 @@ void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId ) if ( nPropId == BASEPROPERTY_FONTDESCRIPTOR ) { - // some properties are not included in the FontDescriptor, but everytime + // some properties are not included in the FontDescriptor, but every time // when we have a FontDescriptor we want to have these properties too. // => Easier to register the here, istead everywhere where I register the FontDescriptor... |