[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/sfx2 sfx2/source

[Libreoffice Gerrit user]

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

New commits:
commit 9a43f68475363aa3d242e97e0e8e0da32f21288a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 15 14:27:28 2018 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Nov 16 06:45:34 2018 +0100

    Resolves: tdf#121415 font tab page has no name
    
    Change-Id: I3ca6a8b58163fe5c84a306dd80dd7171f8540299
    Reviewed-on: https://gerrit.libreoffice.org/63440
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 2a73fa84d09e..e04d1599853e 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -137,6 +137,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 a1f34306ae91..937256384486 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1211,6 +1211,7 @@ void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 void SfxDocumentInfoDialog::AddFontTabPage()
 {
     AddTabPage( FONT_PAGE_ID, SfxResId( STR_FONT_TABPAGE ), SfxDocumentFontsPage::Create, nullptr);
+    SetPageName(FONT_PAGE_ID , "font");
 }
 
 // class CustomPropertiesYesNoButton -------------------------------------
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index c73fb613140e..e0d5669f62ea 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1377,6 +1377,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 )