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

Katarina Behrens Katarina.Behrens at cib.de
Thu Jun 16 10:05:32 UTC 2016


 include/sfx2/tabdlg.hxx       |    2 ++
 sfx2/source/dialog/tabdlg.cxx |   15 +++++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit 9f9c2a2703a338ec18309ff382703ab8b517b6dc
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Jun 10 11:14:02 2016 +0200

    tdf#100068: ScreenshotId for tab dialogs
    
    Change-Id: I80ec2cef190d106bb45455424a6a0ed901590221
    Reviewed-on: https://gerrit.libreoffice.org/26155
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 8325722..a794651 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -163,6 +163,8 @@ public:
         return GetTabPage(m_pTabCtrl->GetCurPageId());
     }
 
+    virtual OString GetScreenshotId() const override;
+
     OUString            GetPageText( sal_uInt16 nPageId ) const
     {
         return m_pTabCtrl->GetPageText(nPageId);
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index c5be378..d112680 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1223,6 +1223,21 @@ void SfxTabDialog::ShowPage( sal_uInt16 nId )
     ActivatePageHdl( m_pTabCtrl );
 }
 
+OString SfxTabDialog::GetScreenshotId() const
+{
+    SfxTabPage *pActiveTabPage = GetCurTabPage();
+    OString aScreenshotId = GetHelpId();
+
+    if ( pActiveTabPage )
+    {
+        vcl::Window* pToplevelBox = pActiveTabPage->GetWindow( GetWindowType::FirstChild );
+
+        if ( pToplevelBox )
+            aScreenshotId = aScreenshotId + OString("#") + pToplevelBox->GetHelpId();
+    }
+
+    return aScreenshotId;
+}
 
 const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 


More information about the Libreoffice-commits mailing list