[Libreoffice-commits] core.git: sw/inc sw/source

[Gabor Kelemen]

 sw/inc/dbui.hrc                       |    1 +
 sw/source/ui/dbui/mailmergewizard.cxx |    2 ++
 sw/source/ui/dbui/mailmergewizard.src |    5 +++++
 3 files changed, 8 insertions(+)

New commits:
commit cdc601100e3cec820ea0802a03707c445d2800b1
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Wed Mar 8 07:45:27 2017 +0100

    tdf#98899 Set a title for Mail Merge Wizard window
    
    Change-Id: Id50bae820bf5e4a84587ead0b600225a5f625050
    Reviewed-on: https://gerrit.libreoffice.org/34964
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 45418f5..28c12f5 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -85,6 +85,7 @@
 #define RID_BMP_FORMULA_CALC    (RC_DBUI_BEGIN + 60)
 #define RID_BMP_FORMULA_APPLY   (RC_DBUI_BEGIN + 61)
 #define RID_BMP_FORMULA_CANCEL  (RC_DBUI_BEGIN + 62)
+#define ST_MMWTITLE             (RC_DBUI_BEGIN + 63)
 
 // Elements -----------------------------------------------------------------
 #define MM_PART_TITLE                   0
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 7550a04..c0fd5ba 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -55,6 +55,8 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC
     defaultButton(WizardButtonFlags::NEXT);
     enableButtons(WizardButtonFlags::FINISH, false);
 
+    setTitleBase(SW_RESSTR( ST_MMWTITLE ) );
+
     m_pFinish->SetText(m_sFinish);
     m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE);
     m_pPrevPage->SetHelpId(HID_MM_PREV_PAGE);
diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src
index 43ddf62..20651fd 100644
--- a/sw/source/ui/dbui/mailmergewizard.src
+++ b/sw/source/ui/dbui/mailmergewizard.src
@@ -59,4 +59,9 @@ String ST_FINISH
     Text [ en-US ] = "~Finish";
 };
 
+String ST_MMWTITLE
+{
+    Text [ en-US ] = "Mail Merge Wizard";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */