diff options
Diffstat (limited to 'toolkit/source/controls')
| -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 |
3 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index b9ae11fc3ce2..7c01058b290a 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -490,7 +490,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) 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 cce2b3be406f..cb8b7a5df7b9 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -644,7 +644,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 std::vector< PropertyValue >::iterator aEnd = aPeerPropertiesToSet.end(); @@ -1279,7 +1279,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 26ad1150424b..3b2c0363da46 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -389,7 +389,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... |