summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-13 12:40:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-13 18:05:03 +0200
commit88f7ac5ccd358069e356c544888386b745c82732 (patch)
treee3afbbfcc537f14dd9b409be8ab71106e7bbded3 /sw/source
parent74edbc474975266a1cee36d47cb0443808f9c19a (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 'sw/source')
-rw-r--r--sw/source/ui/envelp/label1.cxx4
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx6
-rw-r--r--sw/source/ui/misc/num.cxx2
-rw-r--r--sw/source/ui/misc/pggrid.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index d7eadfdce5c1..c9d62cb79f1d 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -591,7 +591,7 @@ DeactivateRC SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet)
bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet)
{
- SwLabItem aItem = static_cast<const SwLabItem&>(GetDialogController()->GetExampleSet()->Get(FN_LABEL));
+ SwLabItem aItem = static_cast<const SwLabItem&>(GetDialogExampleSet()->Get(FN_LABEL));
aItem.m_aPrivFirstName = m_xFirstNameED->get_text();
aItem.m_aPrivName = m_xNameED->get_text();
aItem.m_aPrivShortCut = m_xShortCutED->get_text();
@@ -681,7 +681,7 @@ DeactivateRC SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet)
bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet)
{
- SwLabItem aItem = static_cast<const SwLabItem&>(GetDialogController()->GetExampleSet()->Get(FN_LABEL));
+ SwLabItem aItem = static_cast<const SwLabItem&>(GetDialogExampleSet()->Get(FN_LABEL));
aItem.m_aCompCompany = m_xCompanyED->get_text();
aItem.m_aCompCompanyExt= m_xCompanyExtED->get_text();
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index a76e9034904d..2ceeaa30b729 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1863,10 +1863,10 @@ void SwFramePage::RangeModifyHdl()
aMgr.ValidateMetrics(aVal, mpToCharContentPos); // one more time, to determine all remaining values with correct width and height.
// all columns have to be correct
- if(GetTabDialog()->GetExampleSet() &&
- SfxItemState::DEFAULT <= GetTabDialog()->GetExampleSet()->GetItemState(RES_COL))
+ const SfxItemSet* pExampleSet = GetDialogExampleSet();
+ if (pExampleSet && SfxItemState::DEFAULT <= pExampleSet->GetItemState(RES_COL))
{
- const SwFormatCol& rCol = GetTabDialog()->GetExampleSet()->Get(RES_COL);
+ const SwFormatCol& rCol = pExampleSet->Get(RES_COL);
if ( rCol.GetColumns().size() > 1 )
{
for (const SwColumn & i : rCol.GetColumns())
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 5b8d8b066e95..997ba0f5a4ad 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -348,7 +348,7 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
const SfxPoolItem* pItem;
sal_uInt16 nTmpNumLvl =
pOutlineDlg ? SwOutlineTabDialog::GetActNumLevel() : 0;
- const SfxItemSet* pExampleSet = GetDialogController()->GetExampleSet();
+ const SfxItemSet* pExampleSet = GetDialogExampleSet();
if(pExampleSet && pExampleSet->GetItemState(FN_PARAM_NUM_PRESET, false, &pItem) != SfxItemState::UNKNOWN)
{
bPreset = static_cast<const SfxBoolItem*>(pItem)->GetValue();
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 98dd7a271e87..036ee48ea0c6 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -487,7 +487,7 @@ void SwTextGridPage::GridModifyHdl()
{
const SfxItemSet& rOldSet = GetItemSet();
SfxItemSet aSet(rOldSet);
- const SfxItemSet* pExSet = GetDialogController()->GetExampleSet();
+ const SfxItemSet* pExSet = GetDialogExampleSet();
if(pExSet)
aSet.Put(*pExSet);
PutGridItem(aSet);