diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 19:57:37 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:17 +0100 |
commit | 0d957046f103605ba51b2a59a8f4c463ca33010a (patch) | |
tree | 66acd5576bd19167c14837d8b036673485f252bc /svx/source/form | |
parent | bd9581d46d78c5742fbb50f1b4a9ff2fc1dae7e8 (diff) |
bool improvements
Change-Id: Ic32faa81bfbb66a9d8632fb3db187e33c31188ed
Diffstat (limited to 'svx/source/form')
-rw-r--r-- | svx/source/form/filtnav.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmPropBrw.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmshell.cxx | 22 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmvwimp.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index fc92b76d1fdf..baf32e1c7f89 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1157,7 +1157,7 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) m_pModel = new FmFilterModel(); StartListening( *m_pModel ); - EnableInplaceEditing( sal_True ); + EnableInplaceEditing( true ); SetSelectionMode(MULTIPLE_SELECTION); SetDragDropMode(0xFFFF); @@ -1556,7 +1556,7 @@ void FmFilterNavigator::Remove(FmFilterData* pItem) if (pEntry == m_pEditingCurrently) // cancel editing - EndEditing(sal_True); + EndEditing(true); if (pEntry) GetModel()->Remove( pEntry ); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 0d879727d3be..d380e7057167 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -578,7 +578,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) if ( !m_xBrowserController.is() ) { OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); - ShowServiceNotAvailableError( GetParent(), sServiceName, sal_True ); + ShowServiceNotAvailableError( GetParent(), sServiceName, true ); } else { diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 17ae864d3837..10695b540e9d 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -218,8 +218,8 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) ,m_pFormModel( NULL ) ,m_pParentShell(_pParent) ,m_nLastSlot( 0 ) - ,m_bDesignMode( sal_True ) - ,m_bHasForms(sal_False) + ,m_bDesignMode( true ) + ,m_bHasForms(false) { m_pImpl->acquire(); SetPool( &SFX_APP()->GetPool() ); @@ -312,7 +312,7 @@ void FmFormShell::impl_setDesignMode(sal_Bool bDesign) } else { - m_bHasForms = sal_False; + m_bHasForms = false; m_bDesignMode = bDesign; UIFeatureChanged(); } @@ -498,7 +498,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_SCROLLBAR: case SID_FM_SPINBUTTON: { - SFX_REQUEST_ARG( rReq, pGrabFocusItem, SfxBoolItem, SID_FM_TOGGLECONTROLFOCUS, sal_False ); + SFX_REQUEST_ARG( rReq, pGrabFocusItem, SfxBoolItem, SID_FM_TOGGLECONTROLFOCUS, false ); if ( pGrabFocusItem && pGrabFocusItem->GetValue() ) { // see below SfxViewShell* pShell = GetViewShell(); @@ -528,7 +528,7 @@ void FmFormShell::Execute(SfxRequest &rReq) // do this asynchron, so that the creation can be finished first // reusing the SID_FM_TOGGLECONTROLFOCUS is somewhat hacky ... which it wouldn't if it would have another // name, so I do not really have a big problem with this .... - SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, sal_True ); + SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, true ); GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON, &aGrabFocusIndicatorItem, NULL ); } @@ -608,7 +608,7 @@ void FmFormShell::Execute(SfxRequest &rReq) break; case SID_FM_SHOW_PROPERTY_BROWSER: { - SFX_REQUEST_ARG( rReq, pShowItem, SfxBoolItem, SID_FM_SHOW_PROPERTIES, sal_False ); + SFX_REQUEST_ARG( rReq, pShowItem, SfxBoolItem, SID_FM_SHOW_PROPERTIES, false ); sal_Bool bShow = sal_True; if ( pShowItem ) bShow = pShowItem->GetValue(); @@ -620,7 +620,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_PROPERTIES: { // PropertyBrowser anzeigen - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, sal_False); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; InterfaceBag aOnlyTheForm; @@ -634,7 +634,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_CTL_PROPERTIES: { - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, sal_False); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; OSL_ENSURE( GetImpl()->onlyControlsAreMarked(), "FmFormShell::Execute: ControlProperties should be disabled!" ); @@ -671,7 +671,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_DESIGN_MODE: { - SFX_REQUEST_ARG(rReq, pDesignItem, SfxBoolItem, nSlot, sal_False); + SFX_REQUEST_ARG(rReq, pDesignItem, SfxBoolItem, nSlot, false); bool bDesignMode = pDesignItem ? pDesignItem->GetValue() : !m_bDesignMode; SetDesignMode( bDesignMode ); if ( m_bDesignMode == bDesignMode ) @@ -823,7 +823,7 @@ void FmFormShell::Execute(SfxRequest &rReq) rReq.Done(); // initially open the filter navigator, the whole form based filter is pretty useless without it - SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True ); + SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, true ); GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aIdentifierItem, NULL ); } break; @@ -1076,7 +1076,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWhich ); else { - rSet.Put( SfxBoolItem( nWhich, sal_False ) ); + rSet.Put( SfxBoolItem( nWhich, false ) ); // just to have a defined state (available and not checked) } } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 3c6639035c44..d1f59fcb5240 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1362,7 +1362,7 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo if (nConvertSlots[i] == nConversionSlot) return nObjectTypes[i] != nObjectType; - return sal_True; // all other slots: assume "yes" + return true; // all other slots: assume "yes" } //------------------------------------------------------------------------------ diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 4d6ee1a54752..3f65b4638e45 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1077,7 +1077,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ ) if ( !xWizard.is() ) { - ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), sal_True ); + ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), true ); } else { @@ -1881,7 +1881,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime { if ( m_xWindow.is() && m_pView ) { - m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() ); + m_pView->SetMoveOutside( true, FmFormView::ImplAccess() ); } } // ----------------------------------------------------------------------------- @@ -1891,7 +1891,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx // so we can not remove us as focus listener if ( m_xWindow.is() && m_pView ) { - m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() ); + m_pView->SetMoveOutside( false, FmFormView::ImplAccess() ); } } // ----------------------------------------------------------------------------- @@ -1902,7 +1902,7 @@ void FmXFormView::removeGridWindowListening() m_xWindow->removeFocusListener(this); if ( m_pView ) { - m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() ); + m_pView->SetMoveOutside( false, FmFormView::ImplAccess() ); } m_xWindow = NULL; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 5d47a219118c..b1b4241095ef 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -150,7 +150,7 @@ namespace svxform ); SetDragDropMode(0xFFFF); - EnableInplaceEditing( sal_True ); + EnableInplaceEditing( true ); SetSelectionMode(MULTIPLE_SELECTION); m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages ); |