diff options
| -rw-r--r-- | include/toolkit/controls/unocontrolmodel.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index e7cf04405635..1495db02e554 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -179,7 +179,7 @@ public: std::list< sal_uInt16 > aIds; \ a::ImplGetPropertyIds( aIds ); \ ImplRegisterProperties( aIds ); \ - } while (0) + } while (false) #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 0f1bf33130cf..d4bfc9a3ff55 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1039,7 +1039,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::Runt Window* pWindow = GetWindow(); if ( pWindow ) { - pWindow->Enable( bEnable, sal_False ); // #95824# without children! + pWindow->Enable( bEnable, false ); // #95824# without children! pWindow->EnableInput( bEnable ); } } @@ -2317,7 +2317,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno: pWindow->SetPosPixel( aOldPos ); if ( bWasVisible ) - pWindow->Show( sal_True ); + pWindow->Show( true ); } } else if ( pDev ) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index d8c0af404861..f61a3b8239fc 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -295,7 +295,7 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 } catch( const ::com::sun::star::uno::Exception& ) { - OSL_ENSURE( sal_False, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting ImageURL properties!" ); + OSL_ENSURE( false, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting ImageURL properties!" ); } } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index bc7e6ad43c71..cfb80d703110 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -659,7 +659,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n { OSL_FAIL( "GraphicControlModel::setFastPropertyValue_NoBroadcast: caught an exception while aligning the ImagePosition/ImageAlign properties!" ); DBG_UNHANDLED_EXCEPTION(); - mbAdjustingImagePosition = sal_False; + mbAdjustingImagePosition = false; } } |