summaryrefslogtreecommitdiff
path: root/cui
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 /cui
parent9e183fbfdbfbe364d17f9d36a0b33d2fae89862d (diff)
svl: sal_Bool -> bool
Change-Id: Ic31455a1f5ffffa35d4fdde901dd70734207b6f4
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/acccfg.cxx6
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx2
-rw-r--r--cui/source/dialogs/postdlg.cxx6
-rw-r--r--cui/source/dialogs/zoom.cxx2
-rw-r--r--cui/source/options/connpoolconfig.cxx4
-rw-r--r--cui/source/options/connpooloptions.cxx4
-rw-r--r--cui/source/options/dbregister.cxx2
-rw-r--r--cui/source/options/dbregisterednamesconfig.cxx2
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx10
-rw-r--r--cui/source/options/optlingu.cxx4
-rw-r--r--cui/source/options/optmemory.cxx2
-rw-r--r--cui/source/options/treeopt.cxx20
-rw-r--r--cui/source/tabpages/align.cxx8
-rw-r--r--cui/source/tabpages/backgrnd.cxx38
-rw-r--r--cui/source/tabpages/border.cxx14
-rw-r--r--cui/source/tabpages/chardlg.cxx72
-rw-r--r--cui/source/tabpages/grfpage.cxx14
-rw-r--r--cui/source/tabpages/macroass.cxx8
-rw-r--r--cui/source/tabpages/numfmt.cxx8
-rw-r--r--cui/source/tabpages/numpages.cxx62
-rw-r--r--cui/source/tabpages/page.cxx12
-rw-r--r--cui/source/tabpages/paragrph.cxx8
-rw-r--r--cui/source/tabpages/tabstpge.cxx6
-rw-r--r--cui/source/tabpages/tparea.cxx26
-rw-r--r--cui/source/tabpages/tpcolor.cxx2
-rw-r--r--cui/source/tabpages/tpgradnt.cxx4
-rw-r--r--cui/source/tabpages/tphatch.cxx4
-rw-r--r--cui/source/tabpages/tpline.cxx6
-rw-r--r--cui/source/tabpages/transfrm.cxx4
31 files changed, 182 insertions, 182 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index df3c47487ee8..4199a7580ada 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1444,7 +1444,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
RadioHdl(0);
const SfxPoolItem* pMacroItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, sal_True, &pMacroItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, true, &pMacroItem ) )
{
m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem );
pGroupLBox->SelectMacro( m_pMacroInfoItem );
@@ -1452,11 +1452,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
else
{
const SfxPoolItem* pStringItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, sal_True, &pStringItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, true, &pStringItem ) )
m_pStringItem = PTR_CAST( SfxStringItem, pStringItem );
const SfxPoolItem* pFontItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, sal_True, &pFontItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) )
m_pFontItem = PTR_CAST( SfxStringItem, pFontItem );
}
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 44acf93b834a..e81980986e99 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -62,7 +62,7 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet )
, bIDEDialogMode(false)
{
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, false, &pItem ) )
bIDEDialogMode = ((const SfxBoolItem*)pItem)->GetValue();
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 5cd21e4c2f6b..198289f8c91c 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -379,7 +379,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
{
const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ))
+ if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, false, &pItem ))
{
pHyperlinkItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() );
}
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index b32599db0d1d..e9769ab2ab08 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -73,7 +73,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
OUString aAuthorStr, aDateStr;
- if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
bNew = sal_False;
const SvxPostItAuthorItem& rAuthor =
@@ -85,7 +85,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
- if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
const SvxPostItDateItem& rDate =
(const SvxPostItDateItem&)rSet.Get( nWhich );
@@ -100,7 +100,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT );
OUString aTextStr;
- if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
const SvxPostItTextItem& rText =
(const SvxPostItTextItem&)rSet.Get( nWhich );
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 4f2de22cdef3..fc3645202f6d 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -243,7 +243,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
}
const SfxPoolItem* pViewLayoutItem = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, sal_False, &pViewLayoutItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, false, &pViewLayoutItem ) )
{
const sal_uInt16 nColumns = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->GetValue();
const bool bBookMode = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->IsBookMode();
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index d66a59577fb2..1f4a2b29cfdb 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -160,7 +160,7 @@ namespace offapp
sal_Bool bNeedCommit = sal_False;
// the global "enabled" flag
- SFX_ITEMSET_GET( _rSourceItems, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, sal_True );
+ SFX_ITEMSET_GET( _rSourceItems, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true );
if (pEnabled)
{
sal_Bool bEnabled = pEnabled->GetValue();
@@ -169,7 +169,7 @@ namespace offapp
}
// the settings for the single drivers
- SFX_ITEMSET_GET( _rSourceItems, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, sal_True );
+ SFX_ITEMSET_GET( _rSourceItems, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, true );
if (pDriverSettings)
{
OConfigurationNode aDriverSettings = aConnectionPoolRoot.openNode(getDriverSettingsNodeName());
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 988ddd85f918..d58d38de284c 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -350,14 +350,14 @@ namespace offapp
void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bFromReset*/)
{
// the enabled flag
- SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, sal_True );
+ SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true );
OSL_ENSURE(pEnabled, "ConnectionPoolOptionsPage::implInitControls: missing the Enabled item!");
m_pEnablePooling->Check(pEnabled ? pEnabled->GetValue() : sal_True);
m_pEnablePooling->SaveValue();
// the settings for the single drivers
- SFX_ITEMSET_GET( _rSet, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, sal_True );
+ SFX_ITEMSET_GET( _rSet, pDriverSettings, DriverPoolingSettingsItem, SID_SB_DRIVER_TIMEOUTS, true );
if (pDriverSettings)
m_pDriverList->Update(pDriverSettings->getSettings());
else
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 5ea23ef800c0..4ec978d07a05 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -213,7 +213,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
{
// the settings for the single drivers
- SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, sal_True );
+ SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true );
if ( !pRegistrations )
return;
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 8ecfa8d9f96e..b802ad981214 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -77,7 +77,7 @@ namespace svx
void DbRegisteredNamesConfig::SetOptions(const SfxItemSet& _rSourceItems)
{
// the settings for the single drivers
- SFX_ITEMSET_GET( _rSourceItems, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, sal_True );
+ SFX_ITEMSET_GET( _rSourceItems, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true );
if ( !pRegistrations )
return;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 313c7e135b22..a9f5ff8af34f 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -66,7 +66,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet
pColorList = XColorList::CreateStdColorList();
const SfxPoolItem* pItem = NULL;
- if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET )
+ if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) == SFX_ITEM_SET )
{
pColorConfig = (static_cast< SvxChartColorTableItem* >(pItem->Clone()) );
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 45e0d329578d..682469f5fab9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -316,7 +316,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
m_pDocStatusCB->SaveValue();
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
{
m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() );
TwoFigureConfigHdl(m_pYearValueField);
@@ -1517,21 +1517,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
m_pCurrentDocCB->Enable(true);
m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl);
const SfxPoolItem* pLang;
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, sal_False, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang)
eCurLang = eTempCurLang;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang)
eCurLangCJK = eTempCurLang;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang)
@@ -1576,7 +1576,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
// check the box "For the current document only"
// set the focus to the Western Language box
const SfxPoolItem* pLang = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
+ if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
{
m_pWesternLanguageLB->GrabFocus();
m_pCurrentDocCB->Enable(true);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 16b891b949c0..f6e2be5aedfa 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1153,7 +1153,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
const SfxSpellCheckItem* pItem = 0;
SfxItemState eItemState = rSet.GetItemState( GetWhich( SID_ATTR_SPELL ),
- sal_False, (const SfxPoolItem**)&pItem );
+ false, (const SfxPoolItem**)&pItem );
// is it about a default-item?
if ( eItemState == SFX_ITEM_DEFAULT )
@@ -1512,7 +1512,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
const SfxHyphenRegionItem *pHyp = NULL;
sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION );
- if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) );
pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND );
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 3eca0b561c59..e912183e3f3e 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -239,7 +239,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
(officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::
get())));
- SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, sal_False, &pItem );
+ SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem );
if ( SFX_ITEM_SET == eState )
m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() );
else if ( SFX_ITEM_DISABLED == eState )
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b3089e5e4054..13dc1e893fa0 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1370,7 +1370,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
// evaluate Year2000
// -------------------------------------------------------------------------
sal_uInt16 nY2K = USHRT_MAX;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
nY2K = ((const SfxUInt16Item*)pItem)->GetValue();
if( USHRT_MAX != nY2K )
{
@@ -1385,10 +1385,10 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
// -------------------------------------------------------------------------
// evaluate print
// -------------------------------------------------------------------------
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem))
aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, false, &pItem))
{
const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem;
aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE ));
@@ -1435,13 +1435,13 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
sal_Bool bSaveSpellCheck = sal_False;
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) )
{
bSaveSpellCheck = ( (const SfxBoolItem*)pItem )->GetValue();
}
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< XLinguProperties > xProp = LinguProperties::create( xContext );
- if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, false, &pItem ) )
{
const SfxHyphenRegionItem* pHyphenItem = (const SfxHyphenRegionItem*)pItem;
@@ -1455,23 +1455,23 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
pItem = 0;
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = sal_True;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = sal_True;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pItem ))
+ if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = sal_True;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, sal_False, &pItem ))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false, &pItem ))
{
sal_Bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue();
pDispatch->Execute(SID_AUTOSPELL_CHECK,
@@ -1488,7 +1488,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
}
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, sal_False, &pItem ))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, false, &pItem ))
{
SfxViewFrame* _pViewFrame = SfxViewFrame::GetFirst();
while ( _pViewFrame )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7e071631d5b8..f033a6de95e2 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -116,7 +116,7 @@ void lcl_MaybeResetAlignToDistro(
ListBox& rLB, sal_uInt16 nListPos, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichAlign, sal_uInt16 nWhichJM, _JustEnumType eBlock)
{
const SfxPoolItem* pItem;
- if (rCoreAttrs.GetItemState(nWhichAlign, sal_True, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichAlign, true, &pItem) != SFX_ITEM_SET)
// alignment not set.
return;
@@ -126,7 +126,7 @@ void lcl_MaybeResetAlignToDistro(
// alignment is not 'justify'. No need to go further.
return;
- if (rCoreAttrs.GetItemState(nWhichJM, sal_True, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichJM, true, &pItem) != SFX_ITEM_SET)
// justification method is not set.
return;
@@ -391,13 +391,13 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n
const SfxPoolItem* pItem;
SvxCellJustifyMethod eMethodOld = SVX_JUSTIFY_METHOD_AUTO;
SvxCellJustifyMethod eMethodNew = SVX_JUSTIFY_METHOD_AUTO;
- if (rOld.GetItemState(nWhich, sal_True, &pItem) == SFX_ITEM_SET)
+ if (rOld.GetItemState(nWhich, true, &pItem) == SFX_ITEM_SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
}
- if (rNew.GetItemState(nWhich, sal_True, &pItem) == SFX_ITEM_SET)
+ if (rNew.GetItemState(nWhich, true, &pItem) == SFX_ITEM_SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodNew = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index d7c54392e6e9..c7d9c9a65333 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -416,7 +416,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_HTML_MODE, sal_False, &pItem )
+ if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_HTML_MODE, false, &pItem )
|| ( 0 != ( pShell = SfxObjectShell::Current()) &&
0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
@@ -489,7 +489,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
// but it must be existing in the rSet!
// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), sal_False))
+ if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
{
ResetFromWallpaperItem( rSet );
return;
@@ -510,7 +510,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
sal_uInt16 nDestValue = USHRT_MAX;
if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION,
- sal_False, &pItem ) )
+ false, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
m_pTblLBox->SelectEntryPos(nDestValue);
@@ -529,7 +529,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
}
}
else if( SFX_ITEM_SET == rSet.GetItemState(
- SID_PARA_BACKGRND_DESTINATION, sal_False, &pItem ) )
+ SID_PARA_BACKGRND_DESTINATION, false, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
// character activated?
@@ -556,7 +556,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
nDestValue = 0;
sal_uInt16 nWhich = GetWhich( nSlot );
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
m_pBtnTile->Check();
@@ -597,21 +597,21 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
pTableBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nCellWhich = nWhich;
- if ( rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( SID_ATTR_BRUSH_ROW, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_ROW ) );
pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nRowWhich = SID_ATTR_BRUSH_ROW;
- if ( rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_TABLE ) );
pTableBck_Impl->pTableBrush = new SvxBrushItem(*pBgdAttr);
@@ -636,16 +636,16 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
pParaBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr);
}
nWhich = GetWhich( SID_ATTR_BRUSH_CHAR );
- rSet.GetItemState( nWhich, sal_True );
- rSet.GetItemState( nWhich, sal_False );
- if ( rSet.GetItemState( nWhich, sal_True ) > SFX_ITEM_AVAILABLE )
+ rSet.GetItemState( nWhich, true );
+ rSet.GetItemState( nWhich, false );
+ if ( rSet.GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE )
{
pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) );
pParaBck_Impl->pCharBrush = new SvxBrushItem(*pBgdAttr);
@@ -673,7 +673,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
sal_uInt16 nWhich = GetWhich( nSlot );
SvxBrushItem* pTemp = 0;
- if ( rSet.GetItemState( nWhich, sal_False ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
{
const CntWallpaperItem* pItem = (const CntWallpaperItem*)&rSet.Get( nWhich );
pTemp = new SvxBrushItem( *pItem, nWhich );
@@ -744,7 +744,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), sal_False))
+ if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC );
sal_Bool bModified = sal_False;
@@ -780,7 +780,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
sal_uInt16 nWhich = GetWhich( nSlot );
const SfxPoolItem* pOld = GetOldItem( rCoreSet, nSlot );
- SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, sal_False);
+ SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, false);
const SfxItemSet& rOldSet = GetItemSet();
sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue());
@@ -813,7 +813,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
bModified = sal_True;
rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
// Handle XFILL_GRADIENT -> XFILL_SOLID
XFillStyleItem aFillStyleItem(XFILL_SOLID, GetWhich(SID_SW_ATTR_FILL_STYLE));
@@ -868,7 +868,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
rCoreSet.Put(aTmpBrush);
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
}
}
@@ -1038,7 +1038,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe
aItem.SetColor( aBgdColor );
rCoreSet.Put( aItem );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
}
else
@@ -1060,7 +1060,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe
aItem.SetBitmapURL( aBgdGraphicPath );
rCoreSet.Put( aItem );
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rCoreSet.ClearItem( nWhich );
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 4696e3256493..ed31b01a8ea9 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -154,7 +154,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
/* Use SvxMarginItem instead of margins from SvxBoxItem, if present.
-> Remember this state in mbUseMarginItem, because other special handling
is needed across various functions... */
- mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),sal_True) != SFX_ITEM_UNKNOWN;
+ mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),true) != SFX_ITEM_UNKNOWN;
const SfxPoolItem* pItem = NULL;
if (rCoreAttrs.HasItem(SID_ATTR_BORDER_STYLES, &pItem))
@@ -208,7 +208,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
sal_Bool bIsDontCare = sal_True;
- if ( rCoreAttrs.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
// paragraph or table
const SvxBoxInfoItem* pBoxInfo =
@@ -418,7 +418,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
if ( pBoxInfoItem->IsDist() )
{
- if( rSet.GetItemState( nWhichBox, sal_True ) >= SFX_ITEM_DEFAULT )
+ if( rSet.GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT )
{
sal_Bool bIsAnyBorderVisible = m_pFrameSel->IsAnyBorderVisible();
if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist() )
@@ -543,7 +543,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
const SfxPoolItem* pItem;
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))))
{
@@ -590,7 +590,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
bool bPut = true;
sal_uInt16 nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER );
- sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+ sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, false );
const SfxItemSet& rOldSet = GetItemSet();
SvxBoxItem aBoxItem ( nBoxWhich );
SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich );
@@ -697,11 +697,11 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
//
bPut = true;
- if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, sal_False ))
+ if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxWhich, false ))
{
bPut = aBoxItem != (const SvxBoxItem&)(rOldSet.Get(nBoxWhich)) ? sal_True : sal_False;
}
- if( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxInfoWhich, sal_False ) )
+ if( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nBoxInfoWhich, false ) )
{
const SvxBoxInfoItem& rOldBoxInfo = (const SvxBoxInfoItem&)
rOldSet.Get(nBoxInfoWhich);
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index d2b44bb97ebc..105324056ed0 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -908,7 +908,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
bChanged = pNameBox->GetSavedValue().isEmpty();
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
( (SvxFontItem*)pItem )->GetFamilyName() != aFontItem.GetFamilyName() )
bChanged = true;
@@ -917,7 +917,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( aFontItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
rSet.ClearItem( nWhich );
@@ -953,7 +953,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
}
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
( (SvxWeightItem*)pItem )->GetValue() != aWeightItem.GetValue() )
bChanged = true;
@@ -967,7 +967,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( aWeightItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -1002,7 +1002,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
}
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
( (SvxPostureItem*)pItem )->GetValue() != aPostureItem.GetValue() )
bChanged = true;
@@ -1014,7 +1014,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( aPostureItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// FontSize
@@ -1042,7 +1042,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
bChanged = ( nSize != nSavedSize );
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET )
+ pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET )
{
float fSize = (float)nSize / 10;
long nVal = CalcToUnit( fSize, rSet.GetPool()->GetMetric( nWhich ) );
@@ -1074,7 +1074,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
}
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -1105,7 +1105,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
rSet.Put( SvxLanguageItem( eLangType, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -1327,7 +1327,7 @@ void SvxCharEffectsPage::Initialize()
// HTML-Mode
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if ( SFX_ITEM_SET == GetItemSet().GetItemState( SID_HTML_MODE, sal_False, &pItem ) ||
+ if ( SFX_ITEM_SET == GetItemSet().GetItemState( SID_HTML_MODE, false, &pItem ) ||
( NULL != ( pShell = SfxObjectShell::Current() ) &&
NULL != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) )
{
@@ -1589,7 +1589,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
bChanged = ( m_pFontColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND );
if ( !bChanged && pExampleSet &&
- pExampleSet->GetItemState( nWhich, sal_False, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET &&
+ pExampleSet->GetItemState( nWhich, false, (const SfxPoolItem**)&pItem ) == SFX_ITEM_SET &&
( (SvxColorItem*)pItem )->GetValue() != aSelectedColor )
bChanged = sal_True;
@@ -1600,7 +1600,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
rSet.Put( SvxColorItem( aSelectedColor, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -2181,7 +2181,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the underline style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxUnderlineItem& rItem = *( (const SvxUnderlineItem*)pOld );
if ( (FontUnderline)rItem.GetValue() == eUnder &&
@@ -2197,7 +2197,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( aNewItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2215,7 +2215,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the underline style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxOverlineItem& rItem = *( (const SvxOverlineItem*)pOld );
if ( (FontUnderline)rItem.GetValue() == eOver &&
@@ -2231,7 +2231,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( aNewItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2249,7 +2249,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the strikeout style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxCrossedOutItem& rItem = *( (const SvxCrossedOutItem*)pOld );
if ( !m_pStrikeoutLB->IsEnabled()
@@ -2262,7 +2262,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2287,7 +2287,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2323,7 +2323,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2347,7 +2347,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
//! changing the effect style will be allowed if a style is
//! selected in the listbox.
sal_Bool bAllowChg = LISTBOX_ENTRY_NOTFOUND != nPos &&
- SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, sal_True );
+ SFX_ITEM_DEFAULT > rOldSet.GetItemState( nWhich, true );
const SvxCaseMapItem& rItem = *( (const SvxCaseMapItem*)pOld );
if ( (SvxCaseMap)rItem.GetValue() == eCaseMap && !bAllowChg )
@@ -2359,7 +2359,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2387,7 +2387,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxContourItem*)pItem )->GetValue() )
bChanged = true;
@@ -2396,7 +2396,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2413,7 +2413,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxShadowedItem*)pItem )->GetValue() )
bChanged = true;
@@ -2422,7 +2422,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = true;
@@ -2439,7 +2439,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxBlinkItem*)pItem )->GetValue() )
bChanged = true;
@@ -2448,7 +2448,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) );
bModified = true;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// Hidden
@@ -2464,7 +2464,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
bChanged = false;
}
- if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
+ if ( !bChanged && pExampleSet && pExampleSet->GetItemState( nWhich, false, &pItem ) == SFX_ITEM_SET &&
!StateToAttr( eState ) && ( (SvxCharHiddenItem*)pItem )->GetValue() )
bChanged = true;
@@ -2473,7 +2473,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bModified |= FillItemSetColor_Impl( rSet );
@@ -3164,7 +3164,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = sal_True;
@@ -3203,7 +3203,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxKerningItem( nKerning, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
bChanged = sal_True;
@@ -3216,7 +3216,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// Scale Width
@@ -3226,7 +3226,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
// Rotation
@@ -3244,7 +3244,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( aItem );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
@@ -3490,7 +3490,7 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) );
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
CLEARTITEM;
return bModified;
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 8d8ce6f2fc7b..0c049c4a000f 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -136,7 +136,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
const SfxItemPool& rPool = *rSet.GetPool();
if(SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich(
- SID_ATTR_GRAF_KEEP_ZOOM ), sal_True, &pItem ))
+ SID_ATTR_GRAF_KEEP_ZOOM ), true, &pItem ))
{
if( ((const SfxBoolItem*)pItem)->GetValue() )
m_pZoomConstRB->Check();
@@ -146,7 +146,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
}
sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP );
- if( SFX_ITEM_SET == rSet.GetItemState( nW, sal_True, &pItem))
+ if( SFX_ITEM_SET == rSet.GetItemState( nW, true, &pItem))
{
FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -171,7 +171,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
}
nW = rPool.GetWhich( SID_ATTR_PAGE_SIZE );
- if ( SFX_ITEM_SET == rSet.GetItemState( nW, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( nW, false, &pItem ) )
{
// orientation and size from the PageItem
FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -195,7 +195,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
}
sal_Bool bFound = sal_False;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
{
OUString referer;
SfxStringItem const * it = static_cast<SfxStringItem const *>(
@@ -249,7 +249,7 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
const SfxPoolItem* pItem = 0;
if( pExSet && SFX_ITEM_SET ==
- pExSet->GetItemState( nW, sal_False, &pItem ) )
+ pExSet->GetItemState( nW, false, &pItem ) )
aSz = *(const SvxSizeItem*)pItem;
else
aSz = (const SvxSizeItem&)GetItemSet().Get( nW );
@@ -309,7 +309,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
// Size
Size aSize;
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_FRMSIZE, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_FRMSIZE, false, &pItem ) )
aSize = ((const SvxSizeItem*)pItem)->GetSize();
nOldWidth = aSize.Width();
@@ -345,7 +345,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
m_pHeightMF->SaveValue();
bInitialized = sal_True;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, sal_False, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
{
const SvxBrushItem& rBrush = *(SvxBrushItem*)pItem;
if( !rBrush.GetGraphicLink().isEmpty() &&
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e1057ca111f1..e1c9d324345a 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -178,7 +178,7 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl;
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET != GetItemSet().GetItemState( aItem.Which(), sal_True, &pItem )
+ if( SFX_ITEM_SET != GetItemSet().GetItemState( aItem.Which(), true, &pItem )
|| aItem != *(SvxMacroItem*)pItem )
{
rSet.Put( aItem );
@@ -212,7 +212,7 @@ void _SfxMacroTabPage::ActivatePage( const SfxItemSet& )
void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
{
const SfxPoolItem* pEventsItem;
- if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, sal_True, &pEventsItem ) )
+ if( !mpImpl->bGotEvents && SFX_ITEM_SET == aSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) )
{
mpImpl->bGotEvents = sal_True;
const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
@@ -227,11 +227,11 @@ void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
void _SfxMacroTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( aPageRg[0] ), sal_True, &pItem ))
+ if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( aPageRg[0] ), true, &pItem ))
aTbl = ((SvxMacroItem*)pItem)->GetMacroTable();
const SfxPoolItem* pEventsItem;
- if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet.GetItemState( SID_EVENTCONFIG, sal_True, &pEventsItem ) )
+ if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) )
{
mpImpl->bGotEvents = sal_True;
const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 64db77063e01..c3deb390a6d3 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -390,7 +390,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
double nValDouble = 0;
OUString aValString;
- SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),sal_True,&pItem);
+ SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),true,&pItem);
if(eState==SFX_ITEM_SET)
{
@@ -408,7 +408,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
}
- eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),sal_True,&pItem);
+ eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),true,&pItem);
if(eState==SFX_ITEM_SET)
{
@@ -691,7 +691,7 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
{
const SfxItemSet& rMyItemSet = GetItemSet();
sal_uInt16 nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_VALUE );
- SfxItemState eItemState = rMyItemSet.GetItemState( nWhich, sal_False );
+ SfxItemState eItemState = rMyItemSet.GetItemState( nWhich, false );
// OK chosen - Is format code input entered already taken over?
// If not, simulate Add. Upon syntax error ignore input and prevent Put.
@@ -763,7 +763,7 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
if ( m_pCbSourceFormat->IsEnabled() )
{
sal_uInt16 _nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE );
- SfxItemState _eItemState = rMyItemSet.GetItemState( _nWhich, sal_False );
+ SfxItemState _eItemState = rMyItemSet.GetItemState( _nWhich, false );
const SfxBoolItem* pBoolItem = (const SfxBoolItem*)
GetItem( rMyItemSet, SID_ATTR_NUMBERFORMAT_SOURCE );
sal_Bool bOld = (pBoolItem ? pBoolItem->GetValue() : sal_False);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index eb872e57e113..364247c36c50 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -247,12 +247,12 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
if(pExampleSet)
{
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem))
bIsPreset = ((const SfxBoolItem*)pItem)->GetValue();
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, false, &pItem))
nActNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, false, &pItem))
{
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
@@ -286,11 +286,11 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
const SfxPoolItem* pItem;
// in Draw the item exists as WhichId, in Writer only as SlotId
- SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState != SFX_ITEM_SET)
{
nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
- eState = rSet.GetItemState(nNumItemId, sal_False, &pItem);
+ eState = rSet.GetItemState(nNumItemId, false, &pItem);
if( eState != SFX_ITEM_SET )
{
@@ -407,12 +407,12 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
if(pExampleSet)
{
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem))
bIsPreset = ((const SfxBoolItem*)pItem)->GetValue();
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, false, &pItem))
nActNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, false, &pItem))
{
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
@@ -444,11 +444,11 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
// in Draw the item exists as WhichId, in Writer only as SlotId
- SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState != SFX_ITEM_SET)
{
nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
- eState = rSet.GetItemState(nNumItemId, sal_False, &pItem);
+ eState = rSet.GetItemState(nNumItemId, false, &pItem);
if( eState != SFX_ITEM_SET )
{
@@ -604,12 +604,12 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
if(pExampleSet)
{
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem))
bIsPreset = ((const SfxBoolItem*)pItem)->GetValue();
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, false, &pItem))
nActNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, false, &pItem))
{
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
@@ -641,11 +641,11 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
// in Draw the item exists as WhichId, in Writer only as SlotId
- SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState != SFX_ITEM_SET)
{
nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
- eState = rSet.GetItemState(nNumItemId, sal_False, &pItem);
+ eState = rSet.GetItemState(nNumItemId, false, &pItem);
if( eState != SFX_ITEM_SET )
{
@@ -834,12 +834,12 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
if(pExampleSet)
{
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem))
bIsPreset = ((const SfxBoolItem*)pItem)->GetValue();
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, false, &pItem))
nActNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, false, &pItem))
{
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
@@ -888,11 +888,11 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
// in Draw the item exists as WhichId, in Writer only as SlotId
- SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState != SFX_ITEM_SET)
{
nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
- eState = rSet.GetItemState(nNumItemId, sal_False, &pItem);
+ eState = rSet.GetItemState(nNumItemId, false, &pItem);
if( eState != SFX_ITEM_SET )
{
@@ -1152,12 +1152,12 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
sal_uInt16 nTmpNumLvl = USHRT_MAX;
if(pExampleSet)
{
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem))
bPreset = ((const SfxBoolItem*)pItem)->GetValue();
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, false, &pItem))
nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, false, &pItem))
{
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
@@ -1209,11 +1209,11 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
// in Draw the item exists as WhichId, in Writer only as SlotId
- SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState != SFX_ITEM_SET)
{
nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
- eState = rSet.GetItemState(nNumItemId, sal_False, &pItem);
+ eState = rSet.GetItemState(nNumItemId, false, &pItem);
if( eState != SFX_ITEM_SET )
{
@@ -1293,7 +1293,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
}
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 ) ) ) )
{
@@ -2909,12 +2909,12 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
if(pExampleSet)
{
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem))
bPreset = ((const SfxBoolItem*)pItem)->GetValue();
- if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, sal_False, &pItem))
+ if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, false, &pItem))
nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
}
- if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, sal_False, &pItem))
+ if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, false, &pItem))
{
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
@@ -2977,11 +2977,11 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
// in Draw the item exists as WhichId, in Writer only as SlotId
- SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
+ SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem);
if(eState != SFX_ITEM_SET)
{
nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
- eState = rSet.GetItemState(nNumItemId, sal_False, &pItem);
+ eState = rSet.GetItemState(nNumItemId, false, &pItem);
if( eState != SFX_ITEM_SET )
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index d801568b801a..4134358200de 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -238,7 +238,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
const SfxPoolItem* pItem;
SfxObjectShell* pShell;
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_HTML_MODE, false, &pItem) ||
( 0 != (pShell = SfxObjectShell::Current()) &&
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
bWeb = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON);
@@ -637,7 +637,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
}
SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_FRAMEDIRECTION ),
- sal_True, &pItem );
+ true, &pItem );
if( SFX_ITEM_UNKNOWN != eState )
{
sal_uInt32 nVal = SFX_ITEM_SET == eState
@@ -1181,7 +1181,7 @@ void SvxPageDescPage::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 );
@@ -1212,7 +1212,7 @@ void SvxPageDescPage::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 );
@@ -1279,7 +1279,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET ==
rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
- sal_False, (const SfxPoolItem**)&pSetItem ) )
+ false, (const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
const SfxBoolItem& rHeaderOn =
@@ -1326,7 +1326,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET ==
rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
- sal_False, (const SfxPoolItem**)&pSetItem ) )
+ false, (const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
const SfxBoolItem& rFooterOn =
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index f3189681bc9b..841d64f76ba8 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -145,7 +145,7 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet)
sal_uInt16 nHtmlMode = 0;
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))))
{
@@ -391,7 +391,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
rOutSet.Put(*pRegItem);
bModified = sal_True;
}
- else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, sal_False ) )
+ else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, false ) )
rOutSet.ClearItem(_nWhich);
delete pRegItem;
}
@@ -1407,7 +1407,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
else
{
eState = m_pPageBreakBox->GetState();
- SfxItemState eModelState = GetItemSet().GetItemState(SID_ATTR_PARA_MODEL, sal_False);
+ SfxItemState eModelState = GetItemSet().GetItemState(SID_ATTR_PARA_MODEL, false);
if ( (eModelState == SFX_ITEM_SET && STATE_CHECK == m_pPageBreakBox->GetState()) ||
eState != m_pPageBreakBox->GetSavedValue() ||
@@ -2184,7 +2184,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, CheckBox& rBox)
{
sal_uInt16 _nWhich = rSet.GetPool()->GetWhich(nSlotId);
- SfxItemState eState = rSet.GetItemState(_nWhich, sal_True);
+ SfxItemState eState = rSet.GetItemState(_nWhich, true);
if(!eState || eState == SFX_ITEM_DISABLED )
rBox.Enable(false);
else if(eState >= SFX_ITEM_AVAILABLE)
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index cf9ea87d6aaa..8e3b90ada452 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -223,7 +223,7 @@ sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
// the TabStopItem needs to have a DefTab at position 0.
const SfxPoolItem* pLRSpace;
// If not in the new set, then maybe in the old one
- if ( SFX_ITEM_SET != rSet.GetItemState( GetWhich( SID_ATTR_LRSPACE ), sal_True, &pLRSpace ) )
+ if ( SFX_ITEM_SET != rSet.GetItemState( GetWhich( SID_ATTR_LRSPACE ), true, &pLRSpace ) )
pLRSpace = GetOldItem( rSet, SID_ATTR_LRSPACE );
if ( pLRSpace && ( (SvxLRSpaceItem*)pLRSpace )->GetTxtFirstLineOfst() < 0 )
@@ -375,7 +375,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
long nOffset = 0;
const SfxPoolItem* pItem = 0;
- if ( GetItemSet().GetItemState( SID_ATTR_TABSTOP_OFFSET, sal_True, &pItem )
+ if ( GetItemSet().GetItemState( SID_ATTR_TABSTOP_OFFSET, true, &pItem )
== SFX_ITEM_SET )
{
nOffset = ( (const SfxInt32Item*)pItem )->GetValue();
@@ -485,7 +485,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
long nOffset = 0;
const SfxPoolItem* pItem = 0;
- if ( GetItemSet().GetItemState( SID_ATTR_TABSTOP_OFFSET, sal_True, &pItem ) ==
+ if ( GetItemSet().GetItemState( SID_ATTR_TABSTOP_OFFSET, true, &pItem ) ==
SFX_ITEM_SET )
{
nOffset = ( (const SfxInt32Item*)pItem )->GetValue();
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index b0397f3b0066..7560d1f7fb01 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -297,8 +297,8 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
{
const SfxPoolItem* pGradientItem = NULL;
const SfxPoolItem* pLinearItem = NULL;
- SfxItemState eStateGradient(rOutAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem));
- SfxItemState eStateLinear(rOutAttrs.GetItemState(XATTR_FILLTRANSPARENCE, sal_True, &pLinearItem));
+ SfxItemState eStateGradient(rOutAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem));
+ SfxItemState eStateLinear(rOutAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem));
sal_Bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled());
sal_Bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0);
@@ -399,13 +399,13 @@ sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs)
{
const SfxPoolItem* pGradientItem = NULL;
- SfxItemState eStateGradient(rAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem));
+ SfxItemState eStateGradient(rAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem));
if(!pGradientItem)
pGradientItem = &rAttrs.Get(XATTR_FILLFLOATTRANSPARENCE);
sal_Bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled());
const SfxPoolItem* pLinearItem = NULL;
- SfxItemState eStateLinear(rAttrs.GetItemState(XATTR_FILLTRANSPARENCE, sal_True, &pLinearItem));
+ SfxItemState eStateLinear(rAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem));
if(!pLinearItem)
pLinearItem = &rAttrs.Get(XATTR_FILLTRANSPARENCE);
sal_Bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0);
@@ -1010,7 +1010,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
// NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
- SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True ) ) )
+ SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_SOLID );
pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
@@ -1041,7 +1041,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
// NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
- SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True ) ) )
+ SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_GRADIENT );
pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
@@ -1087,7 +1087,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
// NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
- SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True ) ) )
+ SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_HATCH );
pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
@@ -1118,7 +1118,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
// NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
- SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True ) ) )
+ SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_BITMAP );
pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
@@ -1824,7 +1824,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
rXFSet.Put( XFillColorItem( OUString(), m_pLbColor->GetSelectEntryColor() ) );
}
// NEW
- else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) )
+ else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
{
rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() );
@@ -1896,7 +1896,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
rXFSet.Put( XFillGradientItem( OUString(), pEntry->GetGradient() ) );
}
- else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) )
+ else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true, &pPoolItem ) )
{
rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
rXFSet.Put( XFillGradientItem( OUString(), ( ( const XFillGradientItem* ) pPoolItem )->GetGradientValue() ) );
@@ -1967,7 +1967,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl)
rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
rXFSet.Put( XFillHatchItem( OUString(), pEntry->GetHatch() ) );
}
- else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) )
+ else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true, &pPoolItem ) )
{
rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
rXFSet.Put( XFillHatchItem( OUString(), ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() ) );
@@ -1992,7 +1992,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl)
{
rXFSet.Put( XFillColorItem( OUString(), m_pLbHatchBckgrdColor->GetSelectEntryColor() ) );
}
- else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) )
+ else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
{
Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue() );
rXFSet.Put( XFillColorItem( OUString(), aColor ) );
@@ -2094,7 +2094,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
rXFSet.Put(XFillBitmapItem(OUString(), pEntry->GetGraphicObject()));
}
- else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), sal_True, &pPoolItem ) )
+ else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true, &pPoolItem ) )
{
rXFSet.Put(XFillStyleItem(XFILL_BITMAP));
rXFSet.Put(XFillBitmapItem(OUString(), ((const XFillBitmapItem*)pPoolItem)->GetGraphicObject()));
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 3fd17d47f8d6..b5b3aff04649 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -437,7 +437,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
else if( *pPageType == PT_COLOR && *pPos == LISTBOX_ENTRY_NOTFOUND )
{
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
{
m_pLbColorModel->SelectEntryPos( CM_RGB );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 81bdb6806c13..a2bc8d7f787a 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -776,10 +776,10 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
else
{
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), sal_True, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
{
if( ( XFILL_GRADIENT == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
- ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), sal_True, &pPoolItem ) ) )
+ ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true, &pPoolItem ) ) )
{
pGradient = new XGradient( ( ( const XFillGradientItem* ) pPoolItem )->GetGradientValue() );
}
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index fd1a854f3917..6144adef2066 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -390,10 +390,10 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
else
{
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), sal_True, &pPoolItem ) )
+ if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLSTYLE ), true, &pPoolItem ) )
{
if( ( XFILL_HATCH == (XFillStyle) ( ( const XFillStyleItem* ) pPoolItem )->GetValue() ) &&
- ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), sal_True, &pPoolItem ) ) )
+ ( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true, &pPoolItem ) ) )
{
pHatch = new XHatch( ( ( const XFillHatchItem* ) pPoolItem )->GetHatchValue() );
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index bc0de1457db3..70ecfa999c5c 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1094,7 +1094,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
sal_Bool bEnable=sal_True;
sal_Bool bIgnoreGraphic=sal_False;
sal_Bool bIgnoreSize=sal_False;
- if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),sal_True,&pPoolItem) == SFX_ITEM_SET)
+ if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),true,&pPoolItem) == SFX_ITEM_SET)
{
nSymType=((const SfxInt32Item *)pPoolItem)->GetValue();
}
@@ -1176,7 +1176,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
delete pView;
delete pModel;
}
- if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),sal_True,&pPoolItem) == SFX_ITEM_SET)
+ if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),true,&pPoolItem) == SFX_ITEM_SET)
{
const Graphic* pGraphic = ((const SvxBrushItem *)pPoolItem)->GetGraphic();
if( pGraphic )
@@ -1195,7 +1195,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
}
}
- if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),sal_True,&pPoolItem) == SFX_ITEM_SET)
+ if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),true,&pPoolItem) == SFX_ITEM_SET)
{
aSymbolSize = ((const SvxSizeItem *)pPoolItem)->GetSize();
}
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index a02d54e8035d..88334ca8de50 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -590,7 +590,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
{
SfxRectangleItem* pRectItem = NULL;
- if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , sal_False, (const SfxPoolItem**) &pRectItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, (const SfxPoolItem**) &pRectItem ) )
{
const Rectangle aTempRect(pRectItem->GetValue());
maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
@@ -1031,7 +1031,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
{
SfxRectangleItem* pRectItem = NULL;
- if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , sal_False, (const SfxPoolItem**) &pRectItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, (const SfxPoolItem**) &pRectItem ) )
{
{ // #i75273#
const Rectangle aTempRect(pRectItem->GetValue());