summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/shells')
-rw-r--r--sw/source/ui/shells/annotsh.cxx22
-rw-r--r--sw/source/ui/shells/basesh.cxx24
-rw-r--r--sw/source/ui/shells/beziersh.cxx2
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/shells/drformsh.cxx2
-rw-r--r--sw/source/ui/shells/drwbassh.cxx26
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx10
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx8
-rw-r--r--sw/source/ui/shells/frmsh.cxx32
-rw-r--r--sw/source/ui/shells/grfsh.cxx14
-rw-r--r--sw/source/ui/shells/langhelper.cxx2
-rw-r--r--sw/source/ui/shells/mediash.cxx2
-rw-r--r--sw/source/ui/shells/navsh.cxx2
-rw-r--r--sw/source/ui/shells/tabsh.cxx36
-rw-r--r--sw/source/ui/shells/textfld.cxx26
-rw-r--r--sw/source/ui/shells/textglos.cxx8
-rw-r--r--sw/source/ui/shells/textidx.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx20
-rw-r--r--sw/source/ui/shells/textsh1.cxx26
-rw-r--r--sw/source/ui/shells/textsh2.cxx16
-rw-r--r--sw/source/ui/shells/txtattr.cxx16
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx4
-rw-r--r--sw/source/ui/shells/txtnum.cxx4
23 files changed, 153 insertions, 153 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 6e86f14a0873..6e3452f5a2e4 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -344,7 +344,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
{
const SfxPoolItem* pItem = 0;
if(pNewAttrs)
- pNewAttrs->GetItemState(nSlot, sal_False, &pItem);
+ pNewAttrs->GetItemState(nSlot, false, &pItem);
if(pItem)
{
@@ -399,7 +399,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
{
const SfxPoolItem* pItem = 0;
if(pNewAttrs)
- pNewAttrs->GetItemState(nSlot, sal_False, &pItem );
+ pNewAttrs->GetItemState(nSlot, false, &pItem );
if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
pOLV->InsertText(((const SfxStringItem *)pItem)->GetValue());
break;
@@ -558,7 +558,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
const SfxPoolItem* pPoolItem;
- if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, sal_True, &pPoolItem ) )
+ if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, true, &pPoolItem ) )
{
if( !( (SfxBoolItem*)pPoolItem)->GetValue() )
bLeftToRight = !bLeftToRight;
@@ -569,7 +569,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
0 );
sal_uInt16 nAdjust = SVX_ADJUST_LEFT;
- if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) )
+ if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
if( bLeftToRight )
@@ -732,7 +732,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
eAdjust = SVX_ADJUST_BLOCK;
if( !pAdjust )
- aEditAttr.GetItemState( EE_PARA_JUST, sal_False, &pAdjust);
+ aEditAttr.GetItemState( EE_PARA_JUST, false, &pAdjust);
if( !pAdjust || IsInvalidItem( pAdjust ))
rSet.InvalidateItem( nSlotId ), nSlotId = 0;
@@ -760,7 +760,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
nLSpace = 200;
if( !pLSpace )
- aEditAttr.GetItemState( EE_PARA_SBL, sal_False, &pLSpace );
+ aEditAttr.GetItemState( EE_PARA_SBL, false, &pLSpace );
if( !pLSpace || IsInvalidItem( pLSpace ))
rSet.InvalidateItem( nSlotId ), nSlotId = 0;
@@ -835,7 +835,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich);
if(nEEWhich == EE_CHAR_KERNING)
{
- SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, sal_True );
+ SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true );
if ( eState == SFX_ITEM_DONTCARE )
{
rSet.InvalidateItem(EE_CHAR_KERNING);
@@ -915,7 +915,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
{
sal_uLong nFormat = 0;
const SfxPoolItem* pItem;
- if ( rReq.GetArgs() && rReq.GetArgs()->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET &&
+ if ( rReq.GetArgs() && rReq.GetArgs()->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET &&
pItem->ISA(SfxUInt32Item) )
{
nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -1449,7 +1449,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq)
sal_uInt16 nId = rReq.GetSlot();
sal_uInt16 nCnt = 1;
const SfxPoolItem* pItem=0;
- if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pItem ) )
+ if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ) )
nCnt = ((SfxUInt16Item*)pItem)->GetValue();
switch( nId )
{
@@ -1634,7 +1634,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
- pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem);
OUString sSym;
OUString sFontName;
@@ -1642,7 +1642,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
{
sSym = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
- pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
+ pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
sFontName = pFontItem->GetValue();
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index cab5e145f48e..c50b5944fa7e 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -287,7 +287,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
{
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pFmt;
- if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pFmt ) )
+ if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pFmt ) )
{
TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard(
@@ -463,7 +463,7 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq)
sal_uInt16 nId = rReq.GetSlot(), nCnt = 1;
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
- if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pItem ))
+ if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ))
nCnt = ((SfxUInt16Item*)pItem)->GetValue();
// #i106349#: save pointer: undo/redo may delete the shell, i.e., this!
@@ -772,7 +772,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
SwTableAutoFmt const* pTAFmt = 0;
SwTableAutoFmtTbl* pAutoFmtTbl = 0;
bool bDeleteFormat = true;
- if(pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_1, sal_True, &pItem))
+ if(pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_1, true, &pItem))
{
aInsTblOpts.mnInsMode = 0;
// Delimiter
@@ -780,7 +780,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if(!sDelim.isEmpty())
cDelim = sDelim[0];
// AutoFormat
- if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_2, sal_True, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_2, true, &pItem))
{
OUString sAutoFmt = static_cast< const SfxStringItem* >(pItem)->GetValue();
@@ -799,19 +799,19 @@ void SwBaseShell::Execute(SfxRequest &rReq)
}
}
//WithHeader
- if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_3, sal_True, &pItem) &&
+ if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_3, true, &pItem) &&
static_cast< const SfxBoolItem* >(pItem)->GetValue())
aInsTblOpts.mnInsMode |= tabopts::HEADLINE;
// RepeatHeaderLines
- if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_4, sal_True, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_4, true, &pItem))
aInsTblOpts.mnRowsToRepeat =
(sal_uInt16)static_cast< const SfxInt16Item* >(pItem)->GetValue();
//WithBorder
- if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_5, sal_True, &pItem) &&
+ if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_5, true, &pItem) &&
static_cast< const SfxBoolItem* >(pItem)->GetValue())
aInsTblOpts.mnInsMode |= tabopts::DEFAULT_BORDER;
//DontSplitTable
- if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem) &&
+ if(SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_6, true, &pItem) &&
!static_cast< const SfxBoolItem* >(pItem)->GetValue() )
aInsTblOpts.mnInsMode |= tabopts::SPLIT_LAYOUT;
}
@@ -1111,7 +1111,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
case FN_XFORMS_DESIGN_MODE:
if( pArgs != NULL
- && pArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET
+ && pArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET
&& pItem != NULL
&& pItem->ISA( SfxBoolItem ) )
{
@@ -1138,7 +1138,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if(bMore && pArgs)
{
pItem = 0;
- pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
if(pItem)
switch(nSlot)
{
@@ -1738,7 +1738,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( nWhich, bValue ) );
}
else
- rSet.Put( SfxVisibilityItem( nWhich, sal_False ) );
+ rSet.Put( SfxVisibilityItem( nWhich, false ) );
break;
}
nWhich = aIter.NextWhich();
@@ -2329,7 +2329,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
const SfxItemSet* pOutSet = 0;
bool bDone = false;
if(pArgs)
- pArgs->GetItemState( GetPool().GetWhich(nSlot), sal_False, &pItem );
+ pArgs->GetItemState( GetPool().GetWhich(nSlot), false, &pItem );
switch ( nSlot )
{
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index 486a159b9ff7..8ba2d2a184df 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -74,7 +74,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
pSdrView->GetModel()->SetChanged(false);
const SfxPoolItem* pItem;
if(pArgs)
- pArgs->GetItemState(nSlotId, sal_False, &pItem);
+ pArgs->GetItemState(nSlotId, false, &pItem);
switch (nSlotId)
{
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index df9bb3f104e2..5932d12c999b 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -202,7 +202,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pItem;
if(pArgs)
- pArgs->GetItemState(nSlotId, sal_False, &pItem);
+ pArgs->GetItemState(nSlotId, false, &pItem);
bool bMirror = true;
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx
index 1025e896b148..49612e5458ed 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/ui/shells/drformsh.cxx
@@ -79,7 +79,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
case SID_HYPERLINK_SETLINK:
{
if(pArgs)
- pArgs->GetItemState(SID_HYPERLINK_SETLINK, sal_False, &pItem);
+ pArgs->GetItemState(SID_HYPERLINK_SETLINK, false, &pItem);
if(pItem)
{
SdrView *pSdrView = rSh.GetDrawView();
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index bff73cf95a51..c19d90caa019 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -105,7 +105,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
pSdrView->GetModel()->SetChanged(false);
const SfxPoolItem* pItem = 0;
if(pArgs)
- pArgs->GetItemState(nSlotId, sal_False, &pItem);
+ pArgs->GetItemState(nSlotId, false, &pItem);
//Special case align by menu
if(pItem && nSlotId == SID_OBJECT_ALIGN)
@@ -156,7 +156,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
{
const SfxPoolItem* pWrapItem;
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
- if(SFX_ITEM_SET == pOutSet->GetItemState(FN_DRAW_WRAP_DLG, sal_False, &pWrapItem))
+ if(SFX_ITEM_SET == pOutSet->GetItemState(FN_DRAW_WRAP_DLG, false, &pWrapItem))
{
short nLayer = ((const SfxInt16Item*)pWrapItem)->GetValue();
if (nLayer == 1)
@@ -275,9 +275,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
bool bPosCorr =
SFX_ITEM_SET != pOutSet->GetItemState(
- SID_ATTR_TRANSFORM_POS_X, sal_False ) &&
+ SID_ATTR_TRANSFORM_POS_X, false ) &&
SFX_ITEM_SET != pOutSet->GetItemState(
- SID_ATTR_TRANSFORM_POS_Y, sal_False );
+ SID_ATTR_TRANSFORM_POS_Y, false );
SfxItemSet aFrmAttrSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END - 1);
@@ -285,7 +285,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pAnchorItem;
if(SFX_ITEM_SET == pOutSet->GetItemState(
- SID_ATTR_TRANSFORM_ANCHOR, sal_False, &pAnchorItem))
+ SID_ATTR_TRANSFORM_ANCHOR, false, &pAnchorItem))
{
if(!bSingleSelection)
pSh->ChgAnchor(((const SfxInt16Item*)pAnchorItem)
@@ -301,10 +301,10 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pHoriRelation = 0;
const SfxPoolItem* pHoriPosition = 0;
const SfxPoolItem* pHoriMirror = 0;
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_ORIENT, sal_False, &pHoriOrient);
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_RELATION, sal_False, &pHoriRelation);
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_POSITION, sal_False, &pHoriPosition);
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_MIRROR, sal_False, &pHoriMirror);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_ORIENT, false, &pHoriOrient);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_RELATION, false, &pHoriRelation);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_POSITION, false, &pHoriPosition);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_HORI_MIRROR, false, &pHoriMirror);
if(pHoriOrient || pHoriRelation || pHoriPosition || pHoriMirror)
{
if(pHoriOrient)
@@ -323,9 +323,9 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pVertOrient = 0;
const SfxPoolItem* pVertRelation = 0;
const SfxPoolItem* pVertPosition = 0;
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_ORIENT, sal_False, &pVertOrient);
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_RELATION, sal_False, &pVertRelation);
- pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_POSITION, sal_False, &pVertPosition);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_ORIENT, false, &pVertOrient);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_RELATION, false, &pVertRelation);
+ pOutSet->GetItemState(SID_ATTR_TRANSFORM_VERT_POSITION, false, &pVertPosition);
if(pVertOrient || pVertRelation || pVertPosition )
{
if(pVertOrient)
@@ -339,7 +339,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
aFrmAttrSet.Put( aVOrient );
}
const SfxPoolItem* pFollowItem = 0;
- pOutSet->GetItemState(RES_FOLLOW_TEXT_FLOW, sal_False, &pFollowItem);
+ pOutSet->GetItemState(RES_FOLLOW_TEXT_FLOW, false, &pFollowItem);
if(pFollowItem)
aFrmAttrSet.Put(*pFollowItem);
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 0b5a0b97484d..2f9c543ad0cb 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -461,7 +461,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
{
const SfxPoolItem* pItem = 0;
if(pNewAttrs)
- pNewAttrs->GetItemState(nSlot, sal_False, &pItem);
+ pNewAttrs->GetItemState(nSlot, false, &pItem);
if(pItem)
{
@@ -519,7 +519,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
const SfxPoolItem* pPoolItem;
- if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, sal_True, &pPoolItem ) )
+ if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, true, &pPoolItem ) )
{
if( !( (SfxBoolItem*)pPoolItem)->GetValue() )
bLeftToRight = !bLeftToRight;
@@ -530,7 +530,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
0 );
sal_uInt16 nAdjust = SVX_ADJUST_LEFT;
- if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, sal_True, &pPoolItem ) )
+ if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
nAdjust = ( (SvxAdjustItem*)pPoolItem)->GetEnumValue();
if( bLeftToRight )
@@ -653,7 +653,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
ASK_ADJUST:
{
if( !pAdjust )
- aEditAttr.GetItemState( EE_PARA_JUST, sal_False, &pAdjust);
+ aEditAttr.GetItemState( EE_PARA_JUST, false, &pAdjust);
if( !pAdjust || IsInvalidItem( pAdjust ))
rSet.InvalidateItem( nSlotId ), nSlotId = 0;
@@ -710,7 +710,7 @@ ASK_ADJUST:
ASK_LINESPACE:
{
if( !pLSpace )
- aEditAttr.GetItemState( EE_PARA_SBL, sal_False, &pLSpace );
+ aEditAttr.GetItemState( EE_PARA_SBL, false, &pLSpace );
if( !pLSpace || IsInvalidItem( pLSpace ))
rSet.InvalidateItem( nSlotId ), nSlotId = 0;
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index f4e162a22a4a..885776080f43 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -412,7 +412,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
const SfxPoolItem* pItem = 0;
if(pNewAttrs)
{
- pNewAttrs->GetItemState(nSlot, sal_False, &pItem );
+ pNewAttrs->GetItemState(nSlot, false, &pItem );
pOLV->InsertText(((const SfxStringItem *)pItem)->GetValue());
}
break;
@@ -524,7 +524,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
{
case SID_UNDO:
case SID_REDO:
- if( SFX_ITEM_SET == pArgs->GetItemState( nId, sal_False, &pItem ) &&
+ if( SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ) &&
1 < (nCnt = ((SfxUInt16Item*)pItem)->GetValue()) )
{
// then we make by ourself.
@@ -692,7 +692,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
- pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem);
OUString sSym;
OUString sFontName;
@@ -700,7 +700,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
{
sSym = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
- pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
+ pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
sFontName = pFontItem->GetValue();
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 5467a6f32774..f9ed0949a836 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -156,7 +156,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
{
// Frame already exists, only the number of columns will be changed.
sal_uInt16 nCols = 1;
- if(pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET)
nCols = ((SfxUInt16Item *)pItem)->GetValue();
SfxItemSet aSet(GetPool(),RES_COL,RES_COL);
@@ -188,7 +188,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
case SID_HYPERLINK_SETLINK:
{
- if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_HYPERLINK_SETLINK, sal_False, &pItem))
+ if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_HYPERLINK_SETLINK, false, &pItem))
{
const SvxHyperlinkItem& rHLinkItem = *(const SvxHyperlinkItem *)pItem;
const OUString& rURL = rHLinkItem.GetURL();
@@ -360,7 +360,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
case SID_ATTR_ULSPACE:
case SID_ATTR_LRSPACE:
{
- if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem))
+ if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem))
{
aMgr.SetAttrSet( *pArgs );
bCopyToFmt = true;
@@ -373,13 +373,13 @@ void SwFrameShell::Execute(SfxRequest &rReq)
bool bApplyNewSize = false;
Size aNewSize = aMgr.GetSize();
- if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_WIDTH, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_WIDTH, false, &pItem ) )
{
aNewSize.setWidth( static_cast< const SfxUInt32Item* >(pItem)->GetValue() );
bApplyNewSize = true;
}
- if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_HEIGHT, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_TRANSFORM_HEIGHT, false, &pItem ) )
{
aNewSize.setHeight( static_cast< const SfxUInt32Item* >(pItem)->GetValue() );
bApplyNewSize = true;
@@ -463,7 +463,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
aSet.Put( SfxBoolItem( FN_OLE_IS_MATH, xObj.is() && SotExchange::IsMath( xObj->getClassID() ) ) );
OString sDefPage;
- if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs && pArgs->GetItemState(FN_FORMAT_FRAME_DLG, false, &pItem) == SFX_ITEM_SET)
sDefPage = OUStringToOString(((SfxStringItem *)pItem)->GetValue(), RTL_TEXTENCODING_UTF8);
aSet.Put(SfxFrameItem( SID_DOCFRAME, &GetView().GetViewFrame()->GetTopFrame()));
@@ -494,13 +494,13 @@ void SwFrameShell::Execute(SfxRequest &rReq)
{
rReq.Done(*pOutSet);
if(nSel & nsSelectionType::SEL_OLE &&
- SFX_ITEM_SET == pOutSet->GetItemState(FN_KEEP_ASPECT_RATIO, sal_True, &pItem))
+ SFX_ITEM_SET == pOutSet->GetItemState(FN_KEEP_ASPECT_RATIO, true, &pItem))
{
SwViewOption aUsrPref( *pVOpt );
aUsrPref.SetKeepRatio(((const SfxBoolItem*)pItem)->GetValue());
SW_MOD()->ApplyUsrPref(aUsrPref, &GetView());
}
- if (SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_ALT_NAME, sal_True, &pItem))
+ if (SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_ALT_NAME, true, &pItem))
{
// #i73249#
rSh.SetObjTitle(((const SfxStringItem*)pItem)->GetValue());
@@ -511,7 +511,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
{
rSh.AutoUpdateFrame(pFmt, *pOutSet);
// Anything which is not supported by the format must be set hard.
- if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, sal_False, &pItem))
+ if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue());
SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE,
RES_SURROUND, RES_SURROUND,
@@ -520,7 +520,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
0);
aShellSet.Put(*pOutSet);
aMgr.SetAttrSet(aShellSet);
- if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, sal_False, &pItem))
+ if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue());
}
else
@@ -529,7 +529,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
const SwFrmFmt* pCurrFlyFmt = rSh.GetFlyFrmFmt();
if(SFX_ITEM_SET ==
pOutSet->GetItemState(FN_PARAM_CHAIN_PREVIOUS,
- sal_False, &pItem))
+ false, &pItem))
{
rSh.HideChainMarker();
@@ -563,7 +563,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
rSh.SetChainMarker();
}
if(SFX_ITEM_SET ==
- pOutSet->GetItemState(FN_PARAM_CHAIN_NEXT, sal_False,
+ pOutSet->GetItemState(FN_PARAM_CHAIN_NEXT, false,
&pItem))
{
rSh.HideChainMarker();
@@ -814,7 +814,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
SfxItemSet aURLSet(GetPool(), RES_URL, RES_URL);
rSh.GetFlyFrmAttr( aURLSet );
- if(SFX_ITEM_SET == aURLSet.GetItemState(RES_URL, sal_True, &pItem))
+ if(SFX_ITEM_SET == aURLSet.GetItemState(RES_URL, true, &pItem))
{
const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem;
aHLinkItem.SetURL(pFmtURL->GetURL());
@@ -986,7 +986,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
{
case SID_ATTR_BORDER:
{
- if (pArgs->GetItemState(RES_BOX, sal_True, &pItem) == SFX_ITEM_SET)
+ if (pArgs->GetItemState(RES_BOX, true, &pItem) == SFX_ITEM_SET)
{
SvxBoxItem aNewBox(*((SvxBoxItem *)pItem));
const SvxBorderLine* pBorderLine;
@@ -1032,7 +1032,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
case SID_FRAME_LINESTYLE:
{
- if (pArgs->GetItemState(SID_FRAME_LINESTYLE, sal_False, &pItem) == SFX_ITEM_SET)
+ if (pArgs->GetItemState(SID_FRAME_LINESTYLE, false, &pItem) == SFX_ITEM_SET)
{
const SvxLineItem* pLineItem =
(const SvxLineItem*)pItem;
@@ -1086,7 +1086,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
case SID_FRAME_LINECOLOR:
{
- if (pArgs->GetItemState(SID_FRAME_LINECOLOR, sal_False, &pItem) == SFX_ITEM_SET)
+ if (pArgs->GetItemState(SID_FRAME_LINECOLOR, false, &pItem) == SFX_ITEM_SET)
{
const Color& rNewColor = ((const SvxColorItem*)pItem)->GetValue();
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 0ad28795b5b8..b8c9b422396a 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -330,7 +330,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
rReq.Done(*pSet);
// change the 2 frmsize SizeItems to the correct SwFrmSizeItem
if( SFX_ITEM_SET == pSet->GetItemState(
- SID_ATTR_GRAF_FRMSIZE, sal_False, &pItem ))
+ SID_ATTR_GRAF_FRMSIZE, false, &pItem ))
{
SwFmtFrmSize aSize;
const Size& rSz = ((SvxSizeItem*)pItem)->GetSize();
@@ -338,7 +338,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSize.SetHeight( rSz.Height() );
if( SFX_ITEM_SET == pSet->GetItemState(
- SID_ATTR_GRAF_FRMSIZE_PERCENT, sal_False, &pItem ))
+ SID_ATTR_GRAF_FRMSIZE_PERCENT, false, &pItem ))
{
const Size& rRelativeSize = ((SvxSizeItem*)pItem)->GetSize();
aSize.SetWidthPercent( static_cast< sal_uInt8 >( rRelativeSize.Width() ) );
@@ -368,14 +368,14 @@ void SwGrfShell::Execute(SfxRequest &rReq)
bool bApplyUsrPref = false;
if (SFX_ITEM_SET == pSet->GetItemState(
- FN_KEEP_ASPECT_RATIO, sal_True, &pItem ))
+ FN_KEEP_ASPECT_RATIO, true, &pItem ))
{
aUsrPref.SetKeepRatio(
((const SfxBoolItem*)pItem)->GetValue() );
bApplyUsrPref = true;
}
if( SFX_ITEM_SET == pSet->GetItemState(
- SID_ATTR_GRAF_KEEP_ZOOM, sal_True, &pItem ))
+ SID_ATTR_GRAF_KEEP_ZOOM, true, &pItem ))
{
aUsrPref.SetGrfKeepZoom(
((const SfxBoolItem*)pItem)->GetValue() );
@@ -387,7 +387,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
// and now set all the graphic attributes and other stuff
if( SFX_ITEM_SET == pSet->GetItemState(
- SID_ATTR_GRAF_GRAPHIC, sal_True, &pItem ))
+ SID_ATTR_GRAF_GRAPHIC, true, &pItem ))
{
if( !((SvxBrushItem*)pItem)->GetGraphicLink().isEmpty() )
sGrfNm = ((SvxBrushItem*)pItem)->GetGraphicLink();
@@ -414,7 +414,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
}
if ( SFX_ITEM_SET == pSet->GetItemState(
- FN_SET_FRM_ALT_NAME, sal_True, &pItem ))
+ FN_SET_FRM_ALT_NAME, true, &pItem ))
{
// #i73249#
rSh.SetObjTitle( ((const SfxStringItem*)pItem)->GetValue() );
@@ -461,7 +461,7 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
sal_uInt16 nSlot = rReq.GetSlot();
- if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, sal_False, &pItem ))
+ if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, false, &pItem ))
pItem = 0;
switch( nSlot )
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx
index 07af97ce38e6..f28c80e13457 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/ui/shells/langhelper.cxx
@@ -426,7 +426,7 @@ namespace SwLangHelper
LanguageType nLang = LANGUAGE_SYSTEM;
const SfxPoolItem *pItem = 0;
- SfxItemState nState = aSet.GetItemState( nLangWhichId, sal_True, &pItem );
+ SfxItemState nState = aSet.GetItemState( nLangWhichId, true, &pItem );
if (nState > SFX_ITEM_DEFAULT && pItem)
{
// the item is set and can be used
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 9666079beadf..6f9671c42322 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -110,7 +110,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
{
const SfxPoolItem* pItem;
- if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, sal_False, &pItem ) ) )
+ if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, false, &pItem ) ) )
pItem = NULL;
if( pItem )
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx
index f821f4cbfac3..012d919b8d20 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/ui/shells/navsh.cxx
@@ -53,7 +53,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq)
SwNavigationMgr& aSwNavigationMgr = pSh->GetNavigationMgr();
const SfxPoolItem* pItem;
if(pArgs)
- pArgs->GetItemState(nSlotId, sal_False, &pItem);
+ pArgs->GetItemState(nSlotId, false, &pItem);
switch (nSlotId)
{
case FN_NAVIGATION_BACK:
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index f94e04455d22..d315be15c2f0 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -269,7 +269,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
SwViewOption aUsrPref( *rSh.GetViewOptions() );
sal_uInt16 nBackgroundDestination = aUsrPref.GetTblDest();
- if(SFX_ITEM_SET == rSet.GetItemState(SID_BACKGRND_DESTINATION, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_BACKGRND_DESTINATION, false, &pItem))
{
nBackgroundDestination = ((SfxUInt16Item*)pItem)->GetValue();
aUsrPref.SetTblDest((sal_uInt8)nBackgroundDestination);
@@ -278,14 +278,14 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) );
pItem = 0;
- bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
+ bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, false, &pItem );
const SfxPoolItem* pRowItem = 0, *pTableItem = 0;
- bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem );
- bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem );
+ bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, false, &pRowItem );
+ bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false, &pTableItem );
const SfxPoolItem* pSplit = 0;
- bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pSplit );
+ bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, false, &pSplit );
const SfxPoolItem* pBoxDirection = 0;
- bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection );
+ bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, false, &pBoxDirection );
if( bBackground || bBorder || bRowSplit || bBoxDirection)
{
// The border will be applied to the present selection.
@@ -350,7 +350,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
SwTableRep* pRep = 0;
SwFrmFmt *pFmt = rSh.GetTableFmt();
SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
- if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
{
pRep = (SwTableRep*)((const SwPtrItem*)pItem)->GetValue();
@@ -392,13 +392,13 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
}
- if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, sal_False, &pItem))
+ if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem))
rSh.SetRowsToRepeat( ((SfxUInt16Item*)pItem)->GetValue() );
- if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_SET_VERT_ALIGN, sal_False, &pItem))
+ if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_SET_VERT_ALIGN, false, &pItem))
rSh.SetBoxAlign(((SfxUInt16Item*)(pItem))->GetValue());
- if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, sal_False, &pItem ))
+ if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, false, &pItem ))
rSh.SetTableName( *pFmt, ((const SfxStringItem*)pItem)->GetValue() );
// Copy the chosen attributes in the ItemSet.
@@ -417,7 +417,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
0
};
for( const sal_uInt16* pIds = aIds; *pIds; ++pIds )
- if( SFX_ITEM_SET == rSet.GetItemState( *pIds, sal_False, &pItem))
+ if( SFX_ITEM_SET == rSet.GetItemState( *pIds, false, &pItem))
aSet.Put( *pItem );
if( aSet.Count() )
@@ -453,7 +453,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
bool bCallDone = false;
switch ( nSlot )
{
@@ -473,7 +473,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
const SvxBoxItem& rCoreBox = (const SvxBoxItem&)
aCoreSet.Get(RES_BOX);
const SfxPoolItem *pBoxItem = 0;
- if ( pArgs->GetItemState(RES_BOX, sal_True, &pBoxItem) == SFX_ITEM_SET )
+ if ( pArgs->GetItemState(RES_BOX, true, &pBoxItem) == SFX_ITEM_SET )
{
aBox = *(SvxBoxItem*)pBoxItem;
if ( !rReq.IsAPI() )
@@ -486,9 +486,9 @@ void SwTableShell::Execute(SfxRequest &rReq)
//since the drawing layer also supports borders the which id might be a different one
SvxBoxInfoItem aInfo( SID_ATTR_BORDER_INNER );
- if (pArgs->GetItemState(SID_ATTR_BORDER_INNER, sal_True, &pBoxItem) == SFX_ITEM_SET)
+ if (pArgs->GetItemState(SID_ATTR_BORDER_INNER, true, &pBoxItem) == SFX_ITEM_SET)
aInfo = *(SvxBoxInfoItem*)pBoxItem;
- else if( pArgs->GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_True, &pBoxItem) == SFX_ITEM_SET )
+ else if( pArgs->GetItemState(SDRATTR_TABLE_BORDER_INNER, true, &pBoxItem) == SFX_ITEM_SET )
{
aInfo = *(SvxBoxInfoItem*)pBoxItem;
aInfo.SetWhich(SID_ATTR_BORDER_INNER);
@@ -666,7 +666,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState(
- SID_ATTR_NUMBERFORMAT_VALUE, sal_False, &pNumberFormatItem ))
+ SID_ATTR_NUMBERFORMAT_VALUE, false, &pNumberFormatItem ))
{
SfxItemSet aBoxFormatSet( *aCoreSet.GetPool(),
RES_BOXATR_FORMAT, RES_BOXATR_FORMAT );
@@ -824,7 +824,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if (pItem)
{
nCount = ((const SfxInt16Item* )pItem)->GetValue();
- if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_INSERT_AFTER, sal_True, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_INSERT_AFTER, true, &pItem))
bAfter = ((const SfxBoolItem* )pItem)->GetValue();
}
else if( !rReq.IsAPI() )
@@ -1420,7 +1420,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
// Always aquire the language from the current cursor position.
LanguageType eLang = rSh.GetCurLang();
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 047723733309..2c3c5e8734b3 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -95,7 +95,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
sal_uInt16 nSlot = rReq.GetSlot();
const SfxItemSet* pArgs = rReq.GetArgs();
if(pArgs)
- pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
Window *pMDI = &GetView().GetViewFrame()->GetWindow();
bool bMore = false;
@@ -213,30 +213,30 @@ void SwTextShell::ExecField(SfxRequest &rReq)
sal_Int32 nCommand = 0;
if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_TYPE,
- sal_False, &pItem ))
+ false, &pItem ))
nType = ((SfxUInt16Item *)pItem)->GetValue();
aPar1 += OUString(DB_DELIM);
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_1, sal_False, &pItem ))
+ FN_PARAM_1, false, &pItem ))
{
aPar1 += ((SfxStringItem *)pItem)->GetValue();
}
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_3, sal_False, &pItem ))
+ FN_PARAM_3, false, &pItem ))
nCommand = ((SfxInt32Item*)pItem)->GetValue();
aPar1 += OUString(DB_DELIM);
aPar1 += OUString::number(nCommand);
aPar1 += OUString(DB_DELIM);
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_2, sal_False, &pItem ))
+ FN_PARAM_2, false, &pItem ))
{
aPar1 += ((SfxStringItem *)pItem)->GetValue();
}
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_FIELD_CONTENT, sal_False, &pItem ))
+ FN_PARAM_FIELD_CONTENT, false, &pItem ))
aPar2 = ((SfxStringItem *)pItem)->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_FIELD_FORMAT, sal_False, &pItem ))
+ FN_PARAM_FIELD_FORMAT, false, &pItem ))
nFormat = ((SfxUInt32Item *)pItem)->GetValue();
OSL_FAIL("Command is not yet used");
sal_Unicode cSeparator = ' ';
@@ -260,19 +260,19 @@ void SwTextShell::ExecField(SfxRequest &rReq)
sal_Unicode cSeparator = ' ';
if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_TYPE,
- sal_False, &pItem ))
+ false, &pItem ))
nType = ((SfxUInt16Item *)pItem)->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_FIELD_SUBTYPE,
- sal_False, &pItem ))
+ false, &pItem ))
nSubType = ((SfxUInt16Item *)pItem)->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_FIELD_CONTENT, sal_False, &pItem ))
+ FN_PARAM_FIELD_CONTENT, false, &pItem ))
aPar2 = ((SfxStringItem *)pItem)->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_FIELD_FORMAT, sal_False, &pItem ))
+ FN_PARAM_FIELD_FORMAT, false, &pItem ))
nFormat = ((SfxUInt32Item *)pItem)->GetValue();
if( SFX_ITEM_SET == pArgs->GetItemState(
- FN_PARAM_3, sal_False, &pItem ))
+ FN_PARAM_3, false, &pItem ))
{
OUString sTmp = ((SfxStringItem *)pItem)->GetValue();
if(!sTmp.isEmpty())
@@ -779,7 +779,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
rSh.GetCurAttr( aSet );
const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem))
+ if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem))
{
// Select links
rSh.SwCrsrShell::SelectTxtAttr(RES_TXTATR_INETFMT, sal_False);
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index 89d02edf5190..365534a38549 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -43,7 +43,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if(pArgs)
- pArgs->GetItemState(nSlot, sal_False, &pItem );
+ pArgs->GetItemState(nSlot, false, &pItem );
switch( nSlot )
{
@@ -65,10 +65,10 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
{
OUString aGroup = (( const SfxStringItem *)pItem)->GetValue();
OUString aName;
- if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem ))
+ if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem ))
aName = (( const SfxStringItem *)pItem)->GetValue();
OUString aShortName;
- if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_2, sal_False, &pItem ))
+ if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_2, false, &pItem ))
aShortName = (( const SfxStringItem *)pItem)->GetValue();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -101,7 +101,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
{
OUString aGroup = (( const SfxStringItem *)pItem)->GetValue();
OUString aName;
- if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem ))
+ if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem ))
aName = (( const SfxStringItem *)pItem)->GetValue();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index a81641c1bfbb..2b8b4197bf57 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -47,7 +47,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(nSlot, sal_False, &pItem );
+ pArgs->GetItemState(nSlot, false, &pItem );
SfxViewFrame* pVFrame = GetView().GetViewFrame();
Window *pMDI = &pVFrame->GetWindow();
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 7a9e181c7c7f..daa0b1c4f663 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -137,7 +137,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(nSlot, sal_False, &pItem );
+ pArgs->GetItemState(nSlot, false, &pItem );
switch( nSlot )
{
@@ -479,9 +479,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if(pArgs)
{
if(FN_INSERT_FRAME_INTERACT_NOCOL != nSlot &&
- pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET)
+ pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET)
nCols = ((SfxUInt16Item *)pItem)->GetValue();
- if(pArgs->GetItemState(SID_MODIFIER, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs->GetItemState(SID_MODIFIER, false, &pItem) == SFX_ITEM_SET)
bModifier1 |= KEY_MOD1 == ((SfxUInt16Item *)pItem)->GetValue();
}
if(bModifier1 )
@@ -534,13 +534,13 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
aSize.Width() = GetShell().GetAnyCurRect(RECT_PAGE_PRT).Width();
Point aPos = aMgr.GetPos();
RndStdIds eAnchor = FLY_AT_PARA;
- if(pArgs->GetItemState(nSlot, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs->GetItemState(nSlot, false, &pItem) == SFX_ITEM_SET)
eAnchor = (RndStdIds)((SfxUInt16Item *)pItem)->GetValue();
- if(pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs->GetItemState(FN_PARAM_1, false, &pItem) == SFX_ITEM_SET)
aPos = ((SfxPointItem *)pItem)->GetValue();
- if(pArgs->GetItemState(FN_PARAM_2, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs->GetItemState(FN_PARAM_2, false, &pItem) == SFX_ITEM_SET)
aSize = ((SvxSizeItem *)pItem)->GetSize();
- if(pArgs->GetItemState(SID_ATTR_COLUMNS, sal_False, &pItem) == SFX_ITEM_SET)
+ if(pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET)
{
sal_uInt16 nCols = ((SfxUInt16Item *)pItem)->GetValue();
if( !bSingleCol && 1 < nCols )
@@ -765,7 +765,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
SvxHyperlinkItem aHLinkItem;
const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, sal_False, &pItem))
+ if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false, &pItem))
{
const SwFmtINetFmt* pINetFmt = (const SwFmtINetFmt*)pItem;
aHLinkItem.SetURL(pINetFmt->GetValue());
@@ -962,14 +962,14 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if( pArgs )
- pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), false, &pItem);
OUString aChars, aFontName;
if ( pItem )
{
aChars = ((const SfxStringItem*)pItem)->GetValue();
const SfxPoolItem* pFtItem = NULL;
- pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
+ pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), false, &pFtItem);
const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
if ( pFontItem )
aFontName = pFontItem->GetValue();
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 4be8724d0460..177bd892aa92 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -200,7 +200,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
sal_Int32 nInsert = 0;
// The old item is for unknown reasons back in the set again.
- if( !bSelectionPut && SFX_ITEM_SET == aTmpSet.GetItemState(FN_PARAM_SELECTION, sal_False, &pSelectionItem) )
+ if( !bSelectionPut && SFX_ITEM_SET == aTmpSet.GetItemState(FN_PARAM_SELECTION, false, &pSelectionItem) )
{
OUString sInsert = ((const SfxStringItem*)pSelectionItem)->GetValue();
bInsert = !sInsert.isEmpty();
@@ -276,7 +276,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
switch( nSlot )
{
case SID_LANGUAGE_STATUS:
@@ -880,7 +880,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if ( pArgs )
{
const SfxPoolItem* pPaMItem = 0;
- pArgs->GetItemState( GetPool().GetWhich( FN_PARAM_PAM ), sal_False, &pPaMItem );
+ pArgs->GetItemState( GetPool().GetWhich( FN_PARAM_PAM ), false, &pPaMItem );
if ( pPaMItem )
pPaM = static_cast< const SwPaMItem* >( pPaMItem )->GetValue( );
}
@@ -981,7 +981,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
// Apply defaults if nessecary.
pSet = (SfxItemSet*)pDlg->GetOutputItemSet();
sal_uInt16 nNewDist;
- if( SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, sal_False, &pItem ) &&
+ if( SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, false, &pItem ) &&
nDefDist != (nNewDist = ((SfxUInt16Item*)pItem)->GetValue()) )
{
SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
@@ -990,13 +990,13 @@ void SwTextShell::Execute(SfxRequest &rReq)
pSet->ClearItem( SID_ATTR_TABSTOP_DEFAULTS );
}
- if ( SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_1,sal_False,&pItem) )
+ if ( SFX_ITEM_SET == pSet->GetItemState(FN_PARAM_1,false,&pItem) )
{
pSet->Put(SfxStringItem(FN_DROP_TEXT, ((const SfxStringItem*)pItem)->GetValue()));
pSet->ClearItem(FN_PARAM_1);
}
- if( SFX_ITEM_SET == pSet->GetItemState( RES_PARATR_DROP, sal_False, &pItem ))
+ if( SFX_ITEM_SET == pSet->GetItemState( RES_PARATR_DROP, false, &pItem ))
{
OUString sCharStyleName;
if(((const SwFmtDrop*)pItem)->GetCharFmt())
@@ -1022,7 +1022,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if( pSet->Count() )
{
rWrtSh.StartAction();
- if ( SFX_ITEM_SET == pSet->GetItemState(FN_DROP_TEXT, sal_False, &pItem) )
+ if ( SFX_ITEM_SET == pSet->GetItemState(FN_DROP_TEXT, false, &pItem) )
{
if ( !((SfxStringItem*)pItem)->GetValue().isEmpty() )
rWrtSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue(), pPaM);
@@ -1243,7 +1243,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if(pItem)
sStyleName = ((const SfxStringItem*)pItem)->GetValue();
sal_Bool bOn = sal_True;
- if( SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem))
+ if( SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, false, &pItem))
bOn = ((const SfxBoolItem*)pItem)->GetValue();
rWrtSh.ChangeHeaderOrFooter(sStyleName, FN_INSERT_PAGEHEADER == nSlot, bOn, !rReq.IsAPI());
rReq.Done();
@@ -1261,7 +1261,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
case FN_SELECTION_MODE_BLOCK :
{
bool bSetBlockMode = !rWrtSh.IsBlockMode();
- if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, sal_False, &pItem))
+ if( pArgs && SFX_ITEM_SET == pArgs->GetItemState(nSlot, false, &pItem))
bSetBlockMode = ((const SfxBoolItem*)pItem)->GetValue();
if( ( nSlot == FN_SELECTION_MODE_DEFAULT ) != bSetBlockMode )
rWrtSh.EnterBlockMode();
@@ -1279,7 +1279,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
RES_TXTATR_INETFMT,
RES_TXTATR_INETFMT);
rWrtSh.GetCurAttr(aSet);
- if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, sal_True ))
+ if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true ))
{
const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, sal_True) );
if( nSlot == FN_COPY_HYPERLINK_LOCATION )
@@ -1625,7 +1625,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
RES_TXTATR_INETFMT,
RES_TXTATR_INETFMT);
rSh.GetCurAttr(aSet);
- if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, sal_True ) || rSh.HasReadonlySel())
+ if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, true ) || rSh.HasReadonlySel())
{
rSet.DisableItem(nWhich);
}
@@ -1639,7 +1639,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSh.GetCurAttr(aSet);
// If a hyperlink is selected, either alone or along with other text...
- if( ((SFX_ITEM_DONTCARE & aSet.GetItemState( RES_TXTATR_INETFMT, sal_True )) == 0) || rSh.HasReadonlySel())
+ if( ((SFX_ITEM_DONTCARE & aSet.GetItemState( RES_TXTATR_INETFMT, true )) == 0) || rSh.HasReadonlySel())
{
rSet.DisableItem(nWhich);
}
@@ -1678,7 +1678,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
RES_TXTATR_INETFMT,
RES_TXTATR_INETFMT);
rSh.GetCurAttr(aSet);
- if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, sal_False ))
+ if(SFX_ITEM_SET > aSet.GetItemState( RES_TXTATR_INETFMT, false ))
rSet.DisableItem(nWhich);
}
break;
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index 65dd2e07a1aa..ebd67d2a4d8a 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/ui/shells/textsh2.cxx
@@ -99,29 +99,29 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
const SfxPoolItem* pSelectionItem = 0;
// first get the selection of rows to be inserted
- pArgs->GetItemState(FN_DB_DATA_SELECTION_ANY, sal_False, &pSelectionItem);
+ pArgs->GetItemState(FN_DB_DATA_SELECTION_ANY, false, &pSelectionItem);
Sequence<Any> aSelection;
if(pSelectionItem)
((SfxUsrAnyItem*)pSelectionItem)->GetValue() >>= aSelection;
// get the data source name
- pArgs->GetItemState(FN_DB_DATA_SOURCE_ANY, sal_False, &pSourceItem);
+ pArgs->GetItemState(FN_DB_DATA_SOURCE_ANY, false, &pSourceItem);
if(pSourceItem)
((const SfxUsrAnyItem*)pSourceItem)->GetValue() >>= sSourceArg;
// get the command
- pArgs->GetItemState(FN_DB_DATA_COMMAND_ANY, sal_False, &pCommandItem);
+ pArgs->GetItemState(FN_DB_DATA_COMMAND_ANY, false, &pCommandItem);
if(pCommandItem)
((const SfxUsrAnyItem*)pCommandItem)->GetValue() >>= sCommandArg;
// get the command type
- pArgs->GetItemState(FN_DB_DATA_COMMAND_TYPE_ANY, sal_False, &pCommandTypeItem);
+ pArgs->GetItemState(FN_DB_DATA_COMMAND_TYPE_ANY, false, &pCommandTypeItem);
if(pCommandTypeItem)
((const SfxUsrAnyItem*)pCommandTypeItem)->GetValue() >>= nCommandTypeArg;
Reference<XConnection> xConnection;
- pArgs->GetItemState(FN_DB_CONNECTION_ANY, sal_False, &pConnectionItem);
+ pArgs->GetItemState(FN_DB_CONNECTION_ANY, false, &pConnectionItem);
if ( pConnectionItem )
((const SfxUsrAnyItem*)pConnectionItem)->GetValue() >>= xConnection;
// may be we even get no connection
@@ -135,7 +135,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
// get the cursor, we use to travel, may be NULL
Reference<XResultSet> xCursor;
- pArgs->GetItemState(FN_DB_DATA_CURSOR_ANY, sal_False, &pCursorItem);
+ pArgs->GetItemState(FN_DB_DATA_CURSOR_ANY, false, &pCursorItem);
if ( pCursorItem )
((const SfxUsrAnyItem*)pCursorItem)->GetValue() >>= xCursor;
@@ -192,8 +192,8 @@ void SwTextShell::ExecDB(SfxRequest &rReq)
const SfxPoolItem* pColumnItem = 0;
const SfxPoolItem* pColumnNameItem = 0;
- pArgs->GetItemState(FN_DB_COLUMN_ANY, sal_False, &pColumnItem);
- pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, sal_False, &pColumnNameItem);
+ pArgs->GetItemState(FN_DB_COLUMN_ANY, false, &pColumnItem);
+ pArgs->GetItemState(FN_DB_DATA_COLUMN_NAME_ANY, false, &pColumnNameItem);
OUString sColumnName;
if(pColumnNameItem)
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index c52aaa29d9df..0c1df19d6d21 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -71,7 +71,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
if(pArgs )
{
const SfxPoolItem* pItem;
- pArgs->GetItemState(nWhich, sal_False, &pItem);
+ pArgs->GetItemState(nWhich, false, &pItem);
eState = ((const SfxBoolItem &) pArgs->
Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF;
}
@@ -335,7 +335,7 @@ SET_LINESPACE:
RES_PARATR_ADJUST, RES_PARATR_ADJUST );
GetShell().GetCurAttr(aAdjustSet);
bool bChgAdjust = false;
- SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, sal_False);
+ SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, false);
if(eAdjustState >= SFX_ITEM_DEFAULT)
{
int eAdjust = (int)(( const SvxAdjustItem& )
@@ -410,7 +410,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
- pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
+ pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem);
switch ( nSlot )
{
case FN_DROP_CHAR_STYLE_NAME:
@@ -450,7 +450,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
{
rSh.StartAction();
rSh.StartUndo( UNDO_START );
- if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,sal_False,&pItem) )
+ if ( SFX_ITEM_SET == aSet.GetItemState(HINT_END,false,&pItem) )
{
if ( !((SfxStringItem*)pItem)->GetValue().isEmpty() )
rSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue());
@@ -507,7 +507,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
SfxBoolItem aFlagItem;
const SfxPoolItem* pItem = 0;
int eAdjust = -1; // Illegal value to recognize DONTCARE.
- SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, sal_False, &pItem);
+ SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, false, &pItem);
if( SFX_ITEM_DEFAULT == eState )
pItem = &rPool.GetDefaultItem(RES_PARATR_ADJUST);
@@ -515,14 +515,14 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
eAdjust = (int)(( SvxAdjustItem* ) pItem)->GetAdjust();
short nEsc = 0;
- eState = aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, sal_False, &pItem);
+ eState = aCoreSet.GetItemState(RES_CHRATR_ESCAPEMENT, false, &pItem);
if( SFX_ITEM_DEFAULT == eState )
pItem = &rPool.GetDefaultItem(RES_CHRATR_ESCAPEMENT);
if( eState >= SFX_ITEM_DEFAULT )
nEsc = ((SvxEscapementItem* )pItem)->GetEsc();
sal_uInt16 nLineSpace = 0;
- eState = aCoreSet.GetItemState(RES_PARATR_LINESPACING, sal_False, &pItem);
+ eState = aCoreSet.GetItemState(RES_PARATR_LINESPACING, false, &pItem);
if( SFX_ITEM_DEFAULT == eState )
pItem = &rPool.GetDefaultItem(RES_PARATR_LINESPACING);
if( SFX_ITEM_DEFAULT <= eState &&
@@ -671,7 +671,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
// is the item set?
sal_uInt16 nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell());
if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) &&
- aCoreSet.GetItemState( RES_FRAMEDIR, sal_False ) >= SFX_ITEM_DEFAULT)
+ aCoreSet.GetItemState( RES_FRAMEDIR, false ) >= SFX_ITEM_DEFAULT)
{
SvxFrameDirection eFrmDir = (SvxFrameDirection)
((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue();
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index 926424f3dc2c..1c0b43e1181a 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -54,9 +54,9 @@ void SwTextShell::ExecBasicMove(SfxRequest &rReq)
if(pArgs)
{
const SfxPoolItem *pItem;
- if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_COUNT, sal_True, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_COUNT, true, &pItem))
nCount = ((const SfxInt32Item *)pItem)->GetValue();
- if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_SELECTION, sal_True, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_MOVE_SELECTION, true, &pItem))
bSelect = ((const SfxBoolItem *)pItem)->GetValue();
}
switch(rReq.GetSlot())
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index f82d828b0a98..d953dc297655 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -190,7 +190,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
const SfxPoolItem* pItem;
if( RET_OK == nRet )
{
- if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState( SID_ATTR_NUMBERING_RULE, sal_False, &pItem ))
+ if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState( SID_ATTR_NUMBERING_RULE, false, &pItem ))
{
rReq.AppendItem(*pItem);
rReq.Done();
@@ -210,7 +210,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
}
// If the Dialog was leaved with OK but nothing was chosen then the
// numbering must be at least activated, if it is not already.
- else if( !pCurRule && SFX_ITEM_SET == aSet.GetItemState( SID_ATTR_NUMBERING_RULE, sal_False, &pItem ))
+ else if( !pCurRule && SFX_ITEM_SET == aSet.GetItemState( SID_ATTR_NUMBERING_RULE, false, &pItem ))
{
rReq.AppendItem( *pItem );
rReq.Done();