summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-19 21:49:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-20 08:17:00 +0100
commit12f1faf7bf7b236f54f740a9f65646749fc266ee (patch)
tree92b570339a02ac977907be12dc8e2e49291d177d /svx
parent9e183fbfdbfbe364d17f9d36a0b33d2fae89862d (diff)
svl: sal_Bool -> bool
Change-Id: Ic31455a1f5ffffa35d4fdde901dd70734207b6f4
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/dlgutil.cxx4
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/hdft.cxx18
-rw-r--r--svx/source/dialog/optgrid.cxx6
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/engine3d/float3d.cxx10
-rw-r--r--svx/source/form/fmshell.cxx6
-rw-r--r--svx/source/form/fmview.cxx2
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx4
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx2
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx2
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx2
-rw-r--r--svx/source/sdr/properties/properties.cxx6
-rw-r--r--svx/source/sidebar/nbdtmg.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdedtv.cxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx56
-rw-r--r--svx/source/svdraw/svdedxv.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdotxat.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx6
-rw-r--r--svx/source/svdraw/svdtext.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx4
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--svx/source/table/svdotable.cxx4
-rw-r--r--svx/source/table/tablecontroller.cxx30
-rw-r--r--svx/source/table/tablertfimporter.cxx2
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx6
-rw-r--r--svx/source/xoutdev/xexch.cxx2
-rw-r--r--svx/source/xoutdev/xpool.cxx2
36 files changed, 105 insertions, 105 deletions
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index bbf73cbc7d33..f7e7c1bfc304 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -32,7 +32,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
{
FieldUnit eUnit = FUNIT_INCH;
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, false, &pItem ) )
eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue();
else
{
@@ -46,7 +46,7 @@ bool GetApplyCharUnit( const SfxItemSet& rSet )
{
bool bUseCharUnit = false;
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, false, &pItem ) )
bUseCharUnit = ((const SfxBoolItem*)pItem )->GetValue();
else
{
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 1c2ae0f5b53d..1fbef2e101c4 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -876,7 +876,7 @@ void SvxFontPrevWindow::AutoCorrectFontColor( void )
static bool GetWhich (const SfxItemSet &rSet, sal_uInt16 nSlot, sal_uInt16 &rWhich)
{
- rWhich = rSet.GetPool()->GetWhich( nSlot, sal_True );
+ rWhich = rSet.GetPool()->GetWhich( nSlot, true );
return rSet.GetItemState(rWhich) >= SFX_ITEM_DEFAULT;
}
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index f911071f6728..e6a2b5306347 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -295,7 +295,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
const SfxPoolItem* pItem;
if ( SFX_ITEM_SET ==
- GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
+ GetItemSet().GetItemState( GetWhich( nId ), false, &pItem ) )
{
const SfxItemSet* _pSet;
_pSet = &( (SvxSetItem*)pItem )->GetItemSet();
@@ -339,7 +339,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
// Evaluate header-/footer- attributes
const SvxSetItem* pSetItem = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False,
+ if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), false,
(const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -423,7 +423,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
const SfxPoolItem* pItem = 0;
SfxObjectShell* pShell;
- if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) ||
( 0 != (pShell = SfxObjectShell::Current()) &&
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
@@ -558,12 +558,12 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
const SfxPoolItem* pItem;
if ( SFX_ITEM_SET ==
- GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
+ GetItemSet().GetItemState( GetWhich( nId ), false, &pItem ) )
// if there is one that is already set, then use this
pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() );
if ( SFX_ITEM_SET ==
- GetItemSet().GetItemState( nInner, sal_False, &pItem ) )
+ GetItemSet().GetItemState( nInner, false, &pItem ) )
// The set InfoItem is always required
pBBSet->Put( *pItem );
}
@@ -628,7 +628,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
{
sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
- if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
(const SvxSetItem&)rSet.Get( nWhich, sal_False );
@@ -658,7 +658,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET );
- if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
(const SvxSetItem&)rSet.Get( nWhich, sal_False );
@@ -773,7 +773,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
const SvxSetItem* pSetItem = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
- sal_False,
+ false,
(const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -813,7 +813,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
pSetItem = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
- sal_False,
+ false,
(const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 36e792e01f03..f32e662e09ef 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -222,7 +222,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pAttr = 0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false,
(const SfxPoolItem**)&pAttr ))
{
const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr;
@@ -248,7 +248,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
{
const SfxPoolItem* pAttr = NULL;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false,
(const SfxPoolItem**)&pAttr ))
{
const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr;
@@ -259,7 +259,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
// Metric Change if necessary (as TabPage is in the dialog, where the
// metric can be set
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False,
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , false,
(const SfxPoolItem**)&pAttr ))
{
const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index cd793240e921..840d0b984488 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1900,7 +1900,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
for( sal_uInt16 n = 0; n < pList->Count(); ++n )
if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) &&
SFX_ITEM_SET == aOutSet.GetItemState(
- pAItem->pItem->Which(), sal_False, &pItem ) )
+ pAItem->pItem->Which(), false, &pItem ) )
{
delete pAItem->pItem;
pAItem->pItem = pItem->Clone();
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d24bff86e9d3..f130fa823206 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -497,7 +497,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
while(nWhich)
{
- SfxItemState eState = rAttrs.GetItemState(nWhich, sal_False);
+ SfxItemState eState = rAttrs.GetItemState(nWhich, false);
if(SFX_ITEM_DONTCARE == eState)
mpRemember2DAttributes->InvalidateItem(nWhich);
else if(SFX_ITEM_SET == eState)
@@ -520,7 +520,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// Segment Number Can be changed? and other states
- SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem );
+ SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, false, &pItem );
if( SFX_ITEM_SET == eState )
{
sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
@@ -1666,12 +1666,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// set LineStyle hard to XLINE_NONE when it's not set so that
// the default (XLINE_SOLID) is not used for 3d preview
- if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, sal_False))
+ if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, false))
aSet.Put(XLineStyleItem(XLINE_NONE));
// set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
// the default (Blue7) is not used for 3d preview
- if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
+ if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false))
aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
aCtlPreview.Set3DAttributes(aSet);
@@ -1719,7 +1719,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
while(nWhich)
{
- SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, sal_False);
+ SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, false);
if(SFX_ITEM_DONTCARE == eState)
rAttrs.InvalidateItem(nWhich);
else if(SFX_ITEM_SET == eState)
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 10695b540e9d..02e1a88f9696 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -746,7 +746,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
if ( pArgs )
{
const SfxPoolItem* pItem;
- if ( ( pArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) ) == SFX_ITEM_SET )
+ if ( ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) ) == SFX_ITEM_SET )
{
const SfxInt32Item* pTypedItem = PTR_CAST( SfxInt32Item, pItem );
if ( pTypedItem )
@@ -855,7 +855,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
case SID_FM_USE_WIZARDS:
if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
- rSet.Put( SfxVisibilityItem( nWhich, sal_False ) );
+ rSet.Put( SfxVisibilityItem( nWhich, false ) );
else if (!GetFormModel())
rSet.DisableItem( nWhich );
else
@@ -878,7 +878,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
case SID_FM_DBGRID:
if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
{
- rSet.Put( SfxVisibilityItem( nWhich, sal_False ) );
+ rSet.Put( SfxVisibilityItem( nWhich, false ) );
break;
}
// NO break!
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 83c6709f3476..e1e744337888 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -123,7 +123,7 @@ void FmFormView::Init()
if ( pObjShell && pObjShell->GetMedium() )
{
const SfxPoolItem *pItem=0;
- if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET )
+ if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, false, &pItem ) == SFX_ITEM_SET )
{
::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() );
bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode );
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 240cc8c1ff87..0e58190801b1 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -397,7 +397,7 @@ namespace drawinglayer
// need to check XFillFloatTransparence, object fill may still be completely transparent
const SfxPoolItem* pGradientItem;
- if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem)
+ if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)
&& ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled())
{
const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue();
@@ -576,7 +576,7 @@ namespace drawinglayer
{
const SfxPoolItem* pGradientItem;
- if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem)
+ if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)
&& ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled())
{
// test if float transparence is completely transparent
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 3f80270cfa08..a9d047922711 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -437,7 +437,7 @@ namespace sdr
while(nWhich)
{
- if(mpItemSet->GetItemState(nWhich, sal_False) == SFX_ITEM_SET)
+ if(mpItemSet->GetItemState(nWhich, false) == SFX_ITEM_SET)
{
pNewSet->Put(mpItemSet->Get(nWhich));
}
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index ff05b6a4d87f..f4f810cc0118 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -152,7 +152,7 @@ namespace sdr
while(nWhich)
{
- if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pPoolItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false, &pPoolItem))
{
if(AllowItemChange(nWhich, pPoolItem))
{
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 5b9fbed8dd3e..830accbd501d 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -92,7 +92,7 @@ namespace sdr
// and always equal.
if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false))
{
mpItemSet->InvalidateItem(nWhich);
}
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 50ad6eb11fc6..cfd960878a12 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -92,7 +92,7 @@ namespace sdr
while(nWhich)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false))
{
mpItemSet->InvalidateItem(nWhich);
}
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index cea89d0e6248..5c4d9ab7b564 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -113,7 +113,7 @@ namespace sdr
while(nWhich)
{
- if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false, &pItem))
{
if(pItem->HasMetrics())
{
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index db7220ddb58e..a4bbb722f3ae 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -162,9 +162,9 @@ namespace sdr
void CleanupFillProperties( SfxItemSet& rItemSet )
{
- const bool bFillBitmap = rItemSet.GetItemState(XATTR_FILLBITMAP, sal_False) == SFX_ITEM_SET;
- const bool bFillGradient = rItemSet.GetItemState(XATTR_FILLGRADIENT, sal_False) == SFX_ITEM_SET;
- const bool bFillHatch = rItemSet.GetItemState(XATTR_FILLHATCH, sal_False) == SFX_ITEM_SET;
+ const bool bFillBitmap = rItemSet.GetItemState(XATTR_FILLBITMAP, false) == SFX_ITEM_SET;
+ const bool bFillGradient = rItemSet.GetItemState(XATTR_FILLGRADIENT, false) == SFX_ITEM_SET;
+ const bool bFillHatch = rItemSet.GetItemState(XATTR_FILLHATCH, false) == SFX_ITEM_SET;
if( bFillBitmap || bFillGradient || bFillHatch )
{
const XFillStyleItem* pFillStyleItem = dynamic_cast< const XFillStyleItem* >( rItemSet.GetItem(XATTR_FILLSTYLE) );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 23837d2e3808..94bd45b19881 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -246,13 +246,13 @@ void NBOTypeMgrBase::StoreMapUnit_impl() {
if ( pSet )
{
const SfxPoolItem* pItem;
- SfxItemState eState = pSet->GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = pSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState == SFX_ITEM_SET)
{
eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
} else {
//sd use different sid for numbering rule
- eState = pSet->GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem);
+ eState = pSet->GetItemState(EE_PARA_NUMBULLET, false, &pItem);
if(eState == SFX_ITEM_SET)
{
eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(EE_PARA_NUMBULLET));
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 7ddfb3b1132a..ea2a91383285 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1081,7 +1081,7 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio
bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; }
-sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
+bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
void SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 4d83567e41a4..575e2c6ac806 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -519,7 +519,7 @@ void SdrEditView::CheckPossibilities()
// may be group object, so get merged ItemSet
const SfxItemSet& rSet = pObj->GetMergedItemSet();
- SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, sal_False);
+ SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, false);
if(SFX_ITEM_DONTCARE != eState)
{
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index d1d842d8136a..83519a79b1ee 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -709,19 +709,19 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
// bReplaceAll has no effect here
Rectangle aAllSnapRect(GetMarkedObjRect());
const SfxPoolItem *pPoolItem=NULL;
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
SetRef1(Point(n,GetRef1().Y()));
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,true,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
SetRef1(Point(GetRef1().X(),n));
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,true,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
SetRef2(Point(n,GetRef2().Y()));
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,true,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
SetRef2(Point(GetRef2().X(),n));
}
@@ -730,19 +730,19 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
long nAllWdt=0; sal_Bool bAllWdt=false;
long nAllHgt=0; sal_Bool bAllHgt=false;
bool bDoIt=false;
- if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,true,&pPoolItem)==SFX_ITEM_SET) {
nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue();
bAllPosX=true; bDoIt=true;
}
- if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,true,&pPoolItem)==SFX_ITEM_SET) {
nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue();
bAllPosY=true; bDoIt=true;
}
- if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,true,&pPoolItem)==SFX_ITEM_SET) {
nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue();
bAllWdt=true; bDoIt=true;
}
- if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,true,&pPoolItem)==SFX_ITEM_SET) {
nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue();
bAllHgt=true; bDoIt=true;
}
@@ -754,23 +754,23 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
if (bAllHgt) aRect.Bottom()=aAllSnapRect.Top()+nAllHgt;
SetMarkedObjRect(aRect);
}
- if (rAttr.GetItemState(SDRATTR_RESIZEXALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_RESIZEXALL,true,&pPoolItem)==SFX_ITEM_SET) {
Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue();
ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1));
}
- if (rAttr.GetItemState(SDRATTR_RESIZEYALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_RESIZEYALL,true,&pPoolItem)==SFX_ITEM_SET) {
Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue();
ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact);
}
- if (rAttr.GetItemState(SDRATTR_ROTATEALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ROTATEALL,true,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue();
RotateMarkedObj(aAllSnapRect.Center(),nAngle);
}
- if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,true,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue();
ShearMarkedObj(aAllSnapRect.Center(),nAngle,false);
}
- if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,true,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue();
ShearMarkedObj(aAllSnapRect.Center(),nAngle,true);
}
@@ -937,12 +937,12 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr)
{
if(!bOnlyHardAttr)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false))
rAttr.InvalidateItem(nWhich);
else
rAttr.MergeValue(rSet.Get(nWhich), sal_True);
}
- else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
+ else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
rAttr.MergeValue(rItem, sal_True);
@@ -1512,21 +1512,21 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
const SfxPoolItem* pPoolItem=NULL;
// position
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,true,&pPoolItem)) {
nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left();
bChgPos=true;
}
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem)){
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,true,&pPoolItem)){
nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top();
bChgPos=true;
}
// size
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,true,&pPoolItem)) {
nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
bChgSiz=true;
bChgWdh=true;
}
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,true,&pPoolItem)) {
nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
bChgSiz=true;
bChgHgt=true;
@@ -1536,21 +1536,21 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// rotation
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,true,&pPoolItem)) {
nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle;
bRotate = (nRotateAngle != 0);
}
// position rotation point x
- if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, sal_True ,&pPoolItem))
+ if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, true ,&pPoolItem))
nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue();
// position rotation point y
- if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, sal_True ,&pPoolItem))
+ if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, true ,&pPoolItem))
nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue();
// shearing
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,true,&pPoolItem)) {
long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue();
if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR;
if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR;
@@ -1579,20 +1579,20 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// AutoGrow
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,true,&pPoolItem)) {
sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow));
bSetAttr=true;
}
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,sal_True,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,true,&pPoolItem)) {
sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow));
bSetAttr=true;
}
// corner radius
- if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,sal_True,&pPoolItem)) {
+ if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,true,&pPoolItem)) {
long nRadius=((SdrEckenradiusItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrEckenradiusItem(nRadius));
bSetAttr=true;
@@ -1670,7 +1670,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// protect position
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem))
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, true, &pPoolItem))
{
const bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue());
bool bChanged(false);
@@ -1711,7 +1711,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
if(!bMoveProtect)
{
// protect size
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem))
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, true, &pPoolItem))
{
const bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue());
bool bChanged(false);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index a869db680e14..154316a20198 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1572,7 +1572,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
while (nWhich!=0)
{
const SfxPoolItem* pItem;
- SfxItemState eState=pSet->GetItemState(nWhich,sal_False,&pItem);
+ SfxItemState eState=pSet->GetItemState(nWhich,false,&pItem);
if (eState==SFX_ITEM_SET) aSet.Put(*pItem);
nWhich=aIter.NextWhich();
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 149d0171b112..5f9993b8d855 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -585,7 +585,7 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP
bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem)
{
- SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem);
+ SfxItemState eState=rSet.GetItemState(nWhich,true,&rpItem);
if (eState==SFX_ITEM_DEFAULT) {
rpItem=&rSet.Get(nWhich);
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index b0182ad04ca1..e4514e410d54 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1842,7 +1842,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
while(nWhich)
{
- if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, sal_False, &pPoolItem))
+ if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, false, &pPoolItem))
{
const SfxPoolItem* pItem = pPoolItem;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 5a239d97392b..f06b00a526a3 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -929,7 +929,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
SdrModel* pModel = GetModel();
const SfxItemSet& rSet = pObj->GetMergedItemSet();
- if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_False))
+ if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, false))
{
// add this item, it's not yet there
XFillFloatTransparenceItem aNewItem(
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index c1562f3d6742..3961c0d0db62 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -303,7 +303,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
for(std::set<SfxStyleSheet*>::const_iterator it = aStyleSheets.begin(); it != aStyleSheets.end(); ++it) {
SfxStyleSheet* pStyle=*it;
// let StartListening see for itself if there's already a listener registered
- StartListening(*pStyle,sal_True);
+ StartListening(*pStyle,true);
}
}
}
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 8966df126bf4..0a40eba5675c 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1008,7 +1008,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*
// bReplaceAll has no effect here at all.
bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
const SfxPoolItem *pPoolItem=NULL;
- if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SFX_ITEM_SET) {
SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue();
const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId);
if (pLayer!=NULL) {
@@ -1016,7 +1016,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*
else aAktLayer=pLayer->GetName();
}
}
- if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SFX_ITEM_SET) {
if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
}
@@ -1076,7 +1076,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDo
SfxWhichIter aIter(pStyleSheet->GetItemSet());
sal_uInt16 nWhich=aIter.FirstWhich();
while (nWhich!=0) {
- if (pStyleSheet->GetItemSet().GetItemState(nWhich,sal_True)==SFX_ITEM_SET) {
+ if (pStyleSheet->GetItemSet().GetItemState(nWhich,true)==SFX_ITEM_SET) {
aDefaultAttr.ClearItem(nWhich);
}
nWhich=aIter.NextWhich();
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 781782eab705..33729927360f 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -126,7 +126,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL)
{
- bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, sal_True) == SFX_ITEM_SET;
+ bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, true) == SFX_ITEM_SET;
MapUnit aOldUnit(pOldModel->GetScaleUnit());
MapUnit aNewUnit(pNewModel->GetScaleUnit());
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 3ec558a41888..2e1ab7a01027 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -390,7 +390,7 @@ void SdrUndoAttrObj::Undo()
while(nWhich)
{
- if(SFX_ITEM_SET != pUndoSet->GetItemState(nWhich, sal_False))
+ if(SFX_ITEM_SET != pUndoSet->GetItemState(nWhich, false))
{
pObj->ClearMergedItem(nWhich);
}
@@ -467,7 +467,7 @@ void SdrUndoAttrObj::Redo()
while(nWhich)
{
- if(SFX_ITEM_SET != pRedoSet->GetItemState(nWhich, sal_False))
+ if(SFX_ITEM_SET != pRedoSet->GetItemState(nWhich, false))
{
pObj->ClearMergedItem(nWhich);
}
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 4903b0a89db8..865ac63edd8e 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1396,7 +1396,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
case OWN_ATTR_TABLEBORDER:
{
const SfxItemSet& rSet = mpProperties->GetMergedItemSet();
- if( (rSet.GetItemState( SDRATTR_TABLE_BORDER_INNER, sal_False ) == SFX_ITEM_DEFAULT) && (rSet.GetItemState( SDRATTR_TABLE_BORDER, sal_False ) == SFX_ITEM_DEFAULT) )
+ if( (rSet.GetItemState( SDRATTR_TABLE_BORDER_INNER, false ) == SFX_ITEM_DEFAULT) && (rSet.GetItemState( SDRATTR_TABLE_BORDER, false ) == SFX_ITEM_DEFAULT) )
return PropertyState_DEFAULT_VALUE;
return PropertyState_DIRECT_VALUE;
@@ -1405,7 +1405,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
{
const SfxItemSet& rSet = mpProperties->GetMergedItemSet();
- switch( rSet.GetItemState( pMap->nWID, sal_False ) )
+ switch( rSet.GetItemState( pMap->nWID, false ) )
{
case SFX_ITEM_READONLY:
case SFX_ITEM_SET:
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 3db820691fb8..b1ec03c69360 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2079,11 +2079,11 @@ WritingMode SdrTableObj::GetWritingMode() const
const SfxItemSet &rSet = pStyle->GetItemSet();
const SfxPoolItem *pItem;
- if ( rSet.GetItemState( SDRATTR_TEXTDIRECTION, sal_False, &pItem ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( SDRATTR_TEXTDIRECTION, false, &pItem ) == SFX_ITEM_SET )
eWritingMode = static_cast< WritingMode >( static_cast< const SvxWritingModeItem * >( pItem )->GetValue() );
if ( ( eWritingMode != WritingMode_TB_RL ) &&
- ( rSet.GetItemState( EE_PARA_WRITINGDIR, sal_False, &pItem ) == SFX_ITEM_SET ) )
+ ( rSet.GetItemState( EE_PARA_WRITINGDIR, false, &pItem ) == SFX_ITEM_SET ) )
{
if ( static_cast< const SvxFrameDirectionItem * >( pItem )->GetValue() == FRMDIR_HORI_LEFT_TOP )
eWritingMode = WritingMode_LR_TB;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index c4e3aa49ec8c..612e905a94c2 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -503,11 +503,11 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
if( pArgs )
{
const SfxPoolItem* pItem = 0;
- pArgs->GetItemState(nSId, sal_False, &pItem);
+ pArgs->GetItemState(nSId, false, &pItem);
if (pItem)
{
nCount = ((const SfxInt16Item* )pItem)->GetValue();
- if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, sal_True, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, true, &pItem))
bInsertAfter = ((const SfxBoolItem* )pItem)->GetValue();
}
}
@@ -852,7 +852,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0;
- if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, sal_False)) )
+ if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, false)) )
return;
const SfxStringItem* pArg = dynamic_cast< const SfxStringItem* >( &pArgs->Get( SID_TABLE_STYLE ) );
@@ -937,22 +937,22 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs )
const SfxPoolItem *pPoolItem=NULL;
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, sal_False,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, false,&pPoolItem)) )
aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, sal_False,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, false,&pPoolItem)) )
aSettings.mbUseLastRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, sal_False,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, false,&pPoolItem)) )
aSettings.mbUseRowBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, sal_False,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, false,&pPoolItem)) )
aSettings.mbUseFirstColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, sal_False,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, false,&pPoolItem)) )
aSettings.mbUseLastColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, sal_False,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, false,&pPoolItem)) )
aSettings.mbUseColumnBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
if( aSettings == pTableObj->getTableStyleSettings() )
@@ -1997,12 +1997,12 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
{
if(!bOnlyHardAttr)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false))
rAttr.InvalidateItem(nWhich);
else
rAttr.MergeValue(rSet.Get(nWhich), sal_True);
}
- else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
+ else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
rAttr.MergeValue(rItem, sal_True);
@@ -2193,19 +2193,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
if( nRowCount && nColCount )
{
const SvxBoxItem* pBoxItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, sal_False) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, false) )
pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) );
const SvxBoxInfoItem* pBoxInfoItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_False) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) )
pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) );
const SvxColorItem* pLineColorItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, sal_False) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, false) )
pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) );
const SvxBorderLine* pBorderLineItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, sal_False) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, false) )
pBorderLineItem = ((const SvxLineItem&)rAttr.Get( SID_FRAME_LINESTYLE )).GetLine();
if( pBoxInfoItem && !pBoxItem )
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 82edd54d4afc..009b71707329 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -269,7 +269,7 @@ void SdrTableRTFParser::FillTable()
if( xCell.is() && xCellInfo.get() )
{
const SfxPoolItem *pPoolItem = 0;
- if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET)
+ if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SFX_ITEM_SET)
xCell->SetMergedItem( *pPoolItem );
OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount );
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index ec7d54ecc31e..0e37a6d456d5 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -277,7 +277,7 @@ SvxColorDockingWindow::SvxColorDockingWindow
SetSize();
aColorSet.Show();
- StartListening( *_pBindings, sal_True );
+ StartListening( *_pBindings, true );
}
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index bedc10d9b97b..7a5af4c59258 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -600,7 +600,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
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/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8a78b92cbd53..0fa267c60753 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2013,7 +2013,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
case SDRATTR_CIRCSTARTANGLE:
{
const SfxPoolItem* pPoolItem=NULL;
- if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,sal_False,&pPoolItem)==SFX_ITEM_SET)
+ if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,false,&pPoolItem)==SFX_ITEM_SET)
{
sal_Int32 nAngle = ((SdrCircStartAngleItem*)pPoolItem)->GetValue();
aAny <<= nAngle;
@@ -2024,7 +2024,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
case SDRATTR_CIRCENDANGLE:
{
const SfxPoolItem* pPoolItem=NULL;
- if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,sal_False,&pPoolItem)==SFX_ITEM_SET)
+ if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,false,&pPoolItem)==SFX_ITEM_SET)
{
sal_Int32 nAngle = ((SdrCircEndAngleItem*)pPoolItem)->GetValue();
aAny <<= nAngle;
@@ -2113,7 +2113,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
{
const SfxItemSet& rSet = mpObj->GetMergedItemSet();
- switch( rSet.GetItemState( pMap->nWID, sal_False ) )
+ switch( rSet.GetItemState( pMap->nWID, false ) )
{
case SFX_ITEM_READONLY:
case SFX_ITEM_SET:
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 3df1f820f3fc..c93a647c10ab 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -63,7 +63,7 @@ SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rDat
while( nWhich )
{
- if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, false, &pItem ) )
{
VersionCompat aCompat( rOStm, STREAM_WRITE );
const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() );
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 1ac612f81ba8..2630e8b80cf0 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -166,7 +166,7 @@ XOutdevItemPool::XOutdevItemPool(
// copy ctor, clones all static defaults
XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool)
-: SfxItemPool(rPool, sal_True),
+: SfxItemPool(rPool, true),
mppLocalPoolDefaults(0L),
mpLocalItemInfos(0L)
{