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

Noel Grandin noel.grandin at collabora.co.uk
Fri May 4 06:57:39 UTC 2018


 include/sfx2/tabdlg.hxx        |    2 --
 sfx2/source/dialog/dinfdlg.cxx |    6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 213f12be2cab2106dde4a0e859faaa8259627c1a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 3 15:10:50 2018 +0200

    no need to expose m_pExampleSet as non-const
    
    Change-Id: Ife6b4115a8aa48eba6f86ecf4eb66e3dc5e1830e
    Reviewed-on: https://gerrit.libreoffice.org/53796
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 9317380174a3..c3d6d6ec2cf6 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -210,7 +210,6 @@ public:
     void                Start();
 
     const SfxItemSet*   GetExampleSet() const { return m_pExampleSet; }
-    SfxItemSet*         GetExampleSet() { return m_pExampleSet; }
 
     void                SetApplyHandler(const Link<Button*,void>& _rHdl);
 
@@ -296,7 +295,6 @@ public:
     short               execute();
 
     const SfxItemSet*   GetExampleSet() const { return m_pExampleSet; }
-    SfxItemSet*         GetExampleSet() { return m_pExampleSet; }
 
     SAL_DLLPRIVATE void Start_Impl();
 };
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 017ca402dd89..f5d2ce07a86e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -950,7 +950,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
          m_pUseUserDataCB->IsValueChangedFromSaved() &&
          GetTabDialog() && GetTabDialog()->GetExampleSet() )
     {
-        SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
+        const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
 
         if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) )
@@ -965,7 +965,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
 
     if ( bHandleDelete )
     {
-        SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
+        const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
         if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) )
         {
@@ -987,7 +987,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
     if ( m_pUseThumbnailSaveCB->IsValueChangedFromSaved() &&
        GetTabDialog() && GetTabDialog()->GetExampleSet() )
     {
-        SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
+        const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet();
         const SfxPoolItem* pItem;
 
         if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) )


More information about the Libreoffice-commits mailing list