diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-10-30 11:27:06 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-10-30 11:50:20 +0900 |
commit | 136ae4bc2fadd558cb044217339f6b7b2e58843e (patch) | |
tree | 331c53a6eb71865082a58c03d03de2f7325572d4 /sw/source/ui | |
parent | b56eb7154428045239493b6fa21b24504b147603 (diff) |
sal_Bool to bool
Change-Id: I87d6e518aebcd0074f673b84b66df27ae9a0a15a
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/app/docsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/docvw/edtwin3.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/view.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/shells/basesh.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/shells/listsh.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewprt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/unotxdoc.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/move.cxx | 10 |
13 files changed, 33 insertions, 36 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 459b561a8f88..fdf197c1b891 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -1212,7 +1212,7 @@ void SwDocShell::CalcLayoutForOLEObjects() // read by the binary filter: void SwDocShell::UpdateLinks() { - GetDoc()->UpdateLinks(sal_True); + GetDoc()->UpdateLinks(true); // #i50703# Update footnote numbers SwTxtFtn::SetUniqueSeqRefNo( *GetDoc() ); SwNodeIndex aTmp( GetDoc()->GetNodes() ); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 06b60f1471ba..1d028764d0fa 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -487,7 +487,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig else while(nMoves) { - sal_Bool bMoved = rShell.MoveParagraph( 1 ); + bool bMoved = rShell.MoveParagraph( 1 ); if(!bMoved) { //insert a new paragraph before the greeting line @@ -758,7 +758,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl) IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton) { bool bDown = pButton == &m_aDownPB; - sal_Bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 ); + bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 ); if (bMoved || bDown) m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 ); if(!bMoved && bDown) diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 41f61009f816..0a2d3528e86f 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2477,11 +2477,11 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case KS_NumDown: - rSh.NumUpDown( sal_True ); + rSh.NumUpDown( true ); nKS_NUMDOWN_Count = 2; break; case KS_NumUp: - rSh.NumUpDown( sal_False ); + rSh.NumUpDown( false ); break; case KS_NumIndentInc: diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index b13cf663c0cd..577d3bfe15d4 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -156,12 +156,12 @@ void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect ) ((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect ); } -sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark ) +bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); if( pSfxVwSh && pSfxVwSh->ISA( SwView ) ) return ((SwView *)pSfxVwSh)->JumpToSwMark( rMark ); - return sal_False; + return false; } void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 2a5cc3a4165e..3494ed953f10 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -606,7 +606,7 @@ public: sal_Bool IsCrsrAtTop() const { return bTopCrsr; } sal_Bool IsCrsrAtCenter() const { return bCenterCrsr; } - sal_Bool JumpToSwMark( const String& rMark ); + bool JumpToSwMark( const String& rMark ); long InsertDoc( sal_uInt16 nSlotId, const String& rFileName, const String& rFilterName, sal_Int16 nVersion = 0 ); diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 1ff6b5628923..756ee84f5b86 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -469,14 +469,14 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); void addCurrentPosition(); sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, sal_Bool bSelFrame = sal_True ); - sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr ); + bool GotoINetAttr( const SwTxtINetFmt& rAttr ); void GotoOutline( sal_uInt16 nIdx ); - sal_Bool GotoOutline( const String& rName ); - sal_Bool GotoRegion( const String& rName ); + bool GotoOutline( const String& rName ); + bool GotoRegion( const String& rName ); sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0, sal_uInt16 nSeqNo = 0 ); sal_Bool GotoNextTOXBase( const String* pName = 0); - sal_Bool GotoTable( const String& rName ); + bool GotoTable( const String& rName ); sal_Bool GotoFld( const SwFmtFld& rFld ); const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 27cf51430089..f210183d9d81 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -628,7 +628,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if( !rSh.GetLinkManager().GetLinks().empty() ) { rSh.StartAllAction(); - rSh.GetLinkManager().UpdateAllLinks( sal_False, sal_True, sal_True ); + rSh.GetLinkManager().UpdateAllLinks( false, true, true ); rSh.EndAllAction(); } SfxDispatcher &rDis = *rTempView.GetViewFrame()->GetDispatcher(); @@ -1122,10 +1122,9 @@ void SwBaseShell::Execute(SfxRequest &rReq) { if( !rSh.GetLinkManager().GetLinks().empty() ) { - sal_Bool bUpdateGrf = sal_False, bCallErrHdl = sal_False; rSh.EnterStdMode(); rSh.StartAllAction(); - rSh.GetLinkManager().UpdateAllLinks( sal_False, bCallErrHdl, bUpdateGrf ); + rSh.GetLinkManager().UpdateAllLinks( false, false, false ); rSh.EndAllAction(); } } diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 0c79f0213567..ca3e736b1269 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -158,9 +158,7 @@ void SwListShell::Execute(SfxRequest &rReq) SfxViewFrame * pFrame = GetView().GetViewFrame(); rReq.Done(); - rSh.NumUpDown( ( nSlot == FN_NUM_BULLET_DOWN ) - ? sal_True - : sal_False ); + rSh.NumUpDown( nSlot == FN_NUM_BULLET_DOWN ); pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! } break; @@ -189,7 +187,7 @@ void SwListShell::Execute(SfxRequest &rReq) if ( bOutline ) lcl_OutlineUpDownWithSubPoints( rSh, false, false ); else - rSh.MoveNumParas(sal_False, sal_False); + rSh.MoveNumParas(false, false); rReq.Done(); break; @@ -197,7 +195,7 @@ void SwListShell::Execute(SfxRequest &rReq) if ( bOutline ) lcl_OutlineUpDownWithSubPoints( rSh, true, false ); else - rSh.MoveNumParas(sal_True, sal_False); + rSh.MoveNumParas(true, false); rReq.Done(); break; @@ -205,7 +203,7 @@ void SwListShell::Execute(SfxRequest &rReq) if ( bOutline ) lcl_OutlineUpDownWithSubPoints( rSh, true, true ); else - rSh.MoveNumParas(sal_True, sal_True); + rSh.MoveNumParas(true, true); rReq.Done(); break; @@ -213,7 +211,7 @@ void SwListShell::Execute(SfxRequest &rReq) if ( bOutline ) lcl_OutlineUpDownWithSubPoints( rSh, false, true ); else - rSh.MoveNumParas(sal_False, sal_True); + rSh.MoveNumParas(false, true); rReq.Done(); break; diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index c0c4a42afc05..225d63d31a11 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1787,9 +1787,9 @@ void SwView::EditLinkDlg() } } -sal_Bool SwView::JumpToSwMark( const String& rMark ) +bool SwView::JumpToSwMark( const String& rMark ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( rMark.Len() ) { // wir wollen den Bookmark aber am oberen Rand haben @@ -1863,11 +1863,11 @@ sal_Bool SwView::JumpToSwMark( const String& rMark ) if( pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END )) { pWrtShell->EnterStdMode(); // Selektion wieder aufheben - bRet = sal_True; + bRet = true; } } else if( pMarkAccess->getMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) ) - pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = sal_True; + pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = true; else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) )) { pWrtShell->addCurrentPosition(); bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() ); @@ -1876,7 +1876,7 @@ sal_Bool SwView::JumpToSwMark( const String& rMark ) // fuer alle Arten von Flys if( FLYCNTTYPE_ALL != eFlyType && pWrtShell->GotoFly( sName, eFlyType )) { - bRet = sal_True; + bRet = true; if( FLYCNTTYPE_FRM == eFlyType ) { // TextFrames: Cursor in den Frame setzen @@ -1891,7 +1891,7 @@ sal_Bool SwView::JumpToSwMark( const String& rMark ) } } else if( pMarkAccess->getMarksEnd() != (ppMark = pMarkAccess->findMark(sMark))) - pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = sal_True; + pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = true; else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) )) bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() ); diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index e55acc744be8..d68ee0af8dfd 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -237,7 +237,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) //#i61455# if master documentes are printed silently without loaded links then update the links now if( bSilent && pSh->IsGlobalDoc() && !pSh->IsGlblDocSaveLinks() ) { - pSh->GetLinkManager().UpdateAllLinks( sal_False, sal_False, sal_False, 0 ); + pSh->GetLinkManager().UpdateAllLinks( false, false, false, 0 ); } SfxRequest aReq( rReq ); SfxBoolItem aBool(SID_SELECTION, bPrintSelection); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index addb0b0bff0a..72b464749227 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2246,7 +2246,7 @@ void SwXTextDocument::updateLinks( ) throw(RuntimeException) if( !rLnkMan.GetLinks().empty() ) { UnoActionContext aAction(pDoc); - rLnkMan.UpdateAllLinks( sal_False, sal_False, sal_True ); + rLnkMan.UpdateAllLinks( false, false, true ); } } diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index c086b4f44947..9985c4290127 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -828,7 +828,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry case CTX_UPDATE_LINK: case CTX_UPDATE_ALL: { - pActiveShell->GetLinkManager().UpdateAllLinks(sal_True); + pActiveShell->GetLinkManager().UpdateAllLinks(true); if(CTX_UPDATE_ALL == nSelectedPopupEntry) nSlot = FN_UPDATE_TOX; pCont = 0; diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index 9ee0f41b22a4..c08bb77df512 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -680,7 +680,7 @@ sal_Bool SwWrtShell::GotoFly( const String& rName, FlyCntType eType, sal_Bool bS return bRet; } -sal_Bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr ) +bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr ) { SwPosition aPos = *GetCrsr()->GetPoint(); bool bRet = SwCrsrShell::GotoINetAttr(rAttr); @@ -692,10 +692,10 @@ sal_Bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr ) void SwWrtShell::GotoOutline( sal_uInt16 nIdx ) { addCurrentPosition(); - return SwCrsrShell::GotoOutline (nIdx); + SwCrsrShell::GotoOutline (nIdx); } -sal_Bool SwWrtShell::GotoOutline( const String& rName ) +bool SwWrtShell::GotoOutline( const String& rName ) { SwPosition aPos = *GetCrsr()->GetPoint(); bool bRet = SwCrsrShell::GotoOutline (rName); @@ -704,7 +704,7 @@ sal_Bool SwWrtShell::GotoOutline( const String& rName ) return bRet; } -sal_Bool SwWrtShell::GotoRegion( const String& rName ) +bool SwWrtShell::GotoRegion( const String& rName ) { SwPosition aPos = *GetCrsr()->GetPoint(); bool bRet = SwCrsrShell::GotoRegion (rName); @@ -732,7 +732,7 @@ sal_Bool SwWrtShell::GotoNextTOXBase( const String* pName ) return bRet; } -sal_Bool SwWrtShell::GotoTable( const String& rName ) +bool SwWrtShell::GotoTable( const String& rName ) { SwPosition aPos = *GetCrsr()->GetPoint(); bool bRet = SwCrsrShell::GotoTable(rName); |