summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/changedb.cxx2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx14
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx22
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx28
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
7 files changed, 37 insertions, 37 deletions
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index ab5457c89b81..c72019ece137 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -247,7 +247,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
{
if (rDBData.sDataSource.isEmpty() && rDBData.sCommand.isEmpty())
{
- m_pDocDBNameFT->SetText(SW_RESSTR(SW_STR_NONE));
+ m_pDocDBNameFT->SetText(SwResId(SW_STR_NONE));
}
else
{
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index e556eb1f7a44..0295644857f3 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -160,7 +160,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
if( rProperties.getLength() )
{
- pInfo = m_pTypeTLB->InsertEntry( OUString(SW_RES( STR_CUSTOM )) );
+ pInfo = m_pTypeTLB->InsertEntry( SwResId( STR_CUSTOM ) );
pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
for (sal_Int32 n=0; n < rProperties.getLength(); n++)
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index df89661bcc2f..35c7df610a71 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -131,7 +131,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* )
case TYP_PAGENUMBERFLD:
if (!bPage)
{
- nPos = m_pTypeLB->InsertEntry(SW_RESSTR(FMT_REF_PAGE));
+ nPos = m_pTypeLB->InsertEntry(SwResId(FMT_REF_PAGE));
m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(USHRT_MAX));
bPage = true;
}
@@ -384,14 +384,14 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void)
break;
case TYP_CHAPTERFLD:
- m_pValueFT->SetText(SW_RESSTR(STR_LEVEL));
+ m_pValueFT->SetText(SwResId(STR_LEVEL));
if (IsFieldEdit())
m_pLevelED->SetText(OUString::number(static_cast<SwChapterField*>(GetCurField())->GetLevel() + 1));
bLevel = true;
break;
case TYP_PAGENUMBERFLD:
- m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
+ m_pValueFT->SetText( SwResId( STR_OFFSET ));
if (IsFieldEdit())
m_pValueED->SetText(GetCurField()->GetPar2());
bValue = true;
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void)
}
if( nTextRes )
- m_pValueFT->SetText( SW_RESSTR( nTextRes ));
+ m_pValueFT->SetText( SwResId( nTextRes ));
}
sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
@@ -511,10 +511,10 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
if( nSize && !m_pFormatLB->GetSelectEntryCount() )
{
- m_pFormatLB->SelectEntry( SW_RESSTR(FMT_NUM_PAGEDESC) );
+ m_pFormatLB->SelectEntry( SwResId(FMT_NUM_PAGEDESC) );
if( !m_pFormatLB->GetSelectEntryCount() )
{
- m_pFormatLB->SelectEntry( SW_RESSTR(FMT_NUM_ARABIC) );
+ m_pFormatLB->SelectEntry( SwResId(FMT_NUM_ARABIC) );
if( !m_pFormatLB->GetSelectEntryCount() )
m_pFormatLB->SelectEntryPos( 0 );
}
@@ -544,7 +544,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void)
sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
m_pFormatLB->GetSelectEntryPos() ));
const OUString sOldText( m_pValueFT->GetText() );
- const OUString sNewText( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE
+ const OUString sNewText( SwResId( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE
: STR_OFFSET ));
if( sOldText != sNewText )
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index b06f044c4cd9..5b5a1a3b280f 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
if (nSize)
{
if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD)
- m_pFormatLB->SelectEntry(SW_RESSTR(FMT_MARK_BEGIN + GetCurField()->GetFormat()));
+ m_pFormatLB->SelectEntry(SwResId(FMT_MARK_BEGIN + GetCurField()->GetFormat()));
if (!m_pFormatLB->GetSelectEntryCount())
m_pFormatLB->SelectEntryPos(0);
@@ -314,15 +314,15 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
else
bInsert = false;
- m_pNameFT->SetText(SW_RESSTR(STR_MACNAME));
- m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
+ m_pNameFT->SetText(SwResId(STR_MACNAME));
+ m_pValueFT->SetText(SwResId(STR_PROMPT));
m_pNameED->SetText(GetFieldMgr().GetMacroName());
m_pNameED->SetAccessibleName(m_pNameFT->GetText());
m_pValueED->SetAccessibleName(m_pValueFT->GetText());
break;
case TYP_HIDDENPARAFLD:
- m_pNameFT->SetText(SW_RESSTR(STR_COND));
+ m_pNameFT->SetText(SwResId(STR_COND));
m_pNameED->SetDropEnable(true);
bName = true;
m_pNameED->SetAccessibleName(m_pNameFT->GetText());
@@ -331,9 +331,9 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
case TYP_HIDDENTXTFLD:
{
- m_pNameFT->SetText(SW_RESSTR(STR_COND));
+ m_pNameFT->SetText(SwResId(STR_COND));
m_pNameED->SetDropEnable(true);
- m_pValueFT->SetText(SW_RESSTR(STR_INSTEXT));
+ m_pValueFT->SetText(SwResId(STR_INSTEXT));
SwWrtShell* pSh = GetActiveWrtShell();
if (!IsFieldEdit() && pSh )
m_pValueED->SetText(pSh->GetSelText());
@@ -344,7 +344,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
break;
case TYP_CONDTXTFLD:
- m_pNameFT->SetText(SW_RESSTR(STR_COND));
+ m_pNameFT->SetText(SwResId(STR_COND));
m_pNameED->SetDropEnable(true);
if (IsFieldEdit())
{
@@ -358,15 +358,15 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
break;
case TYP_JUMPEDITFLD:
- m_pNameFT->SetText(SW_RESSTR(STR_JUMPEDITFLD));
- m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
+ m_pNameFT->SetText(SwResId(STR_JUMPEDITFLD));
+ m_pValueFT->SetText(SwResId(STR_PROMPT));
bName = bValue = true;
m_pNameED->SetAccessibleName(m_pNameFT->GetText());
m_pValueED->SetAccessibleName(m_pValueFT->GetText());
break;
case TYP_INPUTFLD:
- m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
+ m_pValueFT->SetText(SwResId(STR_PROMPT));
bValue = true;
m_pNameED->SetAccessibleName(m_pNameFT->GetText());
m_pValueED->SetAccessibleName(m_pValueFT->GetText());
@@ -374,7 +374,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
case TYP_COMBINED_CHARS:
{
- m_pNameFT->SetText(SW_RESSTR(STR_COMBCHRS_FT));
+ m_pNameFT->SetText(SwResId(STR_COMBCHRS_FT));
m_pNameED->SetDropEnable(true);
bName = true;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 38664a2a285a..bf4e837362ad 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void)
break;
case REF_SETREFATTR:
- sName = SW_RESSTR(STR_GETREFFLD);
+ sName = SwResId(STR_GETREFFLD);
nFlag = REF_SETREFATTR;
break;
@@ -811,7 +811,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
if (!IsFieldEdit())
m_pFormatLB->SelectEntry(sOldSel);
else
- m_pFormatLB->SelectEntry(SW_RESSTR(FMT_REF_BEGIN + GetCurField()->GetFormat()));
+ m_pFormatLB->SelectEntry(SwResId(FMT_REF_BEGIN + GetCurField()->GetFormat()));
if (!m_pFormatLB->GetSelectEntryCount())
{
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 409c484e0090..b9dbc7541054 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -326,7 +326,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
else
{
m_pNumFormatLB->Clear();
- sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0);
+ sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_SETVAR_TEXT), 0);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
m_pNumFormatLB->SelectEntryPos(0);
}
@@ -370,7 +370,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
{
bValue = true;
bNumFormat = true;
- m_pValueFT->SetText(SW_RESSTR(STR_FORMULA));
+ m_pValueFT->SetText(SwResId(STR_FORMULA));
m_pValueED->SetDropEnable(true);
}
break;
@@ -415,7 +415,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
break;
case TYP_INPUTFLD:
- m_pValueFT->SetText(SW_RESSTR(STR_PROMPT));
+ m_pValueFT->SetText(SwResId(STR_PROMPT));
if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -442,7 +442,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
{
m_pNumFormatLB->Clear();
- sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_USERVAR_TEXT), 0);
+ sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_USERVAR_TEXT), 0);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
m_pNumFormatLB->SelectEntryPos(0);
}
@@ -456,7 +456,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
break;
case TYP_DDEFLD:
- m_pValueFT->SetText(SW_RESSTR(STR_DDE_CMD));
+ m_pValueFT->SetText(SwResId(STR_DDE_CMD));
if (IsFieldEdit() || pBox) // only when interacting via mouse
{
@@ -525,7 +525,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
case TYP_SETREFPAGEFLD:
{
bValue = false;
- m_pValueFT->SetText( SW_RESSTR( STR_OFFSET ));
+ m_pValueFT->SetText( SwResId( STR_OFFSET ));
if (IsFieldEdit() || pBox) // only when interacting via mouse
m_pNameED->SetText(OUString());
@@ -752,9 +752,9 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
{
if (!IsFieldEdit() || bSpecialFormat)
{
- sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_MARK_TEXT), 0);
+ sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_MARK_TEXT), 0);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
- nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_USERVAR_CMD), 1);
+ nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_USERVAR_CMD), 1);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
}
}
@@ -764,7 +764,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
{
if (!IsFieldEdit() || bSpecialFormat)
{
- sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0);
+ sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_SETVAR_TEXT), 0);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
}
}
@@ -772,14 +772,14 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
case TYP_FORMELFLD:
{
- sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0);
+ sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_GETVAR_NAME), 0);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
}
break;
case TYP_GETFLD:
{
- sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0);
+ sal_Int32 nPos = m_pNumFormatLB->InsertEntry(SwResId(FMT_GETVAR_NAME), 0);
m_pNumFormatLB->SetEntryData(nPos, reinterpret_cast<void *>(ULONG_MAX));
}
break;
@@ -817,10 +817,10 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
if (!m_pFormatLB->GetSelectEntryCount())
{
- m_pFormatLB->SelectEntry(SW_RESSTR(FMT_NUM_PAGEDESC));
+ m_pFormatLB->SelectEntry(SwResId(FMT_NUM_PAGEDESC));
if (!m_pFormatLB->GetSelectEntryCount())
{
- m_pFormatLB->SelectEntry(SW_RESSTR(FMT_NUM_ARABIC));
+ m_pFormatLB->SelectEntry(SwResId(FMT_NUM_ARABIC));
if (!m_pFormatLB->GetSelectEntryCount())
m_pFormatLB->SelectEntryPos(0);
}
@@ -1159,7 +1159,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
{
nSubType = (nFormat == ULONG_MAX) ? nsSwGetSetExpType::GSE_STRING : nsSwGetSetExpType::GSE_EXPR;
- if (nFormat == ULONG_MAX && m_pNumFormatLB->GetSelectEntry() == SW_RESSTR(FMT_USERVAR_CMD))
+ if (nFormat == ULONG_MAX && m_pNumFormatLB->GetSelectEntry() == SwResId(FMT_USERVAR_CMD))
nSubType |= nsSwExtendedSubType::SUB_CMD;
if (m_pInvisibleCB->IsChecked())
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index f409f253da17..6f0076ded866 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -80,7 +80,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
CheckTravel();
if( !bNew )
- SetText( SW_RES( STR_JAVA_EDIT ) );
+ SetText( SwResId( STR_JAVA_EDIT ) );
RadioButtonHdl(nullptr);
}
generated by cgit (git 2.34.1) at 2024-07-24 06:00:04 +0000