diff options
Diffstat (limited to 'svx/source/form/fmshell.cxx')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index c4714155e1a2..7a7f73817718 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -615,7 +615,7 @@ void FmFormShell::Execute(SfxRequest &rReq) { // PropertyBrowser anzeigen SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem == nullptr || pShowItem->GetValue(); InterfaceBag aOnlyTheForm; aOnlyTheForm.insert( Reference< XInterface >( GetImpl()->getCurrentForm(), UNO_QUERY ) ); @@ -629,7 +629,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_CTL_PROPERTIES: { SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem == nullptr || pShowItem->GetValue(); OSL_ENSURE( GetImpl()->onlyControlsAreMarked(), "FmFormShell::Execute: ControlProperties should be disabled!" ); if ( bShow ) @@ -1378,7 +1378,7 @@ namespace } -::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const +::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) { ::std::unique_ptr< ::svx::ISdrObjectFilter > pFilter; @@ -1432,7 +1432,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod } -Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const +Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) { const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView ); if ( !pFormView ) |