summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optgdlg.cxx10
-rw-r--r--cui/source/options/optgenrl.cxx2
-rw-r--r--cui/source/options/optlingu.cxx2
-rw-r--r--cui/source/options/optmemory.cxx4
-rw-r--r--cui/source/options/optpath.cxx10
-rw-r--r--cui/source/options/treeopt.cxx30
7 files changed, 30 insertions, 30 deletions
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index f7d0d9fc19fb..ac3d5a2df736 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, false, &pItem ) == SFX_ITEM_SET )
+ if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, false, &pItem ) == SfxItemState::SET )
{
pColorConfig = (static_cast< SvxChartColorTableItem* >(pItem->Clone()) );
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b80faa3bb3cc..e6d07105012a 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_pDocStatusCB->SaveValue();
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
+ if ( SfxItemState::SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
{
m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() );
TwoFigureConfigHdl(m_pYearValueField);
@@ -1509,21 +1509,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, false, &pLang))
+ if( SfxItemState::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, false, &pLang))
+ if( SfxItemState::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, false, &pLang))
+ if( SfxItemState::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)
@@ -1568,7 +1568,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, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
+ if ( SfxItemState::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/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 7e3f8777bdc2..20303de88311 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -328,7 +328,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS);
- if (rSet->GetItemState(nWhich) == SFX_ITEM_SET)
+ if (rSet->GetItemState(nWhich) == SfxItemState::SET)
{
if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet->Get(nWhich)).GetValue())
{
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3f43ee7d3496..469b1f955a0d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1478,7 +1478,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
const SfxHyphenRegionItem *pHyp = NULL;
sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION );
- if ( rSet->GetItemState( nWhich, false ) == SFX_ITEM_SET )
+ if ( rSet->GetItemState( nWhich, false ) == SfxItemState::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 34f8a177498f..bae13c5c5fe6 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -240,9 +240,9 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet )
get())));
SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem );
- if ( SFX_ITEM_SET == eState )
+ if ( SfxItemState::SET == eState )
m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() );
- else if ( SFX_ITEM_DISABLED == eState )
+ else if ( SfxItemState::DISABLED == eState )
{
// quickstart not installed
m_pQuickStarterFrame->Hide();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 4ffc216c68a1..eb212b30701e 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -95,7 +95,7 @@ struct PathUserData_Impl
OUString sWritablePath;
PathUserData_Impl( sal_uInt16 nId ) :
- nRealId( nId ), eState( SFX_ITEM_UNKNOWN ) {}
+ nRealId( nId ), eState( SfxItemState::UNKNOWN ) {}
};
struct Handle2CfgNameMapping_Impl
@@ -269,7 +269,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* )
{
PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pPathBox->GetEntry(i)->GetUserData();
sal_uInt16 nRealId = pPathImpl->nRealId;
- if ( pPathImpl->eState == SFX_ITEM_SET )
+ if ( pPathImpl->eState == SfxItemState::SET )
SetPathList( nRealId, pPathImpl->sUserPath, pPathImpl->sWritablePath );
}
return true;
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
sWritablePath = sTemp.getToken( nOldCount - 1, MULTIPATH_DELIMITER );
pPathBox->SetEntryText( Convert_Impl( sTemp ), pEntry, 1 );
- pPathImpl->eState = SFX_ITEM_SET;
+ pPathImpl->eState = SfxItemState::SET;
pPathImpl->sUserPath = sUserPath;
pPathImpl->sWritablePath = sWritablePath;
}
@@ -503,7 +503,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
pPathBox->SetEntryText( Convert_Impl( sNewPathStr ), pEntry, 1 );
nPos = (sal_uInt16)pPathBox->GetModel()->GetAbsPos( pEntry );
pPathImpl = (PathUserData_Impl*)pPathBox->GetEntry(nPos)->GetUserData();
- pPathImpl->eState = SFX_ITEM_SET;
+ pPathImpl->eState = SfxItemState::SET;
pPathImpl->sWritablePath = sNewPathStr;
if ( SvtPathOptions::PATH_WORK == pPathImpl->nRealId )
{
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
pPathBox->SetEntryText( Convert_Impl( sFullPath ), pEntry, 1 );
// save modified flag
PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData();
- pPathImpl->eState = SFX_ITEM_SET;
+ pPathImpl->eState = SfxItemState::SET;
pPathImpl->sUserPath = sUser;
pPathImpl->sWritablePath = sWritable;
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index d5cf0e386101..ab9356619845 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1198,7 +1198,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
// miscellaneous - Year2000
- if( SFX_ITEM_DEFAULT <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) )
+ if( SfxItemState::DEFAULT <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) )
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const SfxUInt16Item*)pItem)->GetValue() ) );
else
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (sal_uInt16)aMisc.GetYear2000() ) );
@@ -1247,15 +1247,15 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
if ( pViewFrame )
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
- if(SFX_ITEM_DEFAULT <= pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
+ if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_LANGUAGE, ((const SvxLanguageItem*)pItem)->GetLanguage()));
- if(SFX_ITEM_DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
+ if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CJK_LANGUAGE, ((const SvxLanguageItem*)pItem)->GetLanguage()));
- if(SFX_ITEM_DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
+ if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CTL_LANGUAGE, ((const SvxLanguageItem*)pItem)->GetLanguage()));
pRet->Put(aHyphen);
- if(SFX_ITEM_DEFAULT <= pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem))
+ if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem))
{
pClone = pItem->Clone();
pRet->Put(*pClone);
@@ -1335,7 +1335,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, false, &pItem ) )
+ if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
nY2K = ((const SfxUInt16Item*)pItem)->GetValue();
if( USHRT_MAX != nY2K )
{
@@ -1350,10 +1350,10 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
// evaluate print
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem))
+ if(SfxItemState::SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem))
aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, false, &pItem))
+ if(SfxItemState::SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, false, &pItem))
{
const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem;
aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE ));
@@ -1400,13 +1400,13 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
bool bSaveSpellCheck = false;
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_SPELL_MODIFIED, false, &pItem ) )
+ if ( SfxItemState::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, false, &pItem ) )
+ if ( SfxItemState::SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, false, &pItem ) )
{
const SfxHyphenRegionItem* pHyphenItem = (const SfxHyphenRegionItem*)pItem;
@@ -1420,23 +1420,23 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
pItem = 0;
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem ))
+ if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = true;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem ))
+ if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = true;
}
- if(SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem ))
+ if(SfxItemState::SET == rSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE, false, &pItem ))
{
pDispatch->Execute(pItem->Which(), SFX_CALLMODE_ASYNCHRON, pItem, 0L);
bSaveSpellCheck = true;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false, &pItem ))
+ if( SfxItemState::SET == rSet.GetItemState(SID_AUTOSPELL_CHECK, false, &pItem ))
{
bool bOnlineSpelling = ((const SfxBoolItem*)pItem)->GetValue();
pDispatch->Execute(SID_AUTOSPELL_CHECK,
@@ -1453,7 +1453,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
}
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, false, &pItem ))
+ if( SfxItemState::SET == rSet.GetItemState(SID_OPT_LOCALE_CHANGED, false, &pItem ))
{
SfxViewFrame* _pViewFrame = SfxViewFrame::GetFirst();
while ( _pViewFrame )
generated by cgit (git 2.34.1) at 2024-12-23 12:59:41 +0000