summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/config/optload.cxx10
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/fldpage.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx10
-rw-r--r--sw/source/ui/fldui/fldvar.cxx42
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx4
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/frmdlg/cption.cxx14
-rw-r--r--sw/source/ui/index/cnttab.cxx12
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx14
11 files changed, 57 insertions, 57 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 49537401187f..25431a1111cc 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -477,7 +477,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
{
for ( auto i = pMgr->GetFieldTypeCount(); i; )
{
- SwFieldType* pFieldType = pMgr->GetFieldType(USHRT_MAX, --i);
+ SwFieldType* pFieldType = pMgr->GetFieldType(SwFieldIds::Unknown, --i);
if (!pFieldType->GetName().isEmpty()
&& pFieldType->GetName().equals(m_pCategoryBox->GetText()))
{
@@ -508,7 +508,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
if (pSh)
{
SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType(
- RES_SETEXPFLD, m_pCategoryBox->GetText() ));
+ SwFieldIds::SetExp, m_pCategoryBox->GetText() ));
if( pFieldType )
{
sDelim = pFieldType->GetDelimiter();
@@ -699,8 +699,8 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void)
for (size_t i = 0; i < nCount; ++i)
{
- SwFieldType *pType = pMgr->GetFieldType( USHRT_MAX, i );
- if( pType->Which() == RES_SETEXPFLD &&
+ SwFieldType *pType = pMgr->GetFieldType( SwFieldIds::Unknown, i );
+ if( pType->Which() == SwFieldIds::SetExp &&
static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
m_pCategoryBox->InsertSwEntry(pType->GetName());
}
@@ -881,7 +881,7 @@ void SwCaptionOptPage::InvalidatePreview()
if (pSh)
{
SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(pMgr->GetFieldType(
- RES_SETEXPFLD, m_pCategoryBox->GetText() ));
+ SwFieldIds::SetExp, m_pCategoryBox->GetText() ));
if( pFieldType && pFieldType->GetOutlineLvl() < MAXLEVEL )
{
sal_uInt8 nLvl = pFieldType->GetOutlineLvl();
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 8a0a68a6674a..91d0ba84fb7a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1265,7 +1265,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale();
SwDBNextSetField aNxtDBField( static_cast<SwDBNextSetFieldType*>(rSh.
- GetFieldType( 0, RES_DBNEXTSETFLD )),
+ GetFieldType( 0, SwFieldIds::DbNextSet )),
"1", "", aDBData );
bool bSetCursor = true;
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index c1d4855f4d02..91b522028082 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -53,7 +53,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r
m_pNextPB->Show();
m_pNextPB->SetClickHdl(aButtonLk);
}
- if( RES_DROPDOWN == pField->GetTyp()->Which() )
+ if( SwFieldIds::Dropdown == pField->GetTyp()->Which() )
{
pDropField = static_cast<SwDropDownField*>(pField);
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 9b0d039ee667..a0dedb4dca83 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -237,7 +237,7 @@ void SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS
case TYP_INPUTFLD:
{
// User- or SetField ?
- if (m_aMgr.GetFieldType(RES_USERFLD, sPar1) == nullptr &&
+ if (m_aMgr.GetFieldType(SwFieldIds::User, sPar1) == nullptr &&
!(pTmpField->GetSubType() & INP_TXT)) // SETEXPFLD
{
SwSetExpField* pField = static_cast<SwSetExpField*>(pTmpField);
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 83356a0e9e7a..91c71bc888ad 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -215,13 +215,13 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
if (!pSh)
return;
- const size_t nFieldTypeCnt = pSh->GetFieldTypeCount(RES_SETEXPFLD);
+ const size_t nFieldTypeCnt = pSh->GetFieldTypeCount(SwFieldIds::SetExp);
OSL_ENSURE( nFieldTypeCnt < static_cast<size_t>(REFFLDFLAG), "<SwFieldRefPage::Reset> - Item index will overlap flags!" );
for (size_t n = 0; n < nFieldTypeCnt; ++n)
{
- SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(n, RES_SETEXPFLD));
+ SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(n, SwFieldIds::SetExp));
if ((nsSwGetSetExpType::GSE_SEQ & pType->GetType()) && pType->HasWriterListeners() && pSh->IsUsed(*pType))
{
@@ -647,7 +647,7 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString)
// get the fields to Seq-FieldType:
SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(
- nTypeId & ~REFFLDFLAG, RES_SETEXPFLD ));
+ nTypeId & ~REFFLDFLAG, SwFieldIds::SetExp ));
if( pType )
{
SwSeqFieldList aArr;
@@ -866,7 +866,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
case TYP_SETREFFLD:
{
- SwFieldType* pType = GetFieldMgr().GetFieldType(RES_SETEXPFLD, aName);
+ SwFieldType* pType = GetFieldMgr().GetFieldType(SwFieldIds::SetExp, aName);
if(!pType) // Only insert when the name doesn't exist yet
{
@@ -981,7 +981,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
{
// get fields for Seq-FieldType:
SwSetExpFieldType* pType = static_cast<SwSetExpFieldType*>(pSh->GetFieldType(
- nTypeId & ~REFFLDFLAG, RES_SETEXPFLD ));
+ nTypeId & ~REFFLDFLAG, SwFieldIds::SetExp ));
if( pType )
{
SwSeqFieldList aArr;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 3c3cbac9839a..ada5795548c3 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -280,7 +280,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
{
// change or create user type
SwUserFieldType* pType = static_cast<SwUserFieldType*>(
- GetFieldMgr().GetFieldType(RES_USERFLD, nSelData));
+ GetFieldMgr().GetFieldType(SwFieldIds::User, nSelData));
if (pType)
{
@@ -346,7 +346,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
if(pSh)
{
SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
- pSh->GetFieldType(RES_SETEXPFLD, sName));
+ pSh->GetFieldType(SwFieldIds::SetExp, sName));
if (pSetTyp && pSetTyp->GetType() == nsSwGetSetExpType::GSE_STRING)
m_pNumFormatLB->SelectEntryPos(0); // textual
@@ -396,7 +396,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
if(pSh)
{
SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
- pSh->GetFieldType(RES_SETEXPFLD, sName));
+ pSh->GetFieldType(SwFieldIds::SetExp, sName));
if(pSetTyp)
{
@@ -428,13 +428,13 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
// User- or SetField ?
const sal_uInt16 nInpType = static_cast< sal_uInt16 >
- (GetFieldMgr().GetFieldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD);
+ (GetFieldMgr().GetFieldType(SwFieldIds::User, sName) ? 0 : TYP_SETINPFLD);
if (nInpType) // SETEXPFLD
{
// is there a corresponding SetField
SwSetExpFieldType* pSetTyp = static_cast<SwSetExpFieldType*>(
- GetFieldMgr().GetFieldType(RES_SETEXPFLD, sName));
+ GetFieldMgr().GetFieldType(SwFieldIds::SetExp, sName));
if(pSetTyp)
{
@@ -463,7 +463,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
SwDDEFieldType* pType =
- static_cast<SwDDEFieldType*>( GetFieldMgr().GetFieldType(RES_DDEFLD, nSelData) );
+ static_cast<SwDDEFieldType*>( GetFieldMgr().GetFieldType(SwFieldIds::Dde, nSelData) );
if(pType)
{
@@ -495,7 +495,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
{
OUString sFieldTypeName( m_pSelectionLB->GetEntry( nSelPos ));
if( !sFieldTypeName.isEmpty() )
- pFieldTyp = GetFieldMgr().GetFieldType( RES_SETEXPFLD,
+ pFieldTyp = GetFieldMgr().GetFieldType( SwFieldIds::SetExp,
sFieldTypeName );
else
pFieldTyp = nullptr;
@@ -865,7 +865,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void)
// is there already a corresponding type
bInsert = bApply = true;
- SwFieldType* pType = GetFieldMgr().GetFieldType(RES_DDEFLD, sName);
+ SwFieldType* pType = GetFieldMgr().GetFieldType(SwFieldIds::Dde, sName);
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
@@ -879,7 +879,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void)
if( nLen )
{
// is there already a corresponding type
- SwFieldType* pType = GetFieldMgr().GetFieldType(RES_USERFLD, sName);
+ SwFieldType* pType = GetFieldMgr().GetFieldType(SwFieldIds::User, sName);
SwWrtShell *pSh = GetWrtShell();
if(!pSh)
@@ -887,7 +887,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void)
if(pSh && pType)
bDelete = !pSh->IsUsed( *pType );
- pType = GetFieldMgr().GetFieldType(RES_SETEXPFLD, sName);
+ pType = GetFieldMgr().GetFieldType(SwFieldIds::SetExp, sName);
if (!pType) // no name conflict with variables
{
// user fields can also be inserted without content!
@@ -903,7 +903,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void)
if (nTypeId == TYP_SETFLD || nTypeId == TYP_SEQFLD)
{
SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(
- GetFieldMgr().GetFieldType(RES_SETEXPFLD, sName));
+ GetFieldMgr().GetFieldType(SwFieldIds::SetExp, sName));
if (pFieldType)
{
@@ -933,7 +933,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void)
bInsert = false;
}
}
- if (GetFieldMgr().GetFieldType(RES_USERFLD, sName))
+ if (GetFieldMgr().GetFieldType(SwFieldIds::User, sName))
bInsert = false;
}
@@ -961,19 +961,19 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
if (nCurId == m_nDeleteId)
{
if( nTypeId == TYP_USERFLD )
- GetFieldMgr().RemoveFieldType(RES_USERFLD, m_pSelectionLB->GetSelectEntry());
+ GetFieldMgr().RemoveFieldType(SwFieldIds::User, m_pSelectionLB->GetSelectEntry());
else
{
- sal_uInt16 nWhich;
+ SwFieldIds nWhich;
switch(nTypeId)
{
case TYP_SETFLD:
case TYP_SEQFLD:
- nWhich = RES_SETEXPFLD;
+ nWhich = SwFieldIds::SetExp;
break;
default:
- nWhich = RES_DDEFLD;
+ nWhich = SwFieldIds::Dde;
break;
}
@@ -993,14 +993,14 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
{
OUString sName(m_pNameED->GetText()), sValue(m_pValueED->GetText());
SwFieldType* pType = nullptr;
- sal_uInt16 nId = 0;
+ SwFieldIds nId = SwFieldIds::Database;
sal_Int32 nNumFormatPos = m_pNumFormatLB->GetSelectEntryPos();
switch (nTypeId)
{
- case TYP_USERFLD: nId = RES_USERFLD; break;
- case TYP_DDEFLD: nId = RES_DDEFLD; break;
- case TYP_SETFLD: nId = RES_SETEXPFLD;break;
+ case TYP_USERFLD: nId = SwFieldIds::User; break;
+ case TYP_DDEFLD: nId = SwFieldIds::Dde; break;
+ case TYP_SETFLD: nId = SwFieldIds::SetExp;break;
}
pType = GetFieldMgr().GetFieldType(nId, sName);
@@ -1182,7 +1182,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
}
case TYP_INPUTFLD:
{
- SwFieldType* pType = GetFieldMgr().GetFieldType(RES_USERFLD, aName);
+ SwFieldType* pType = GetFieldMgr().GetFieldType(SwFieldIds::User, aName);
nSubType = static_cast< sal_uInt16 >((nSubType & 0xff00) | ((pType) ? INP_USR : INP_VAR));
break;
}
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 553e472ea344..6c7a02f58f66 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -58,7 +58,7 @@ SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
// evaluation here
OUString aStr;
- if( RES_INPUTFLD == pField->GetTyp()->Which() )
+ if( SwFieldIds::Input == pField->GetTyp()->Which() )
{ // it is an input field
pInpField = static_cast<SwInputField*>(pField);
@@ -74,7 +74,7 @@ SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
case INP_USR:
// user field
if( nullptr != ( pUsrType = static_cast<SwUserFieldType*>(rSh.GetFieldType(
- RES_USERFLD, pInpField->GetPar1() ) ) ) )
+ SwFieldIds::User, pInpField->GetPar1() ) ) ) )
aStr = pUsrType->GetContent();
break;
}
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 4cd62dbe2b7c..f409f253da17 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -75,7 +75,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
pMgr = new SwFieldMgr(pSh);
pField = static_cast<SwScriptField*>(pMgr->GetCurField());
- bNew = !(pField && pField->GetTyp()->Which() == RES_SCRIPTFLD);
+ bNew = !(pField && pField->GetTyp()->Which() == SwFieldIds::Script);
CheckTravel();
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ae9cf890278e..5fe1cd7b8c85 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -145,8 +145,8 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
size_t nCount = pMgr->GetFieldTypeCount();
for (size_t i = 0; i < nCount; ++i)
{
- SwFieldType *pType = pMgr->GetFieldType( USHRT_MAX, i );
- if( pType->Which() == RES_SETEXPFLD &&
+ SwFieldType *pType = pMgr->GetFieldType( SwFieldIds::Unknown, i );
+ if( pType->Which() == SwFieldIds::SetExp &&
static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
m_pCategoryBox->InsertEntry(pType->GetName());
}
@@ -207,7 +207,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
nCount = pMgr->GetFieldTypeCount();
for ( size_t i = nCount; i; )
{
- SwFieldType* pFieldType = pMgr->GetFieldType(USHRT_MAX, --i);
+ SwFieldType* pFieldType = pMgr->GetFieldType(SwFieldIds::Unknown, --i);
if( pFieldType->GetName().equals(m_pCategoryBox->GetText()) )
{
nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat();
@@ -317,7 +317,7 @@ IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl, Edit&, void)
bool bCorrectFieldName = !sFieldTypeName.isEmpty();
bool bNone = sFieldTypeName == m_sNone;
SwFieldType* pType = (bCorrectFieldName && !bNone)
- ? rSh.GetFieldType( RES_SETEXPFLD, sFieldTypeName )
+ ? rSh.GetFieldType( SwFieldIds::SetExp, sFieldTypeName )
: nullptr;
m_pOKButton->Enable( bCorrectFieldName &&
(!pType ||
@@ -363,7 +363,7 @@ void SwCaptionDialog::DrawSample()
SwWrtShell &rSh = rView.GetWrtShell();
SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType(
- RES_SETEXPFLD, sFieldTypeName ));
+ SwFieldIds::SetExp, sFieldTypeName ));
if( pFieldType && pFieldType->GetOutlineLvl() < MAXLEVEL )
{
SwNumberTree::tNumberVector aNumVector;
@@ -448,7 +448,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV
m_pLbLevel->InsertEntry( OUString::number(n+1) );
SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType(
- RES_SETEXPFLD, aFieldTypeName ));
+ SwFieldIds::SetExp, aFieldTypeName ));
sal_Unicode nLvl = MAXLEVEL;
OUString sDelim(": ");
@@ -486,7 +486,7 @@ void SwSequenceOptionDialog::Apply()
{
SwWrtShell &rSh = rView.GetWrtShell();
SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType(
- RES_SETEXPFLD, aFieldTypeName ));
+ SwFieldIds::SetExp, aFieldTypeName ));
sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectEntryPos() - 1);
sal_Unicode cDelim = m_pEdDelim->GetText()[0];
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 66a8e0129fca..100e75914084 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -280,7 +280,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
if(TOX_AUTHORITIES == eCurrentTOXType.eType)
{
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
+ rSh.GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr));
if(pFType)
{
OUString sBrackets;
@@ -428,7 +428,7 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
if(TOX_AUTHORITIES == eType.eType)
{
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
+ rSh.GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr));
if(pFType)
{
pDescArr[nIndex]->SetAuthBrackets(OUStringLiteral1(pFType->GetPrefix()) +
@@ -1268,11 +1268,11 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* )
m_pFromFileCB->Check( !sAutoMarkURL.isEmpty() );
m_pCaptionSequenceLB->Clear();
- const size_t nCount = rSh.GetFieldTypeCount(RES_SETEXPFLD);
+ const size_t nCount = rSh.GetFieldTypeCount(SwFieldIds::SetExp);
for (size_t i = 0; i < nCount; ++i)
{
- SwFieldType *pType = rSh.GetFieldType( i, RES_SETEXPFLD );
- if( pType->Which() == RES_SETEXPFLD &&
+ SwFieldType *pType = rSh.GetFieldType( i, SwFieldIds::SetExp );
+ if( pType->Which() == SwFieldIds::SetExp &&
static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
m_pCaptionSequenceLB->InsertEntry(pType->GetName());
}
@@ -2095,7 +2095,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
{
SwWrtShell& rSh = pTOXDlg->GetWrtShell();
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
+ rSh.GetFieldType(SwFieldIds::TableOfAuthorities, aEmptyOUStr));
if(pFType)
{
if(pFType->IsSortByDocument())
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index fd79226e02ab..666e6450d459 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1188,7 +1188,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void)
if(!sEntry.isEmpty())
{
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- pSh->GetFieldType(RES_AUTHORITY, OUString()));
+ pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : nullptr;
for(int i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = pEntry ?
@@ -1214,7 +1214,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl, Button*, void)
OSL_ENSURE(!m_sFields[AUTH_FIELD_AUTHORITY_TYPE].isEmpty() , "No authority type is set!");
//check if the entry already exists with different content
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- pSh->GetFieldType(RES_AUTHORITY, OUString()));
+ pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
const SwAuthEntry* pEntry = pFType ?
pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER])
: nullptr;
@@ -1347,7 +1347,7 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void)
else
{
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- pSh->GetFieldType(RES_AUTHORITY, OUString()));
+ pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
if(pFType)
{
std::vector<OUString> aIds;
@@ -1386,7 +1386,7 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit, bool)
else if(bIsFromComponent)
{
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- pSh->GetFieldType(RES_AUTHORITY, OUString()));
+ pSh->GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
bAllowed = !pFType || !pFType->GetEntryByIdentifier(sEntry);
}
else
@@ -1410,7 +1410,7 @@ void SwAuthorMarkPane::InitControls()
for(int i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = m_sCreatedEntry[i];
}
- if(bNewEntry || !pField || pField->GetTyp()->Which() != RES_AUTHORITY)
+ if(bNewEntry || !pField || pField->GetTyp()->Which() != SwFieldIds::TableOfAuthorities)
return;
const SwAuthEntry* pEntry = static_cast<SwAuthorityFieldType*>(pField->GetTyp())->
@@ -1490,7 +1490,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
SwCreateAuthEntryDlg_Impl, IdentifierHdl));
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- rSh.GetFieldType(RES_AUTHORITY, OUString()));
+ rSh.GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
if(pFType)
{
std::vector<OUString> aIds;
@@ -1584,7 +1584,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons
IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox&, rBox, void)
{
const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
- rWrtSh.GetFieldType(RES_AUTHORITY, OUString()));
+ rWrtSh.GetFieldType(SwFieldIds::TableOfAuthorities, OUString()));
if(pFType)
{
const SwAuthEntry* pEntry = pFType->GetEntryByIdentifier(
generated by cgit (git 2.34.1) at 2025-01-06 08:00:22 +0000