diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-11-09 22:58:58 +0100 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-11-16 16:54:41 +0100 |
commit | f2eb1eabd5d8e107eb2e6b65d7eec2ff6cbb906f (patch) | |
tree | 1a6849c7072ac6847e794e5d1f3a0c222a61d199 /sw/source/uibase/uiview | |
parent | b60d741be60b0650949624fce5e234077157691e (diff) |
int + sal_True/sal_False ==> bool, and reduce scope of a static variable
Change-Id: I8006aaa4474f086ce5381f59afcf7a5f15279b55
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 939a6f84b065..c74260659ab3 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -68,7 +68,7 @@ void SwView::GetState(SfxItemSet &rSet) SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); sal_uInt16 eFrmType = FRMTYPE_NONE; - int bGetFrmType = sal_False; + bool bGetFrmType = false; bool bWeb = 0 != PTR_CAST(SwWebView, this); while(nWhich) @@ -96,7 +96,10 @@ void SwView::GetState(SfxItemSet &rSet) { // There are captions for graphics, OLE objects, frames and tables if( !bGetFrmType ) - eFrmType = m_pWrtShell->GetFrmType(0,true), bGetFrmType = sal_True; + { + eFrmType = m_pWrtShell->GetFrmType(0, true); + bGetFrmType = true; + } if (! ( ((eFrmType & FRMTYPE_FLY_ANY) && m_nSelectionType != nsSelectionType::SEL_DRW_TXT)|| m_nSelectionType & nsSelectionType::SEL_TBL || m_nSelectionType & nsSelectionType::SEL_DRW) ) |