diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-09-13 12:40:17 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-13 18:05:03 +0200 |
commit | 88f7ac5ccd358069e356c544888386b745c82732 (patch) | |
tree | e3afbbfcc537f14dd9b409be8ab71106e7bbded3 /cui | |
parent | 74edbc474975266a1cee36d47cb0443808f9c19a (diff) |
add GetDialogExampleSet rather than guess at it
Change-Id: I8d7fc780c77e7f410ce78eb07bcb92dcd71f6c13
Reviewed-on: https://gerrit.libreoffice.org/60434
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 1bb2f41b4f82..e8183ecc0ba9 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -937,7 +937,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp const SfxItemSet& rOldSet = GetItemSet(); const SfxPoolItem* pOld = nullptr; - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; + const SfxItemSet* pExampleSet = GetDialogExampleSet(); bool bChanged = true; const OUString& rFontName = pNameBox->GetText(); @@ -2361,7 +2361,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) } // Outline - const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; + const SfxItemSet* pExampleSet = GetDialogExampleSet(); nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CONTOUR ); TriState eState = m_xOutlineBtn->get_state(); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 0d1b9c8af88c..abcddd4b5af3 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -271,7 +271,7 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) SvxSizeItem aSz( nW ); // size could already have been set from another page - const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : nullptr; + const SfxItemSet* pExSet = GetDialogExampleSet(); const SfxPoolItem* pItem = nullptr; if( pExSet && SfxItemState::SET == pExSet->GetItemState( nW, false, &pItem ) ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 8863e5fa968c..9edbc09a02bc 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -247,7 +247,7 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = false; bool bIsPreset = false; - const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); + const SfxItemSet* pExampleSet = GetDialogExampleSet(); if(pExampleSet) { if(SfxItemState::SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem)) @@ -404,7 +404,7 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = false; bool bIsPreset = false; - const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); + const SfxItemSet* pExampleSet = GetDialogExampleSet(); if(pExampleSet) { if(SfxItemState::SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem)) @@ -593,7 +593,7 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = false; bool bIsPreset = false; - const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); + const SfxItemSet* pExampleSet = GetDialogExampleSet(); if(pExampleSet) { if(SfxItemState::SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem)) @@ -826,7 +826,7 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = false; bool bIsPreset = false; - const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); + const SfxItemSet* pExampleSet = GetDialogExampleSet(); if(pExampleSet) { if(SfxItemState::SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem)) @@ -1217,7 +1217,7 @@ VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( TabPageParent pParent, void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; - const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); + const SfxItemSet* pExampleSet = GetDialogExampleSet(); sal_uInt16 nTmpNumLvl = 1; if(pExampleSet) { @@ -3081,7 +3081,7 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) { const SfxPoolItem* pItem; sal_uInt16 nTmpNumLvl = 1; - const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); + const SfxItemSet* pExampleSet = GetDialogExampleSet(); if(pExampleSet) { if(SfxItemState::SET == pExampleSet->GetItemState(SID_PARAM_NUM_PRESET, false, &pItem)) |