[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Libreoffice Gerrit user]

 include/sfx2/tabdlg.hxx        |    1 +
 sfx2/source/dialog/dinfdlg.cxx |    3 ++-
 sfx2/source/dialog/tabdlg.cxx  |    4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 21c41659969cba4dc50d3208fb1736032c971661
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 15 14:27:28 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 15 18:45:01 2018 +0100

    Resolves: tdf#121415 font tab page has no name
    
    Change-Id: I3ca6a8b58163fe5c84a306dd80dd7171f8540299
    Reviewed-on: https://gerrit.libreoffice.org/63425
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index d3a56e6a4cd3..0bf86625d690 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -121,6 +121,7 @@ protected:
      */
     void SavePosAndId();
 
+    void SetPageName(sal_uInt16 nPageId, const OString& rName) const;
 public:
     SfxTabDialog(vcl::Window* pParent,
                  const OUString& rID, const OUString& rUIXMLDescription,
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 9199e25ba2e5..70f2a77e9116 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1179,7 +1179,8 @@ void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 
 void SfxDocumentInfoDialog::AddFontTabPage()
 {
-    AddTabPage( FONT_PAGE_ID, SfxResId( STR_FONT_TABPAGE ), SfxDocumentFontsPage::Create);
+    AddTabPage(FONT_PAGE_ID, SfxResId(STR_FONT_TABPAGE), SfxDocumentFontsPage::Create);
+    SetPageName(FONT_PAGE_ID , "font");
 }
 
 // class CustomPropertiesYesNoButton -------------------------------------
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 04e6f394d06e..1d5b3ecc3e8e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1363,6 +1363,10 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     return m_pRanges.get();
 }
 
+void SfxTabDialog::SetPageName(sal_uInt16 nPageId, const OString& rName) const
+{
+    m_pTabCtrl->SetPageName(nPageId, rName);
+}
 
 void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )