diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/textfld.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/shells/textglos.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/shells/textidx.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh2.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/shells/txtnum.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/swtablerep.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 16 |
11 files changed, 36 insertions, 36 deletions
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index c1d56a55d9f4..2b47249baba9 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -96,7 +96,7 @@ using namespace ::com::sun::star; using ::rtl::OUString; -extern void sw_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); +extern void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 5eb4940f5632..f230189a05ea 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -102,7 +102,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem); Window *pMDI = &GetView().GetViewFrame()->GetWindow(); - sal_Bool bMore = sal_False; + bool bMore = false; bool bIsText = true; sal_uInt16 nInsertType = 0; sal_uInt16 nInsertSubType = 0; @@ -182,7 +182,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; default: - bMore = sal_True; + bMore = true; } if(bMore) { @@ -338,7 +338,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) case FN_POSTIT: { SwPostItField* pPostIt = (SwPostItField*)aFldMgr.GetCurFld(); - sal_Bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD); + bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD); if (bNew || GetView().GetPostItMgr()->IsAnswer()) { SvtUserOptions aUserOpt; @@ -689,7 +689,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) break; case FN_POSTIT : case FN_JAVAEDIT : - sal_Bool bCurField = sal_False; + bool bCurField = false; pField = rSh.GetCurFld(); if(nWhich == FN_POSTIT) bCurField = pField && pField->GetTyp()->Which() == RES_POSTITFLD; diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx index 45cd3caf08a6..c48690b3b05b 100644 --- a/sw/source/ui/shells/textglos.cxx +++ b/sw/source/ui/shells/textglos.cxx @@ -39,7 +39,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) FN_GLOSSARY_DLG == nSlot ); SwGlossaryHdl* pGlosHdl = GetView().GetGlosHdl(); // SwGlossaryList updaten? - sal_Bool bUpdateList = sal_False; + bool bUpdateList = false; const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; @@ -50,7 +50,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) { case FN_GLOSSARY_DLG: pGlosHdl->GlossaryDlg(); - bUpdateList = sal_True; + bUpdateList = true; rReq.Ignore(); break; case FN_EXPAND_GLOSSARY: @@ -82,7 +82,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) pGlosHdl->NewGlossary( aName, aShortName, sal_True ); rReq.Done(); } - bUpdateList = sal_True; + bUpdateList = true; break; case FN_SET_ACT_GLOSSARY: if(pItem) diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index c78a404cd178..ef62e913ddb3 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -176,7 +176,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) SfxChildWindow* pAuthMark = pVFrame->GetChildWindow(FN_INSERT_AUTH_ENTRY_DLG); - const sal_Bool bHtmlMode = 0 != ::GetHtmlMode( GetView().GetDocShell() ); + const bool bHtmlMode = 0 != ::GetHtmlMode( GetView().GetDocShell() ); const SwTOXBase* pBase = 0; if( bHtmlMode || 0 != ( pBase = rSh.GetCurTOX()) ) { @@ -205,16 +205,16 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) else { - sal_Bool bEnableEdit = sal_True; + bool bEnableEdit = true; sal_Bool bInReadonly = rSh.HasReadonlySel(); if( rSh.HasSelection() || bInReadonly) - bEnableEdit = sal_False; + bEnableEdit = false; else { SwTOXMarks aArr; rSh.GetCurTOXMarks( aArr ); if( aArr.empty()) - bEnableEdit = sal_False; + bEnableEdit = false; } if(!bEnableEdit) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 8f00d4b603d9..ecd090a0ecc5 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -502,14 +502,14 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) break; case FN_INSERT_FRAME: { - sal_Bool bSingleCol = sal_False; + bool bSingleCol = false; if( 0!= dynamic_cast< SwWebDocShell*>( GetView().GetDocShell()) ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); sal_uInt16 nExport = rHtmlOpt.GetExportMode(); if( HTML_CFG_MSIE == nExport ) { - bSingleCol = sal_True; + bSingleCol = true; } } diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 147907c81764..78d607167317 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -117,7 +117,7 @@ using namespace ::com::sun::star; -void sw_CharDialog( SwWrtShell &rWrtSh, sal_Bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ) +void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const SfxItemSet *pArgs, SfxRequest *pReq ) { FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rWrtSh.GetView())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); @@ -269,7 +269,7 @@ static short lcl_AskRedlineMode(Window *pWin) void SwTextShell::Execute(SfxRequest &rReq) { - sal_Bool bUseDialog = sal_True; + bool bUseDialog = true; const SfxItemSet *pArgs = rReq.GetArgs(); SwWrtShell& rWrtSh = GetShell(); const SfxPoolItem* pItem = 0; @@ -412,7 +412,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, nSlot , sal_False ); if ( pNameItem ) aStr = pNameItem->GetValue(); - sal_Bool bFont = pFont && pFont->GetValue().Len(); + bool bFont = pFont && pFont->GetValue().Len(); rWrtSh.StartUndo( UNDO_UI_INSERT_FOOTNOTE ); rWrtSh.InsertFootnote( aStr, nSlot == FN_INSERT_ENDNOTE, !bFont ); if ( bFont ) @@ -812,7 +812,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { sal_uInt16 nWhich = GetPool().GetWhich( nSlot ); if ( pArgs && pArgs->GetItemState( nWhich ) == SFX_ITEM_SET ) - bUseDialog = sal_False; + bUseDialog = false; // intentionally no break } case SID_CHAR_DLG: @@ -843,7 +843,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { sal_uInt16 nWhich = GetPool().GetWhich( nSlot ); if ( pArgs && pArgs->GetItemState( nWhich ) == SFX_ITEM_SET ) - bUseDialog = sal_False; + bUseDialog = false; // intentionally no break } @@ -1344,7 +1344,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) { // is there a valid selection to get text from? String aText; - sal_Bool bValid = !rSh.HasSelection() || + bool bValid = !rSh.HasSelection() || (rSh.IsSelOnePara() && !rSh.IsMultiSelection()); // prevent context menu from showing when cursor is not in or at the end of a word // (GetCurWord will return the next word if there is none at the current position...) diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index e3dff0750cc9..78445bbab017 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -238,7 +238,7 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) { if( pDBStruct ) { - sal_Bool bDispose = sal_False; + bool bDispose = false; Reference< sdbc::XConnection> xConnection = pDBStruct->xConnection; Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource); // #111987# the connection is disposed an so no parent has been found @@ -248,7 +248,7 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) if ( !xConnection.is() ) { xConnection = SwNewDBMgr::GetConnection(pDBStruct->aDBData.sDataSource, xSource); - bDispose = sal_True; + bDispose = true; } Reference< XColumnsSupplier> xColSupp; diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 94df0389a173..266602597372 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -172,7 +172,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) { sal_uInt16 nSlot = rReq.GetSlot(); const SfxItemSet* pArgs = rReq.GetArgs(); - sal_Bool bArgs = pArgs != 0 && pArgs->Count() > 0; + bool bArgs = pArgs != 0 && pArgs->Count() > 0; int bGrow = sal_False; SwWrtShell& rWrtSh = GetShell(); SwTxtFmtColl* pColl = 0; @@ -340,7 +340,7 @@ SET_LINESPACE: SfxItemSet aAdjustSet( GetPool(), RES_PARATR_ADJUST, RES_PARATR_ADJUST ); GetShell().GetCurAttr(aAdjustSet); - sal_Bool bChgAdjust = sal_False; + bool bChgAdjust = false; SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, sal_False); if(eAdjustState >= SFX_ITEM_DEFAULT) { @@ -350,7 +350,7 @@ SET_LINESPACE: (SVX_ADJUST_RIGHT == eAdjust && SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot); } else - bChgAdjust = sal_True; + bChgAdjust = true; SvxFrameDirection eFrmDirection = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot) ? diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index b60f6db2cfc2..ce7bcdd1121a 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -87,7 +87,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL, 0 ); SwDocShell* pDocSh = GetView().GetDocShell(); - sal_Bool bHtml = 0 != PTR_CAST(SwWebDocShell, pDocSh); + bool bHtml = 0 != PTR_CAST(SwWebDocShell, pDocSh); const SwNumRule* pCurRule = GetShell().GetCurNumRule(); if( pCurRule ) { diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index e8cd4bb7ad20..96944b2116d4 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -130,7 +130,7 @@ sal_Bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const SwTwips nOld = 0; SwTwips nNew = 0; sal_Bool bOld = sal_False; - sal_Bool bFirst = sal_True; + bool bFirst = true; i = 0; while ( i < nAllCols -1 ) @@ -149,7 +149,7 @@ sal_Bool SwTableRep::FillTabCols( SwTabCols& rTabCols ) const if(pOldTColumns[nNewPos - 1].bVisible) break; } - bFirst = sal_False; + bFirst = false; // sie muessen sortiert eingefuegt werden bOld = nOld < nNew; nPos = sal_uInt16(bOld ? nOld : nNew); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 1fdc0e87d559..61d6b4748342 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -495,17 +495,17 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) nOldAlign = pTblData->GetAlign(); - sal_Bool bSetRight = sal_False, bSetLeft = sal_False; + bool bSetRight = false, bSetLeft = false; switch( nOldAlign ) { case text::HoriOrientation::NONE: m_pFreeBtn->Check(); if(m_pRelWidthCB->IsChecked()) - bSetRight = sal_True; + bSetRight = true; break; case text::HoriOrientation::FULL: { - bSetRight = bSetLeft = sal_True; + bSetRight = bSetLeft = true; m_pFullBtn->Check(); m_aWidthMF.Enable(sal_False); m_pRelWidthCB->Enable(sal_False); @@ -514,25 +514,25 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) break; case text::HoriOrientation::LEFT: { - bSetLeft = sal_True; + bSetLeft = true; m_pLeftBtn->Check(); } break; case text::HoriOrientation::LEFT_AND_WIDTH : { - bSetRight = sal_True; + bSetRight = true; m_pFromLeftBtn->Check(); } break; case text::HoriOrientation::RIGHT: { - bSetRight = sal_True; + bSetRight = true; m_pRightBtn->Check(); } break; case text::HoriOrientation::CENTER: { - bSetRight = sal_True; + bSetRight = true; m_pCenterBtn->Check(); } break; @@ -1474,7 +1474,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); - sal_Bool bFlowAllowed = !bHtmlMode || rHtmlOpt.IsPrintLayoutExtension(); + bool bFlowAllowed = !bHtmlMode || rHtmlOpt.IsPrintLayoutExtension(); if(bFlowAllowed) { // Einfuegen der vorhandenen Seitenvorlagen in die Listbox |