diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 00:57:35 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 08:22:35 +0100 |
commit | 078199a243a17cf5bd02aff7042d07d6ec03f06b (patch) | |
tree | 3f8b60e006d7f483b73d8dc225288fa9d46b9ad5 /sd | |
parent | 3d21cb27ac16cafc97fa230f2e1b575e970cfb7e (diff) |
bool improvements
Change-Id: I943e54afaf6ce58aaccbf588ffd9b9e235ef3b39
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/framework/module/SlideSorterModule.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/framework/module/ToolPanelModule.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/futext.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/SdUnoDrawView.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index bbd6c8da72f8..89e038b60cf1 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -54,17 +54,17 @@ SlideSorterModule::SlideSorterModule ( { UpdateViewTabBar(NULL); - if (SvtSlideSorterBarOptions().GetVisibleImpressView()==sal_True) + if (SvtSlideSorterBarOptions().GetVisibleImpressView()) AddActiveMainView(FrameworkHelper::msImpressViewURL); - if (SvtSlideSorterBarOptions().GetVisibleOutlineView()==sal_True) + if (SvtSlideSorterBarOptions().GetVisibleOutlineView()) AddActiveMainView(FrameworkHelper::msOutlineViewURL); - if (SvtSlideSorterBarOptions().GetVisibleNotesView()==sal_True) + if (SvtSlideSorterBarOptions().GetVisibleNotesView()) AddActiveMainView(FrameworkHelper::msNotesViewURL); - if (SvtSlideSorterBarOptions().GetVisibleHandoutView()==sal_True) + if (SvtSlideSorterBarOptions().GetVisibleHandoutView()) AddActiveMainView(FrameworkHelper::msHandoutViewURL); - if (SvtSlideSorterBarOptions().GetVisibleSlideSorterView()==sal_True) + if (SvtSlideSorterBarOptions().GetVisibleSlideSorterView()) AddActiveMainView(FrameworkHelper::msSlideSorterURL); - if (SvtSlideSorterBarOptions().GetVisibleDrawView()==sal_True) + if (SvtSlideSorterBarOptions().GetVisibleDrawView()) AddActiveMainView(FrameworkHelper::msDrawViewURL); mxConfigurationController->addConfigurationChangeListener( diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index c607fbd3820a..08b34520e85d 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -49,15 +49,15 @@ ToolPanelModule::ToolPanelModule ( { if (mxConfigurationController.is()) { - if (SvtToolPanelOptions().GetVisibleImpressView()==sal_True) + if (SvtToolPanelOptions().GetVisibleImpressView()) AddActiveMainView(FrameworkHelper::msImpressViewURL); - if (SvtToolPanelOptions().GetVisibleOutlineView()==sal_True) + if (SvtToolPanelOptions().GetVisibleOutlineView()) AddActiveMainView(FrameworkHelper::msOutlineViewURL); - if (SvtToolPanelOptions().GetVisibleNotesView()==sal_True) + if (SvtToolPanelOptions().GetVisibleNotesView()) AddActiveMainView(FrameworkHelper::msNotesViewURL); - if (SvtToolPanelOptions().GetVisibleHandoutView()==sal_True) + if (SvtToolPanelOptions().GetVisibleHandoutView()) AddActiveMainView(FrameworkHelper::msHandoutViewURL); - if (SvtToolPanelOptions().GetVisibleSlideSorterView()==sal_True) + if (SvtToolPanelOptions().GetVisibleSlideSorterView()) AddActiveMainView(FrameworkHelper::msSlideSorterURL); mxConfigurationController->addConfigurationChangeListener( diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index b1cfce36733a..0a75b11ba7c7 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1406,7 +1406,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) sal_Bool bTmp = sal_False; if ( eErr == ERRCODE_NONE && aRet.getValueType() == getCppuBooleanType() && - sal_True == ( aRet >>= bTmp ) && + ( aRet >>= bTmp ) && bTmp == sal_True ) { bAnimated = sal_True; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 5ec1ccc534a4..c96507325b8e 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -820,7 +820,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) pPara = GetTextObj()->GetOutlinerParaObject(); } - if(pPara && sal_True != pPara->IsVertical()) + if(pPara && !pPara->IsVertical()) { // set ParaObject orientation accordingly pPara->SetVertical(sal_True); diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 71a018a0fcbc..74d668dd7a25 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -99,7 +99,7 @@ public: protected: sal_Bool getMasterPageMode(void) const throw(); - void setMasterPageMode(sal_Bool MasterPageMode_) throw(); + void setMasterPageMode(bool MasterPageMode_) throw(); sal_Bool getLayerMode(void) const throw(); void setLayerMode(sal_Bool LayerMode_) throw(); public: diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index cafb61c23448..69d8b61623ef 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -80,7 +80,7 @@ sal_Bool SdUnoDrawView::getMasterPageMode(void) const throw() -void SdUnoDrawView::setMasterPageMode (sal_Bool bMasterPageMode) throw() +void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() { if ((mrDrawViewShell.GetEditMode() == EM_MASTERPAGE) != bMasterPageMode) { diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 9475f401b16e..f7842d5536af 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1147,7 +1147,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) */ bool OutlineViewShell::PrepareClose( sal_Bool bUI ) { - if( ViewShell::PrepareClose(bUI) != sal_True ) + if( !ViewShell::PrepareClose(bUI) ) return false; return pOlView == NULL || pOlView->PrepareClose(bUI); |