5 files changed, 8 insertions, 21 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 7c9f56525e29..6345de75d88f 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -178,8 +178,8 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
     get(m_pTablePB, "changetable");
     get(m_pOK, "ok");
 
-    m_sName = get<FixedText>("name")->GetText();
-    m_sTable = get<FixedText>("table")->GetText();
+    OUString sName = get<FixedText>("name")->GetText();
+    OUString sTable = get<FixedText>("table")->GetText();
     m_sConnecting = get<FixedText>("connecting")->GetText();
 
     const OUString sTemp(m_pDescriptionFI->GetText()
@@ -198,7 +198,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
     pHeaderTreeContainer->set_height_request(aSize.Height());
     m_pListLB = VclPtr<SwAddrSourceLB>::Create(*pHeaderTreeContainer);
 
-    m_pListLB->InsertHeaderEntry(m_sName + "\t" + m_sTable);
+    m_pListLB->InsertHeaderEntry(sName + "\t" + sTable);
     m_pListLB->setColSizes();
 
     m_pListLB->SetStyle( m_pListLB->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 6769c8353151..5344092e69cb 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -57,8 +57,6 @@ class SwAddressListDialog : public SfxModalDialog
 
     VclPtr<OKButton>       m_pOK;
 
-    OUString        m_sName;
-    OUString        m_sTable;
     OUString        m_sConnecting;
 
     SvTreeListEntry*    m_pCreatedDataSource;
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 72702b2b264e..a862e377ce1b 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -49,7 +49,6 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC
         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);
@@ -57,7 +56,7 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC
 
     setTitleBase(SwResId( ST_MMWTITLE ) );
 
-    m_pFinish->SetText(m_sFinish);
+    m_pFinish->SetText(SwResId( ST_FINISH ));
     m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE);
     m_pPrevPage->SetHelpId(HID_MM_PREV_PAGE);
 
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index f376d78696bd..28765408fc59 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -87,10 +87,6 @@ void SwAddressTable::setColSizes()
 SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
         const uno::Reference< sdbc::XConnection>& rConnection)
     : SfxModalDialog(pParent, "SelectTableDialog", "modules/swriter/ui/selecttabledialog.ui")
-    , 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");
@@ -102,8 +98,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
     m_pTable = VclPtr<SwAddressTable>::Create(*pHeaderTreeContainer);
     long const aStaticTabs[]= { 0, 0 };
     m_pTable->SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs );
-    m_pTable->InsertHeaderItem(1, m_sName );
-    m_pTable->InsertHeaderItem(2, m_sType );
+    m_pTable->InsertHeaderItem(1, SwResId(ST_NAME) );
+    m_pTable->InsertHeaderItem(2, SwResId(ST_TYPE) );
 
     m_pPreviewPB->SetClickHdl(LINK(this, SwSelectDBTableDialog, PreviewHdl));
 
@@ -117,7 +113,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
         {
             OUString sEntry = pTables[i];
             sEntry += "\t";
-            sEntry += m_sTable;
+            sEntry += SwResId(ST_TABLE);
             SvTreeListEntry* pEntry = m_pTable->InsertEntry(sEntry);
             pEntry->SetUserData(nullptr);
         }
@@ -132,7 +128,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
         {
             OUString sEntry = pQueries[i];
             sEntry += "\t";
-            sEntry += m_sQuery;
+            sEntry += SwResId(ST_QUERY);
             SvTreeListEntry* pEntry = m_pTable->InsertEntry(sEntry);
             pEntry->SetUserData(reinterpret_cast<void*>(1));
         }
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index 276afbbd2577..9f251f3ee8a6 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.hxx
@@ -37,12 +37,6 @@ class SwSelectDBTableDialog : public SfxModalDialog
 {
     VclPtr<SwAddressTable> m_pTable;
     VclPtr<PushButton>     m_pPreviewPB;
-
-    OUString        m_sName;
-    OUString        m_sType;
-    OUString        m_sTable;
-    OUString        m_sQuery;
-
     css::uno::Reference<css::sdbc::XConnection> m_xConnection;
 
     DECL_LINK(PreviewHdl, Button*, void);