summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-22 11:28:39 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-22 11:39:20 +0100
commit768c74383cbd9f3a423a4ac0e0fb8565f4a5868c (patch)
treec0af5ac3cefcf74bb66ed633df61c0bd02bc8bac
parent11bdc1bd913bd3a631ba10a97ba7890917eda898 (diff)
bool improvements
Change-Id: Iab6343064ad002bd11660aeb8c88c54562109cbc
-rw-r--r--include/sfx2/viewfrm.hxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index b771574c2fd1..b7fb8276842d 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -178,7 +178,7 @@ public:
void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True);
void ToggleChildWindow(sal_uInt16);
- sal_Bool HasChildWindow(sal_uInt16);
+ bool HasChildWindow(sal_uInt16);
sal_Bool KnowsChildWindow(sal_uInt16);
void ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True);
SfxChildWindow* GetChildWindow(sal_uInt16);
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 9ed3d77ebec5..f084f8f125c0 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3262,10 +3262,10 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
//--------------------------------------------------------------------
-sal_Bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
+bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
- return pWork ? pWork->HasChildWindow_Impl(nId) : sal_False;
+ return pWork && pWork->HasChildWindow_Impl(nId);
}
//--------------------------------------------------------------------