diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 19:59:54 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:21 +0100 |
commit | 8bc3751ea3ce1162137df2d0e10502cd24a3cb92 (patch) | |
tree | 6e0a16a99e7e9c20bfdb97510da35df9af5256fa /sw/source/ui/shells | |
parent | bool improvements (diff) | |
download | core-8bc3751ea3ce1162137df2d0e10502cd24a3cb92.tar.gz core-8bc3751ea3ce1162137df2d0e10502cd24a3cb92.zip |
bool improvements
Change-Id: Ibeb658e73b588f90242c95d23149f2ef45a7a815
Diffstat (limited to 'sw/source/ui/shells')
-rw-r--r-- | sw/source/ui/shells/annotsh.cxx | 24 | ||||
-rw-r--r-- | sw/source/ui/shells/basesh.cxx | 20 | ||||
-rw-r--r-- | sw/source/ui/shells/beziersh.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/shells/drawsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/shells/drwbassh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/drwtxtex.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/shells/drwtxtsh.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/shells/frmsh.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/shells/langhelper.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/listsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/shells/textdrw.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/textfld.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/shells/textidx.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh.cxx | 26 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 26 | ||||
-rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/shells/txtnum.cxx | 10 |
18 files changed, 95 insertions, 95 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 1ce307aff932..6e86f14a0873 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -234,7 +234,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) { if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -675,7 +675,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) if( !pSecondPool ) pSecondPool = aEditAttr.GetPool(); SvxScriptSetItem aSetItem( nSlotId, *pSecondPool ); - aSetItem.GetItemSet().Put( aEditAttr, sal_False ); + aSetItem.GetItemSet().Put( aEditAttr, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType ); if( pI ) rSet.Put( *pI, nWhich ); @@ -709,7 +709,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) pEscItem = &aEditAttr.Get( EE_CHAR_ESCAPEMENT ); if( nEsc == ((const SvxEscapementItem*)pEscItem)->GetEnumValue() ) - rSet.Put( SfxBoolItem( nWhich, sal_True )); + rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); break; @@ -739,7 +739,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) else { if ( eAdjust == ((const SvxAdjustItem*)pAdjust)->GetAdjust()) - rSet.Put( SfxBoolItem( nWhich, sal_True )); + rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); } @@ -767,7 +767,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) else { if( nLSpace == ((const SvxLineSpacingItem*)pLSpace)->GetPropLineSpace() ) - rSet.Put( SfxBoolItem( nWhich, sal_True )); + rSet.Put( SfxBoolItem( nWhich, true )); else rSet.InvalidateItem( nWhich ); } @@ -1091,7 +1091,7 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq) break; case FN_DELETE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, false); if ( pItem ) pPostItMgr->Delete( pItem->GetValue() ); break; @@ -1103,7 +1103,7 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq) break; case FN_HIDE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, nSlot, false); if ( pItem ) pPostItMgr->Hide( pItem->GetValue() ); } @@ -1200,7 +1200,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) case SID_THES: { OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) @@ -1653,7 +1653,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) SvxFontItem aSetDlgFont( RES_CHRATR_FONT ); { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aSetDlgFont = *(SvxFontItem*)pI; @@ -1671,7 +1671,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAllItemSet aAllSet( GetPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions()); OUString sSymbolFont = aOpt.GetSymbolFont(); @@ -1687,8 +1687,8 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFontItem ) { aFont.SetName( pFontItem->GetFamilyName() ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index a284b793d49a..ebc90e1c960f 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -698,7 +698,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_GALLERY_FORMATS: { - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, sal_False ); + SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); if ( !pGalleryItem ) break; @@ -1326,7 +1326,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) break; case SID_GALLERY_ENABLE_ADDCOPY: // #108230# allow copy from gallery in Writer AND Writer/Web! - rSet.Put( SfxBoolItem( SID_GALLERY_ENABLE_ADDCOPY, sal_True ) ); + rSet.Put( SfxBoolItem( SID_GALLERY_ENABLE_ADDCOPY, true ) ); break; case FN_EDIT_REGION: if( !rSh.IsAnySectionInDoc() ) @@ -2091,7 +2091,7 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet ) } SfxItemPool& rPool = *rSet.GetPool(); SvxScriptSetItem aSetItem( rPool.GetSlotId( nWhich ), rPool ); - aSetItem.GetItemSet().Put( *pFntCoreSet, sal_False ); + aSetItem.GetItemSet().Put( *pFntCoreSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType ); if( pI ) rSet.Put( *pI, nWhich ); @@ -2492,11 +2492,11 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) if( pArgs && pArgs->Count() >= 2 ) { - SFX_REQUEST_ARG( _rRequest, pName, SfxStringItem, FN_INSERT_TABLE, sal_False ); - SFX_REQUEST_ARG( _rRequest, pCols, SfxUInt16Item, SID_ATTR_TABLE_COLUMN, sal_False ); - SFX_REQUEST_ARG( _rRequest, pRows, SfxUInt16Item, SID_ATTR_TABLE_ROW, sal_False ); - SFX_REQUEST_ARG( _rRequest, pFlags, SfxInt32Item, FN_PARAM_1, sal_False ); - SFX_REQUEST_ARG( _rRequest, pAuto, SfxStringItem, FN_PARAM_2, sal_False ); + SFX_REQUEST_ARG( _rRequest, pName, SfxStringItem, FN_INSERT_TABLE, false ); + SFX_REQUEST_ARG( _rRequest, pCols, SfxUInt16Item, SID_ATTR_TABLE_COLUMN, false ); + SFX_REQUEST_ARG( _rRequest, pRows, SfxUInt16Item, SID_ATTR_TABLE_ROW, false ); + SFX_REQUEST_ARG( _rRequest, pFlags, SfxInt32Item, FN_PARAM_1, false ); + SFX_REQUEST_ARG( _rRequest, pAuto, SfxStringItem, FN_PARAM_2, false ); if ( pName ) aTableName = pName->GetValue(); @@ -2689,8 +2689,8 @@ void SwBaseShell::ExecuteGallery(SfxRequest &rReq) if ( nSel & nsSelectionType::SEL_DRW_TXT ) break; - SFX_REQUEST_ARG( rReq, pPos, SfxUInt16Item, SID_GALLERY_BG_POS, sal_False ); - SFX_REQUEST_ARG( rReq, pBrush, SvxBrushItem, SID_GALLERY_BG_BRUSH, sal_False ); + SFX_REQUEST_ARG( rReq, pPos, SfxUInt16Item, SID_GALLERY_BG_POS, false ); + SFX_REQUEST_ARG( rReq, pBrush, SvxBrushItem, SID_GALLERY_BG_BRUSH, false ); if ( !pPos || !pBrush ) break; diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index fe87a0a8b93a..7b3751d86cac 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -264,8 +264,8 @@ void SwBezierShell::GetState(SfxItemSet &rSet) switch (eSegm) { case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break; - case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button pressed = curve - case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break; + case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,false)); break; // Button pressed = curve + case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,true)); break; default:; //prevent warning } } @@ -309,8 +309,8 @@ void SwBezierShell::GetState(SfxItemSet &rSet) switch (eClose) { case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break; - case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_False)); break; - case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_True)); break; + case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,false)); break; + case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,true)); break; default:; //prevent warning } } diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 307789139a97..16a1f98eac84 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -329,7 +329,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) { // TTTT - needs to be adapted in aw080: // state is not kept for drawing objects --> provide not flipped state - rSet.Put( SfxBoolItem( nWhich, sal_False ) ); + rSet.Put( SfxBoolItem( nWhich, false ) ); } break; @@ -342,7 +342,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) { // TTTT - needs to be adapted in aw080: // state is not kept for drawing objects --> provide not flipped state - rSet.Put( SfxBoolItem( nWhich, sal_False ) ); + rSet.Put( SfxBoolItem( nWhich, false ) ); } break; diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index e4f7c781658c..e92e5f0664f2 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -230,7 +230,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(0 != dynamic_cast<SwWebView*>(&GetView())); SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) ); - aSet.Put( aNewAttr, sal_False ); + aSet.Put( aNewAttr, false ); if (bCaption) pSdrView->GetAttributes( aSet ); diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 761e507e5af3..80a1049bf6da 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -138,7 +138,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) case SID_THES: { OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) @@ -501,7 +501,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) : text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); pTmpView->SetAttributes( aAttr ); - rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), sal_False); + rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), false); rSh.GetView().AttrChangedNotify( &rSh ); } return; @@ -544,7 +544,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) aAttr.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); } pTmpView->SetAttributes( aAttr ); - rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), sal_False ); + rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin(), false ); rSh.GetView().AttrChangedNotify( &rSh ); } return; @@ -858,7 +858,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) if( !pEditPool ) pEditPool = aEditAttr.GetPool(); SvxScriptSetItem aSetItem( nSlotId, *pEditPool ); - aSetItem.GetItemSet().Put( aEditAttr, sal_False ); + aSetItem.GetItemSet().Put( aEditAttr, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType ); if( pI ) rSet.Put( *pI, nWhich ); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 6d410e576692..f4e162a22a4a 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -711,7 +711,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) SvxFontItem aSetDlgFont( RES_CHRATR_FONT ); { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aSetDlgFont = *(SvxFontItem*)pI; @@ -727,7 +727,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) if(sSym.isEmpty()) { SfxAllItemSet aAllSet( GetPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SwViewOption aOpt(*rView.GetWrtShell().GetViewOptions()); OUString sSymbolFont = aOpt.GetSymbolFont(); @@ -743,8 +743,8 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFontItem ) { aFont.SetName( pFontItem->GetFamilyName() ); @@ -868,7 +868,7 @@ void SwDrawTextShell::GetStatePropPanelAttr(SfxItemSet &rSet) } else { - rSet.Put(SfxBoolItem(nSlotId, sal_False)); + rSet.Put(SfxBoolItem(nSlotId, false)); } break; } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index dedc9969cbcb..3b8deb34fb43 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -212,7 +212,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) } rSh.SetFlyName(sName); } - aURL.SetURL( rURL, sal_False ); + aURL.SetURL( rURL, false ); aURL.SetTargetFrameName(rTarget); aSet.Put( aURL ); @@ -391,7 +391,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) } else { - bUpdateMgr = sal_False; + bUpdateMgr = false; } } @@ -477,8 +477,8 @@ void SwFrameShell::Execute(SfxRequest &rReq) "FrameDialog", GetView().GetViewFrame(), GetView().GetWindow(), - aSet, sal_False, - sal_False, + aSet, false, + false, sDefPage); OSL_ENSURE(pDlg, "Dialogdiet fail!"); @@ -886,11 +886,11 @@ void SwFrameShell::GetState(SfxItemSet& rSet) if ( ( eProtection & FLYPROTECT_CONTENT ) || ( eProtection & FLYPROTECT_SIZE ) ) { - rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, true ) ); } else { - rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_False ) ); + rSet.Put( SfxBoolItem( SID_ATTR_TRANSFORM_PROTECT_SIZE, false ) ); } } break; diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 06b3fcbafc5d..07af97ce38e6 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -113,7 +113,7 @@ namespace SwLangHelper // get the language OUString aNewLangTxt; - SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , false ); if (pItem) aNewLangTxt = pItem->GetValue(); diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index dd21ec6b1b4f..8f2935489dc6 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -168,7 +168,7 @@ void SwListShell::Execute(SfxRequest &rReq) { rReq.Ignore(); SfxRequest aReq( GetView().GetViewFrame(), FN_NUM_BULLET_ON ); - aReq.AppendItem( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aReq.AppendItem( SfxBoolItem( FN_PARAM_1, false ) ); aReq.Done(); rSh.DelNumRules(); break; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 1ad2ad926407..3ac93a1c2c3e 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -900,9 +900,9 @@ void SwTableShell::Execute(SfxRequest &rReq) long nCount=0; sal_Bool bHorizontal=sal_True; sal_Bool bProportional = sal_False; - SFX_REQUEST_ARG( rReq, pSplit, SfxInt32Item, FN_TABLE_SPLIT_CELLS, sal_False ); - SFX_REQUEST_ARG( rReq, pHor, SfxBoolItem, FN_PARAM_1, sal_False ); - SFX_REQUEST_ARG( rReq, pProp, SfxBoolItem, FN_PARAM_2, sal_False ); + SFX_REQUEST_ARG( rReq, pSplit, SfxInt32Item, FN_TABLE_SPLIT_CELLS, false ); + SFX_REQUEST_ARG( rReq, pHor, SfxBoolItem, FN_PARAM_1, false ); + SFX_REQUEST_ARG( rReq, pProp, SfxBoolItem, FN_PARAM_2, false ); if ( pSplit ) { nCount = pSplit->GetValue(); @@ -943,7 +943,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_SPLIT_TABLE: { - SFX_REQUEST_ARG( rReq, pType, SfxUInt16Item, FN_PARAM_1, sal_False ); + SFX_REQUEST_ARG( rReq, pType, SfxUInt16Item, FN_PARAM_1, false ); if( pType ) { switch( pType->GetValue() ) @@ -1328,11 +1328,11 @@ void SwTableShell::GetState(SfxItemSet &rSet) break; case FN_TABLE_HEADLINE_REPEAT: if(0 != rSh.GetRowsToRepeat()) - rSet.Put(SfxBoolItem(nSlot, sal_True)); + rSet.Put(SfxBoolItem(nSlot, true)); else if(!rSh.GetRowSelectionFromTop()) rSet.DisableItem( nSlot ); else - rSet.Put(SfxBoolItem(nSlot, sal_False)); + rSet.Put(SfxBoolItem(nSlot, false)); break; case FN_TABLE_SELECT_CELL : if(rSh.HasBoxSelection()) diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index b99cadb63f7e..394855361d36 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -60,7 +60,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, rSh.StartUndo( UNDO_UI_INSERT_URLBTN ); if (rSh.BeginCreate(OBJ_FM_BUTTON, FmFormInventor, aStartPos)) { - pSdrView->SetOrtho(sal_False); + pSdrView->SetOrtho(false); Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); Point aEndPos(aSz.Width(), aSz.Height()); diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 80579cc1b3af..047723733309 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -323,7 +323,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_DELETE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, false); if ( pNoteItem && GetView().GetPostItMgr() ) GetView().GetPostItMgr()->Delete( pNoteItem->GetValue() ); } @@ -341,7 +341,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_HIDE_NOTE_AUTHOR: { - SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, sal_False); + SFX_REQUEST_ARG( rReq, pNoteItem, SfxStringItem, nSlot, false); if ( pNoteItem && GetView().GetPostItMgr() ) GetView().GetPostItMgr()->Hide( pNoteItem->GetValue() ); } @@ -511,8 +511,8 @@ void SwTextShell::ExecField(SfxRequest &rReq) if ( pItem ) { aText = ((SfxStringItem*)pItem)->GetValue(); - SFX_REQUEST_ARG( rReq, pType, SfxStringItem, FN_PARAM_2 , sal_False ); - SFX_REQUEST_ARG( rReq, pIsUrl, SfxBoolItem, FN_PARAM_1 , sal_False ); + SFX_REQUEST_ARG( rReq, pType, SfxStringItem, FN_PARAM_2 , false ); + SFX_REQUEST_ARG( rReq, pIsUrl, SfxBoolItem, FN_PARAM_1 , false ); if ( pType ) aType = pType->GetValue(); if ( pIsUrl ) diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 46531183d2ea..a81641c1bfbb 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -191,12 +191,12 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) if(!pIdxMrk) rSet.DisableItem( FN_INSERT_IDX_ENTRY_DLG ); else - rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG, sal_True)); + rSet.Put(SfxBoolItem(FN_INSERT_IDX_ENTRY_DLG, true)); if(!pAuthMark) rSet.DisableItem( FN_INSERT_AUTH_ENTRY_DLG ); else - rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, sal_True)); + rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, true)); } else if ( rSh.CrsrInsideInputFld() ) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index d2bbceef4606..7a9e181c7c7f 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -271,7 +271,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_OBJECT: case SID_INSERT_PLUGIN: { - SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, false ); SvGlobalName *pName = NULL; SvGlobalName aName; if ( pNameItem ) @@ -280,8 +280,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) pName = &aName; } - SFX_REQUEST_ARG( rReq, pClassLocationItem, SfxStringItem, FN_PARAM_2, sal_False ); - SFX_REQUEST_ARG( rReq, pCommandsItem, SfxStringItem, FN_PARAM_3, sal_False ); + SFX_REQUEST_ARG( rReq, pClassLocationItem, SfxStringItem, FN_PARAM_2, false ); + SFX_REQUEST_ARG( rReq, pCommandsItem, SfxStringItem, FN_PARAM_3, false ); //TODO/LATER: recording currently not working, need code for Commandlist svt::EmbeddedObjectRef xObj; if( nSlot == SID_INSERT_PLUGIN && ( pClassLocationItem || pCommandsItem ) ) @@ -342,11 +342,11 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_FLOATINGFRAME: { svt::EmbeddedObjectRef xObj; - SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, FN_PARAM_1, sal_False ); - SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, FN_PARAM_2, sal_False ); - SFX_REQUEST_ARG( rReq, pMarginItem, SvxSizeItem, FN_PARAM_3, sal_False ); - SFX_REQUEST_ARG( rReq, pScrollingItem, SfxByteItem, FN_PARAM_4, sal_False ); - SFX_REQUEST_ARG( rReq, pBorderItem, SfxBoolItem, FN_PARAM_5, sal_False ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, FN_PARAM_1, false ); + SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, FN_PARAM_2, false ); + SFX_REQUEST_ARG( rReq, pMarginItem, SvxSizeItem, FN_PARAM_3, false ); + SFX_REQUEST_ARG( rReq, pScrollingItem, SfxByteItem, FN_PARAM_4, false ); + SFX_REQUEST_ARG( rReq, pBorderItem, SfxBoolItem, FN_PARAM_5, false ); if(pURLItem) // URL is a _must_ { @@ -986,7 +986,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) SvxFontItem aFont( RES_CHRATR_FONT ); { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aFont = *(SvxFontItem*)pI; @@ -1003,7 +1003,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) { // Set selected font as default. SfxAllItemSet aAllSet( rSh.GetAttrPool() ); - aAllSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) ); + aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) ); SwViewOption aOpt(*GetShell().GetViewOptions()); OUString sSymbolFont = aOpt.GetSymbolFont(); @@ -1017,8 +1017,8 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ); if( RET_OK == pDlg->Execute() ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, sal_False ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); if ( pFontItem ) { aNewFont.SetName( pFontItem->GetFamilyName() ); @@ -1054,7 +1054,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) rSh.GetCurAttr( aSet ); SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, *aSet.GetPool() ); - aSetItem.GetItemSet().Put( aSet, sal_False ); + aSetItem.GetItemSet().Put( aSet, false ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if( pI ) aFont = *(SvxFontItem*)pI; diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index e50646a5daff..4be8724d0460 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -216,7 +216,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const aReq.Done(); SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), FN_CHAR_LEFT ); aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) ); - aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, sal_True) ); + aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, true) ); aReq1.Done(); } } @@ -235,7 +235,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const { SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), FN_CHAR_RIGHT ); aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) ); - aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, sal_False) ); + aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, false) ); aReq1.Done(); rWrtSh.SwapPam(); rWrtSh.ClearMark(); @@ -283,7 +283,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { // get the language OUString aNewLangTxt; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_LANGUAGE_STATUS , sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_LANGUAGE_STATUS , false ); if (pItem2) aNewLangTxt = pItem2->GetValue(); @@ -396,7 +396,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { // replace word/selection with text from selected sub menu entry OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES , sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES , false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) @@ -418,8 +418,8 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_INSERT_ENDNOTE: { OUString aStr; - SFX_REQUEST_ARG( rReq, pFont, SfxStringItem, FN_PARAM_1 , sal_False ); - SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, nSlot , sal_False ); + SFX_REQUEST_ARG( rReq, pFont, SfxStringItem, FN_PARAM_1 , false ); + SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, nSlot , false ); if ( pNameItem ) aStr = pNameItem->GetValue(); bool bFont = pFont && !pFont->GetValue().isEmpty(); @@ -522,9 +522,9 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( pItem ) { nKind = ((SfxInt16Item*)pItem)->GetValue(); - SFX_REQUEST_ARG( rReq, pTemplate, SfxStringItem, FN_PARAM_1 , sal_False ); - SFX_REQUEST_ARG( rReq, pNumber, SfxUInt16Item, FN_PARAM_2 , sal_False ); - SFX_REQUEST_ARG( rReq, pIsNumberFilled, SfxBoolItem, FN_PARAM_3, sal_False ); + SFX_REQUEST_ARG( rReq, pTemplate, SfxStringItem, FN_PARAM_1 , false ); + SFX_REQUEST_ARG( rReq, pNumber, SfxUInt16Item, FN_PARAM_2 , false ); + SFX_REQUEST_ARG( rReq, pIsNumberFilled, SfxBoolItem, FN_PARAM_3, false ); if ( pTemplate ) aTemplateName = pTemplate->GetValue(); if ( pNumber && pIsNumberFilled && pIsNumberFilled->GetValue() ) @@ -615,10 +615,10 @@ void SwTextShell::Execute(SfxRequest &rReq) { SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags()); // This must always be sal_False for the postprocessing. - aFlags.bAFmtByInput = sal_False; - aFlags.bWithRedlining = sal_True; + aFlags.bAFmtByInput = false; + aFlags.bWithRedlining = true; rWrtSh.AutoFormat( &aFlags ); - aFlags.bWithRedlining = sal_False; + aFlags.bWithRedlining = false; SfxViewFrame* pVFrame = GetView().GetViewFrame(); if (pVFrame->HasChildWindow(FN_REDLINE_ACCEPT)) @@ -659,7 +659,7 @@ void SwTextShell::Execute(SfxRequest &rReq) { SvxSwAutoFmtFlags aFlags(SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags()); // This must always be sal_False for the postprocessing. - aFlags.bAFmtByInput = sal_False; + aFlags.bAFmtByInput = false; rWrtSh.AutoFormat( &aFlags ); rReq.Done(); } diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index b952a4ab7bc6..2059b5c253a5 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -103,10 +103,10 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) SfxBindings& rBind = GetView().GetViewFrame()->GetBindings(); if( nWhich == FN_SET_SUB_SCRIPT ) rBind.SetState( SfxBoolItem( FN_SET_SUPER_SCRIPT, - sal_False ) ); + false ) ); else rBind.SetState( SfxBoolItem( FN_SET_SUB_SCRIPT, - sal_False ) ); + false ) ); } break; @@ -311,7 +311,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) SET_ADJUST: { aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST)); - rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), sal_True ) ); + rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), true ) ); } break; @@ -617,7 +617,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) { SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONTHEIGHT, *rSet.GetPool() ); - aSetItem.GetItemSet().Put( aCoreSet, sal_False ); + aSetItem.GetItemSet().Put( aCoreSet, false ); if( !aSetItem.GetItemOfScript( rSh.GetScriptType() )) rSet.DisableItem( nSlot ); nSlot = 0; @@ -745,7 +745,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) nSlot = aIter.NextWhich(); } - rSet.Put(aCoreSet,sal_False); + rSet.Put(aCoreSet,false); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 2e10d58c194d..f82d828b0a98 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -50,7 +50,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) case FN_NUM_NUMBERING_ON: { GetShell().StartAllAction(); - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , false ); sal_Bool bMode = !GetShell().SelectionHasNumber(); // #i29560# if ( pItem ) bMode = pItem->GetValue(); @@ -79,7 +79,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) case FN_NUM_BULLET_ON: { GetShell().StartAllAction(); - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , false ); sal_Bool bMode = !GetShell().SelectionHasBullet(); // #i29560# if ( pItem ) bMode = pItem->GetValue(); @@ -176,7 +176,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) aSet.Put(SvxNumBulletItem(aSvxRule)); } - aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,sal_False )); + aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,false )); // Before the dialogue of the HTML mode will be dropped at the Docshell. pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); @@ -298,7 +298,7 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq) { case FN_SVX_SET_NUMBER: { - SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_NUMBER , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_NUMBER , false ); if (pItem) { sal_uInt16 nIdx = pItem->GetValue(); @@ -351,7 +351,7 @@ void SwTextShell::ExecSetNumber(SfxRequest &rReq) } case FN_SVX_SET_BULLET: { - SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_BULLET , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, FN_SVX_SET_BULLET , false ); if (pItem) { sal_uInt16 nIdx = pItem->GetValue(); |