diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-03-26 22:25:24 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-03-26 23:20:07 +0900 |
commit | 0bd5a8d3f26590f467379042597f91be681fe25e (patch) | |
tree | 4a3144893193aafb826da8729c9e6c24db9a9be5 /sw | |
parent | Remove useless comments; add mode lines (diff) | |
download | core-0bd5a8d3f26590f467379042597f91be681fe25e.tar.gz core-0bd5a8d3f26590f467379042597f91be681fe25e.zip |
sal_Bool to bool
Change-Id: I27a444a8313bff276e377ffb87458213f4e19707
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/inc/view.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewdraw.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewport.cxx | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 2268c631ded8..3c06d7ddbb07 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -277,9 +277,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions ); SW_DLLPRIVATE void Replace(); - sal_Bool IsDocumentBorder(); + bool IsDocumentBorder(); - SW_DLLPRIVATE sal_Bool IsTextTool() const; + SW_DLLPRIVATE bool IsTextTool() const; // create control elements SW_DLLPRIVATE void CreateBtns(); @@ -563,7 +563,7 @@ public: void LeaveDrawCreate() { m_nDrawSfxId = m_nFormSfxId = USHRT_MAX; m_sDrawCustom.Erase();} sal_Bool IsDrawMode() { return (m_nDrawSfxId != USHRT_MAX || m_nFormSfxId != USHRT_MAX); } bool IsFormMode() const; - sal_Bool IsBezierEditMode(); + bool IsBezierEditMode(); bool AreOnlyFormsSelected() const; sal_Bool HasDrwObj(SdrObject *pSdrObj) const; sal_Bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const; diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index d65846cfb794..1ab4270abfa7 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -593,7 +593,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, /****************************************************************************** * Beschreibung: Ist ein DrawTextObjekt selektiert? ******************************************************************************/ -sal_Bool SwView::IsTextTool() const +bool SwView::IsTextTool() const { sal_uInt16 nId; sal_uInt32 nInvent; @@ -612,7 +612,7 @@ SdrView* SwView::GetDrawView() const return GetWrtShell().GetDrawView(); } -sal_Bool SwView::IsBezierEditMode() +bool SwView::IsBezierEditMode() { return (!IsDrawSelMode() && GetWrtShell().GetDrawView()->HasMarkablePoints()); } diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index f7233229f867..0a8ea0d19ff6 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -51,11 +51,11 @@ #define WB_RIGHT_ALIGNED ((WinBits)0x00008000) #endif -static sal_Bool bProtectDocShellVisArea = sal_False; +static bool bProtectDocShellVisArea = false; static sal_uInt16 nPgNum = 0; -sal_Bool SwView::IsDocumentBorder() +bool SwView::IsDocumentBorder() { return GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || m_pWrtShell->GetViewOptions()->getBrowseMode() || @@ -74,7 +74,7 @@ inline long GetLeftMargin( SwView &rView ) static void lcl_GetPos(SwView* pView, Point& rPos, SwScrollbar* pScrollbar, - sal_Bool bBorder) + bool bBorder) { SwWrtShell &rSh = pView->GetWrtShell(); const Size m_aDocSz( rSh.GetDocSize() ); @@ -744,7 +744,7 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar ) Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0); } Point aPos( m_aVisArea.TopLeft() ); - sal_Bool bBorder = IsDocumentBorder(); + bool bBorder = IsDocumentBorder(); lcl_GetPos(this, aPos, pScrollbar, bBorder); if ( bBorder && aPos == m_aVisArea.TopLeft() ) UpdateScrollbars(); @@ -1035,7 +1035,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) //EditWin niemals einstellen! //VisArea einstellen, aber dort nicht das SetVisArea der DocShell rufen! - bProtectDocShellVisArea = sal_True; + bProtectDocShellVisArea = true; CalcVisArea( aEditSz ); //visibility changes of the automatic horizontal scrollbar //require to repeat the ViewResizePixel() call - but only once! @@ -1045,7 +1045,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) bVScrollVisible != m_pVScrollbar->IsVisible(sal_True)) bRepeat = sal_True; }while( bRepeat ); - bProtectDocShellVisArea = sal_False; + bProtectDocShellVisArea = false; m_bInInnerResizePixel = sal_False; } @@ -1209,7 +1209,7 @@ sal_Bool SwView::UpdateScrollbars() sal_Bool bRet = sal_False; if ( !m_aVisArea.IsEmpty() ) { - const sal_Bool bBorder = IsDocumentBorder(); + const bool bBorder = IsDocumentBorder(); Rectangle aTmpRect( m_aVisArea ); if ( bBorder ) { |