summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx16
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx38
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx12
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx4
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx8
7 files changed, 41 insertions, 41 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index f5b74e4b9e5e..403594c84add 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -395,7 +395,7 @@ void SwAddressControl_Impl::Resize()
SwCreateAddressListDialog::SwCreateAddressListDialog(
vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) :
SfxModalDialog(pParent, "CreateAddressList", "modules/swriter/ui/createaddresslist.ui"),
- m_sAddressListFilterName( SW_RES( ST_FILTERNAME)),
+ m_sAddressListFilterName( SwResId( ST_FILTERNAME)),
m_sURL(rURL),
m_pCSVData( new SwCSVData ),
m_pFindDlg(nullptr)
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 5bfc7a99c50e..7d40cd07d598 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -191,7 +191,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
, ConfigItem("Office.Writer/InsertData/DataSet",
ConfigItemMode::DelayedUpdate)
, aDBData(rData)
- , sNoTmpl(SW_RESSTR(SW_STR_NONE))
+ , sNoTmpl(SwResId(SW_STR_NONE))
, pView(&rView)
, pTAutoFormat(nullptr)
, pTableSet(nullptr)
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 927a09825e0c..cc6ba7230bf7 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -43,19 +43,19 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC
m_pSwView(&rView),
m_bDocumentLoad( false ),
m_xConfigItem(rItem),
- m_sStarting( SW_RES( ST_STARTING )),
- m_sDocumentType( SW_RES( ST_DOCUMENTTYPE )),
- m_sAddressBlock( SW_RES( ST_ADDRESSBLOCK )),
- m_sAddressList( SW_RES( ST_ADDRESSLIST )),
- m_sGreetingsLine( SW_RES( ST_GREETINGSLINE )),
- m_sLayout( SW_RES( ST_LAYOUT )),
- m_sFinish( SW_RES( ST_FINISH )),
+ m_sStarting( SwResId( ST_STARTING )),
+ m_sDocumentType( SwResId( ST_DOCUMENTTYPE )),
+ m_sAddressBlock( SwResId( ST_ADDRESSBLOCK )),
+ m_sAddressList( SwResId( ST_ADDRESSLIST )),
+ m_sGreetingsLine( SwResId( ST_GREETINGSLINE )),
+ m_sLayout( SwResId( ST_LAYOUT )),
+ m_sFinish( SwResId( ST_FINISH )),
m_nRestartPage( MM_DOCUMENTSELECTPAGE )
{
defaultButton(WizardButtonFlags::NEXT);
enableButtons(WizardButtonFlags::FINISH, false);
- setTitleBase(SW_RESSTR( ST_MMWTITLE ) );
+ setTitleBase(SwResId( ST_MMWTITLE ) );
m_pFinish->SetText(m_sFinish);
m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE);
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 96ab523f636b..6c9c69e81774 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -511,29 +511,29 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
{
m_pFieldFT->Show();
m_pFieldCB->Show();
- SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(SW_RESSTR(ST_SALUTATION));
+ SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_SALUTATION));
pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_SALUTATION) );
- pEntry = m_pAddressElementsLB->InsertEntry(SW_RESSTR(ST_PUNCTUATION));
+ pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_PUNCTUATION));
pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_PUNCTUATION) );
- pEntry = m_pAddressElementsLB->InsertEntry(SW_RESSTR(ST_TEXT));
+ pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_TEXT));
pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_TEXT) );
- ResStringArray aSalutArr(SW_RES(RA_SALUTATION));
+ ResStringArray aSalutArr(ResId(RA_SALUTATION, *pSwResMgr));
for(sal_uInt32 i = 0; i < aSalutArr.Count(); ++i)
m_aSalutations.push_back(aSalutArr.GetString(i));
- ResStringArray aPunctArr(SW_RES(RA_PUNCTUATION));
+ ResStringArray aPunctArr(ResId(RA_PUNCTUATION, *pSwResMgr));
for(sal_uInt32 i = 0; i < aPunctArr.Count(); ++i)
m_aPunctuations.push_back(aPunctArr.GetString(i));
m_pDragED->SetText(" ");
- SetText(SW_RESSTR(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE));
- m_pAddressElementsFT->SetText(SW_RESSTR(ST_SALUTATIONELEMENTS));
- m_pInsertFieldIB->SetQuickHelpText(SW_RESSTR(ST_INSERTSALUTATIONFIELD));
- m_pRemoveFieldIB->SetQuickHelpText(SW_RESSTR(ST_REMOVESALUTATIONFIELD));
- m_pDragFT->SetText(SW_RESSTR(ST_DRAGSALUTATION));
+ SetText(SwResId(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE));
+ m_pAddressElementsFT->SetText(SwResId(ST_SALUTATIONELEMENTS));
+ m_pInsertFieldIB->SetQuickHelpText(SwResId(ST_INSERTSALUTATIONFIELD));
+ m_pRemoveFieldIB->SetQuickHelpText(SwResId(ST_REMOVESALUTATIONFIELD));
+ m_pDragFT->SetText(SwResId(ST_DRAGSALUTATION));
}
else
{
if(eType == ADDRESSBLOCK_EDIT)
- SetText(SW_RESSTR(ST_TITLE_EDIT));
+ SetText(SwResId(ST_TITLE_EDIT));
m_pDragED->SetText("\n\n\n\n\n");
}
@@ -894,7 +894,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
pNewText->SetText("<" + rHeader + ">");
VclPtr<ListBox> pNewLB = VclPtr<ListBox>::Create(m_aWindow.get(), WB_DROPDOWN | WB_VCENTER | WB_TABSTOP);
pNewText->set_mnemonic_widget(pNewLB);
- pNewLB->InsertEntry(SW_RESSTR(SW_STR_NONE));
+ pNewLB->InsertEntry(SwResId(SW_STR_NONE));
pNewLB->SelectEntryPos(0);
pNewLB->SetDropDownLineCount(5);
@@ -1154,7 +1154,7 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
const OUString& rPreview,
bool bIsAddressBlock) :
SfxModalDialog(pParent, "AssignFieldsDialog", "modules/swriter/ui/assignfieldsdialog.ui"),
- m_sNone(SW_RESSTR(SW_STR_NONE)),
+ m_sNone(SwResId(SW_STR_NONE)),
m_rPreviewString(rPreview),
m_rConfigItem(rConfigItem)
{
@@ -1168,14 +1168,14 @@ SwAssignFieldsDialog::SwAssignFieldsDialog(
get(m_pFieldsControl, "FIELDS");
m_pFieldsControl->Init(rConfigItem);
//resize the HeaderBar
- OUString sAddressElement( SW_RESSTR(ST_ADDRESSELEMENT) );
- const OUString sMatchesTo( SW_RESSTR(ST_MATCHESTO) );
- const OUString sPreview( SW_RESSTR(ST_PREVIEW) );
+ OUString sAddressElement( SwResId(ST_ADDRESSELEMENT) );
+ const OUString sMatchesTo( SwResId(ST_MATCHESTO) );
+ const OUString sPreview( SwResId(ST_PREVIEW) );
if(!bIsAddressBlock)
{
- m_pPreviewFI->SetText(SW_RESSTR(ST_SALUTATIONPREVIEW));
- m_pMatchingFI->SetText(SW_RESSTR(ST_SALUTATIONMATCHING));
- sAddressElement = SW_RESSTR(ST_SALUTATIONELEMENT);
+ m_pPreviewFI->SetText(SwResId(ST_SALUTATIONPREVIEW));
+ m_pMatchingFI->SetText(SwResId(ST_SALUTATIONMATCHING));
+ sAddressElement = SwResId(ST_SALUTATIONELEMENT);
}
Size aOutputSize(m_pFieldsControl->m_aHeaderHB->GetSizePixel());
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index c1b3ce71cfa6..6ba3cbe9486c 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -252,13 +252,13 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem&
m_pContainer(get<SvSimpleTableContainer>("container")),
m_pStop(get<PushButton>("stop")),
m_pClose(get<PushButton>("close")),
- m_sContinue(SW_RES( ST_CONTINUE )),
+ m_sContinue(SwResId( ST_CONTINUE )),
m_sStop(m_pStop->GetText()),
m_sTransferStatus(m_pTransferStatus->GetText()),
m_sErrorStatus( m_pErrorStatus->GetText()),
- m_sSendingTo( SW_RES(ST_SENDINGTO )),
- m_sCompleted( SW_RES(ST_COMPLETED )),
- m_sFailed( SW_RES(ST_FAILED )),
+ m_sSendingTo( SwResId(ST_SENDINGTO )),
+ m_sCompleted( SwResId(ST_COMPLETED )),
+ m_sFailed( SwResId(ST_FAILED )),
m_bCancel(false),
m_bDesctructionEnabled(false),
m_pImpl(new SwSendMailDialog_Impl),
@@ -273,8 +273,8 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem&
m_pStatusHB = &(m_pStatus->GetTheHeaderBar());
m_nStatusHeight = m_pContainer->get_height_request();
- OUString sTask(SW_RES(ST_TASK));
- OUString sStatus(SW_RES(ST_STATUS));
+ OUString sTask(SwResId(ST_TASK));
+ OUString sStatus(SwResId(ST_STATUS));
m_pStop->SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
m_pClose->SetClickHdl(LINK( this, SwSendMailDialog, CloseHdl_Impl));
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 5493126901cb..f1d27c661786 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -316,7 +316,7 @@ void SwMMResultPrintDialog::dispose()
SwMMResultEmailDialog::SwMMResultEmailDialog()
: SfxModalDialog(nullptr, "MMResultEmailDialog", "modules/swriter/ui/mmresultemaildialog.ui"),
- m_sConfigureMail(SW_RES(ST_CONFIGUREMAIL))
+ m_sConfigureMail(SwResId(ST_CONFIGUREMAIL))
{
get(m_pMailToFT, "mailtoft");
get(m_pMailToLB, "mailto");
@@ -687,7 +687,7 @@ IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void)
sExtension = pSfxFlt->GetWildcard().getGlob().getToken(1, '.');
sPath += "." + sExtension;
}
- OUString sStat = OUString(SW_RES(STR_STATSTR_LETTER)) + " " + OUString::number( nDoc );
+ OUString sStat = SwResId(STR_STATSTR_LETTER) + " " + OUString::number( nDoc );
aSaveMonitor->m_pPrintInfo->SetText(sStat);
//now extract a document from the target document
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 66f01dc07bdd..7da94798041f 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -92,10 +92,10 @@ void SwAddressTable::setColSizes()
SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
const uno::Reference< sdbc::XConnection>& rConnection)
: SfxModalDialog(pParent, "SelectTableDialog", "modules/swriter/ui/selecttabledialog.ui")
- , m_sName(SW_RES(ST_NAME))
- , m_sType(SW_RES(ST_TYPE))
- , m_sTable(SW_RES(ST_TABLE))
- , m_sQuery(SW_RES(ST_QUERY))
+ , m_sName(SwResId(ST_NAME))
+ , m_sType(SwResId(ST_TYPE))
+ , m_sTable(SwResId(ST_TABLE))
+ , m_sQuery(SwResId(ST_QUERY))
, m_xConnection(rConnection)
{
get(m_pPreviewPB, "preview");
generated by cgit (git 2.34.1) at 2024-07-24 18:26:42 +0000