summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx9
-rw-r--r--sw/source/ui/envelp/envfmt.cxx7
-rw-r--r--sw/source/ui/frmdlg/column.cxx5
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx46
-rw-r--r--sw/source/ui/table/tabledlg.cxx65
5 files changed, 57 insertions, 75 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 20a21ad8ae72..69e418b64e3d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2715,18 +2715,15 @@ namespace pcr
{
const SfxItemSet* pResult = aDialog.GetOutputItemSet();
- const SfxPoolItem* pItem = pResult->GetItem( SID_ATTR_NUMBERFORMAT_INFO );
- const SvxNumberInfoItem* pInfoItem = dynamic_cast< const SvxNumberInfoItem* >( pItem );
- if (pInfoItem)
+ if (const SvxNumberInfoItem* pInfoItem = pResult->GetItem( SID_ATTR_NUMBERFORMAT_INFO ))
{
for (sal_uInt32 key : pInfoItem->GetDelFormats())
pFormatter->DeleteEntry(key);
}
- pItem = nullptr;
- if ( SfxItemState::SET == pResult->GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, false, &pItem ) )
+ if ( const SfxUInt32Item* pItem = pResult->GetItemIfSet( SID_ATTR_NUMBERFORMAT_VALUE, false ) )
{
- _out_rNewValue <<= static_cast<sal_Int32>( static_cast< const SfxUInt32Item* >( pItem )->GetValue() );
+ _out_rNewValue <<= static_cast<sal_Int32>( pItem->GetValue() );
bChanged = true;
}
}
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 56c5f9135b71..26cd00923873 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -227,13 +227,12 @@ void SwEnvFormatPage::Edit(std::string_view rIdent, bool bSender)
if (aDlg.run() == RET_OK)
{
// maybe relocate defaults
- const SfxPoolItem* pItem = nullptr;
+ const SfxUInt16Item* pDefaultsItem = nullptr;
SfxItemSet* pOutputSet = const_cast<SfxItemSet*>(aDlg.GetOutputItemSet());
sal_uInt16 nNewDist;
- if( SfxItemState::SET == pOutputSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS,
- false, &pItem ) &&
- nDefDist != (nNewDist = static_cast<const SfxUInt16Item*>(pItem)->GetValue()) )
+ if( (pDefaultsItem = pOutputSet->GetItemIfSet( SID_ATTR_TABSTOP_DEFAULTS, false )) &&
+ nDefDist != (nNewDist = pDefaultsItem->GetValue()) )
{
SvxTabStopItem aDefTabs( 0, 0, SvxTabAdjust::Default, RES_PARATR_TABSTOP );
MakeDefTabs( nNewDist, aDefTabs );
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index f12ae77f4180..e03eb2945999 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -562,9 +562,8 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
}
if (m_xBalanceColsCB->get_visible())
{
- const SfxPoolItem* pItem;
- if( SfxItemState::SET == rSet->GetItemState( RES_COLUMNBALANCE, false, &pItem ))
- m_xBalanceColsCB->set_active(!static_cast<const SwFormatNoBalancedColumns*>(pItem)->GetValue());
+ if( const SwFormatNoBalancedColumns* pItem = rSet->GetItemIfSet( RES_COLUMNBALANCE, false ) )
+ m_xBalanceColsCB->set_active(!pItem->GetValue());
else
m_xBalanceColsCB->set_active(true);
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 66837f87fe43..a48a939dfbeb 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -870,13 +870,12 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
::SetFieldUnit(*m_xAtHorzPosED, aMetric);
::SetFieldUnit(*m_xAtVertPosED, aMetric);
- const SfxPoolItem* pItem = nullptr;
const SwFormatAnchor& rAnchor = rSet->Get(RES_ANCHOR);
- if (SfxItemState::SET == rSet->GetItemState(FN_OLE_IS_MATH, false, &pItem))
- m_bIsMathOLE = static_cast<const SfxBoolItem*>(pItem)->GetValue();
- if (SfxItemState::SET == rSet->GetItemState(FN_MATH_BASELINE_ALIGNMENT, false, &pItem))
- m_bIsMathBaselineAlignment = static_cast<const SfxBoolItem*>(pItem)->GetValue();
+ if (const SfxBoolItem* pMathItem = rSet->GetItemIfSet(FN_OLE_IS_MATH, false))
+ m_bIsMathOLE = pMathItem->GetValue();
+ if (const SfxBoolItem* pAlignItem = rSet->GetItemIfSet(FN_MATH_BASELINE_ALIGNMENT, false))
+ m_bIsMathBaselineAlignment = pAlignItem->GetValue();
EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment
&& RndStdIds::FLY_AS_CHAR == rAnchor.GetAnchorId()) );
@@ -2341,21 +2340,20 @@ std::unique_ptr<SfxTabPage> SwGrfExtPage::Create(weld::Container* pPage, weld::D
void SwGrfExtPage::Reset(const SfxItemSet *rSet)
{
- const SfxPoolItem* pItem;
const sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current()));
m_bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
- if( SfxItemState::SET == rSet->GetItemState( FN_PARAM_GRF_CONNECT, true, &pItem)
- && static_cast<const SfxBoolItem *>(pItem)->GetValue() )
+ const SfxBoolItem* pConnectItem = rSet->GetItemIfSet( FN_PARAM_GRF_CONNECT );
+ if( pConnectItem && pConnectItem->GetValue() )
{
m_xBrowseBT->set_sensitive(true);
m_xConnectED->set_editable(true);
}
// RotGrfFlyFrame: Get RotationAngle and set at control
- if(SfxItemState::SET == rSet->GetItemState( SID_ATTR_TRANSFORM_ANGLE, false, &pItem))
+ if(const SdrAngleItem* pAngleItem = rSet->GetItemIfSet( SID_ATTR_TRANSFORM_ANGLE, false))
{
- m_xCtlAngle->SetRotation(static_cast<const SdrAngleItem*>(pItem)->GetValue());
+ m_xCtlAngle->SetRotation(pAngleItem->GetValue());
}
else
{
@@ -2419,12 +2417,11 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
}
}
- if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
+ if( const SvxBrushItem* pGraphicBrushItem = rSet.GetItemIfSet( SID_ATTR_GRAF_GRAPHIC, false ) )
{
- const SvxBrushItem& rBrush = *static_cast<const SvxBrushItem*>(pItem);
- if( !rBrush.GetGraphicLink().isEmpty() )
+ if( !pGraphicBrushItem->GetGraphicLink().isEmpty() )
{
- aGrfName = aNewGrfName = rBrush.GetGraphicLink();
+ aGrfName = aNewGrfName = pGraphicBrushItem->GetGraphicLink();
m_xConnectED->set_text(aNewGrfName);
}
OUString referer;
@@ -2433,7 +2430,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
if (it != nullptr) {
referer = it->GetValue();
}
- const Graphic* pGrf = rBrush.GetGraphic(referer);
+ const Graphic* pGrf = pGraphicBrushItem->GetGraphic(referer);
if( pGrf )
{
m_aBmpWin.SetGraphic( *pGrf );
@@ -2691,8 +2688,7 @@ SwFrameURLPage::~SwFrameURLPage()
void SwFrameURLPage::Reset( const SfxItemSet *rSet )
{
- const SfxPoolItem* pItem;
- if ( SfxItemState::SET == rSet->GetItemState( SID_DOCFRAME, true, &pItem))
+ if ( SfxItemState::SET == rSet->GetItemState( SID_DOCFRAME ))
{
TargetList aList;
SfxFrame::GetDefaultTargetList(aList);
@@ -2703,9 +2699,8 @@ void SwFrameURLPage::Reset( const SfxItemSet *rSet )
}
}
- if ( SfxItemState::SET == rSet->GetItemState( RES_URL, true, &pItem ) )
+ if ( const SwFormatURL* pFormatURL = rSet->GetItemIfSet( RES_URL ) )
{
- const SwFormatURL* pFormatURL = static_cast<const SwFormatURL*>(pItem);
m_xURLED->set_text(INetURLObject::decode(pFormatURL->GetURL(),
INetURLObject::DecodeMechanism::Unambiguous));
m_xNameED->set_text(pFormatURL->GetName());
@@ -2836,7 +2831,6 @@ std::unique_ptr<SfxTabPage> SwFrameAddPage::Create(weld::Container* pPage, weld:
void SwFrameAddPage::Reset(const SfxItemSet *rSet )
{
- const SfxPoolItem* pItem;
sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current()));
m_bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
if (m_bHtmlMode)
@@ -2855,15 +2849,15 @@ void SwFrameAddPage::Reset(const SfxItemSet *rSet )
m_xContentAlignFrame->hide();
}
- if(SfxItemState::SET == rSet->GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem))
+ if(const SfxStringItem* pNameItem = rSet->GetItemIfSet(FN_SET_FRM_ALT_NAME, false))
{
- m_xAltNameED->set_text(static_cast<const SfxStringItem*>(pItem)->GetValue());
+ m_xAltNameED->set_text(pNameItem->GetValue());
m_xAltNameED->save_value();
}
- if(SfxItemState::SET == rSet->GetItemState(FN_UNO_DESCRIPTION, false, &pItem))
+ if(const SfxStringItem* pDescriptionItem = rSet->GetItemIfSet(FN_UNO_DESCRIPTION, false))
{
- m_xDescriptionED->set_text(static_cast<const SfxStringItem*>(pItem)->GetValue());
+ m_xDescriptionED->set_text(pDescriptionItem->GetValue());
m_xDescriptionED->save_value();
}
@@ -2872,9 +2866,9 @@ void SwFrameAddPage::Reset(const SfxItemSet *rSet )
// insert graphic - properties
// bNew is not set, so recognise by selection
OUString aTmpName1;
- if(SfxItemState::SET == rSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
+ if(const SfxStringItem* pNameItem = rSet->GetItemIfSet(FN_SET_FRM_NAME, false))
{
- aTmpName1 = static_cast<const SfxStringItem*>(pItem)->GetValue();
+ aTmpName1 = pNameItem->GetValue();
}
OSL_ENSURE(m_pWrtSh, "no Shell?");
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index c62b73629aa2..329626663474 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -108,9 +108,8 @@ SwFormatTablePage::SwFormatTablePage(weld::Container* pPage, weld::DialogControl
SetExchangeSupport();
- const SfxPoolItem* pItem;
- if(SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem))
- bHtmlMode = 0 != (static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON);
+ if(const SfxUInt16Item* pModeItem = rSet.GetItemIfSet(SID_HTML_MODE, false))
+ bHtmlMode = 0 != (pModeItem->GetValue() & HTMLMODE_ON);
bool bCTL = SW_MOD()->GetCTLOptions().IsCTLFontEnabled();
m_xProperties->set_visible(!bHtmlMode && bCTL);
@@ -434,7 +433,6 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
void SwFormatTablePage::Reset( const SfxItemSet* )
{
const SfxItemSet& rSet = GetItemSet();
- const SfxPoolItem* pItem;
if(bHtmlMode)
{
@@ -463,15 +461,15 @@ void SwFormatTablePage::Reset( const SfxItemSet* )
SetFieldUnit(*m_xBottomMF, aMetric);
//Name
- if(SfxItemState::SET == rSet.GetItemState( FN_PARAM_TABLE_NAME, false, &pItem ))
+ if(const SfxStringItem* pNameItem = rSet.GetItemIfSet( FN_PARAM_TABLE_NAME, false ))
{
- m_xNameED->set_text(static_cast<const SfxStringItem*>(pItem)->GetValue());
+ m_xNameED->set_text(pNameItem->GetValue());
m_xNameED->save_value();
}
- if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
+ if(const SwPtrItem* pRepItem = rSet.GetItemIfSet( FN_TABLE_REP, false ))
{
- pTableData = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>( pItem)->GetValue());
+ pTableData = static_cast<SwTableRep*>( pRepItem->GetValue());
if (!m_xOrigTableData)
m_xOrigTableData.reset(new SwTableRep(*pTableData));
else // tdf#134925 and tdf#134913, reset back to the original data seen on dialog creation
@@ -562,20 +560,20 @@ void SwFormatTablePage::Reset( const SfxItemSet* )
}
//Margins
- if(SfxItemState::SET == rSet.GetItemState( RES_UL_SPACE, false,&pItem ))
+ if(const SvxULSpaceItem* pSpaceItem = rSet.GetItemIfSet( RES_UL_SPACE, false ))
{
m_xTopMF->set_value(m_xTopMF->normalize(
- static_cast<const SvxULSpaceItem*>(pItem)->GetUpper()), FieldUnit::TWIP);
+ pSpaceItem->GetUpper()), FieldUnit::TWIP);
m_xBottomMF->set_value(m_xBottomMF->normalize(
- static_cast<const SvxULSpaceItem*>(pItem)->GetLower()), FieldUnit::TWIP);
+ pSpaceItem->GetLower()), FieldUnit::TWIP);
m_xTopMF->save_value();
m_xBottomMF->save_value();
}
//Text direction
- if( SfxItemState::SET == rSet.GetItemState( RES_FRAMEDIR, true, &pItem ) )
+ if( const SvxFrameDirectionItem* pDirectionItem = rSet.GetItemIfSet( RES_FRAMEDIR ) )
{
- SvxFrameDirection nVal = static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue();
+ SvxFrameDirection nVal = pDirectionItem->GetValue();
m_xTextDirectionLB->set_active_id(nVal);
m_xTextDirectionLB->save_value();
}
@@ -763,9 +761,8 @@ SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, weld::DialogControl
// all the pages that currently exist and the rest to come after this one
m_pSizeHdlEvent = Application::PostUserEvent(LINK(this, SwTableColumnPage, SizeHdl));
- const SfxPoolItem* pItem;
- Init(SfxItemState::SET == GetItemSet().GetItemState(SID_HTML_MODE, false, &pItem)
- && static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON);
+ const SfxUInt16Item* pModeItem = GetItemSet().GetItemIfSet(SID_HTML_MODE, false);
+ Init(pModeItem && pModeItem->GetValue() & HTMLMODE_ON);
}
IMPL_LINK_NOARG(SwTableColumnPage, SizeHdl, void*, void)
@@ -816,10 +813,9 @@ void SwTableColumnPage::Reset( const SfxItemSet* )
{
const SfxItemSet& rSet = GetItemSet();
- const SfxPoolItem* pItem;
- if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
+ if(const SwPtrItem* pRepItem = rSet.GetItemIfSet( FN_TABLE_REP, false ))
{
- m_pTableData = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>( pItem)->GetValue());
+ m_pTableData = static_cast<SwTableRep*>( pRepItem->GetValue());
if (!m_xOrigTableData)
m_xOrigTableData.reset(new SwTableRep(*m_pTableData));
else // tdf#134925 and tdf#134913, reset back to the original data seen on dialog creation
@@ -1294,9 +1290,8 @@ SwTextFlowPage::SwTextFlowPage(weld::Container* pPage, weld::DialogController* p
LINK(this, SwTextFlowPage, SplitHdl_Impl));
m_xHeadLineCB->connect_toggled(LINK(this, SwTextFlowPage, HeadLineCBClickHdl));
- const SfxPoolItem *pItem;
- if(SfxItemState::SET == rSet.GetItemState( SID_HTML_MODE, false,&pItem )
- && static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON)
+ const SfxUInt16Item *pModeItem = rSet.GetItemIfSet( SID_HTML_MODE, false );
+ if(pModeItem && pModeItem->GetValue() & HTMLMODE_ON)
{
m_xKeepCB->hide();
m_xSplitCB->hide();
@@ -1432,7 +1427,6 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
void SwTextFlowPage::Reset( const SfxItemSet* rSet )
{
- const SfxPoolItem* pItem;
bool bFlowAllowed = !bHtmlMode || SvxHtmlOptions::IsPrintLayoutExtension();
if(bFlowAllowed)
{
@@ -1453,14 +1447,14 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
m_xPageCollLB->append_text(aFormatName);
}
- if(SfxItemState::SET == rSet->GetItemState( RES_KEEP, false, &pItem ))
+ if(const SvxFormatKeepItem* pKeepItem = rSet->GetItemIfSet( RES_KEEP, false ))
{
- m_xKeepCB->set_active( static_cast<const SvxFormatKeepItem*>(pItem)->GetValue() );
+ m_xKeepCB->set_active( pKeepItem->GetValue() );
m_xKeepCB->save_state();
}
- if(SfxItemState::SET == rSet->GetItemState( RES_LAYOUT_SPLIT, false, &pItem ))
+ if(const SwFormatLayoutSplit* pSplitItem = rSet->GetItemIfSet( RES_LAYOUT_SPLIT, false ))
{
- m_xSplitCB->set_active( static_cast<const SwFormatLayoutSplit*>(pItem)->GetValue() );
+ m_xSplitCB->set_active( pSplitItem->GetValue() );
}
else
m_xSplitCB->set_active(true);
@@ -1468,9 +1462,9 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
m_xSplitCB->save_state();
SplitHdl_Impl(*m_xSplitCB);
- if(SfxItemState::SET == rSet->GetItemState( RES_ROW_SPLIT, false, &pItem ))
+ if(const SwFormatRowSplit* pSplitItem = rSet->GetItemIfSet( RES_ROW_SPLIT, false ))
{
- m_xSplitRowCB->set_active( static_cast<const SwFormatRowSplit*>(pItem)->GetValue() );
+ m_xSplitRowCB->set_active( pSplitItem->GetValue() );
}
else
m_xSplitRowCB->set_state(TRISTATE_INDET);
@@ -1478,12 +1472,12 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
if(bPageBreak)
{
- if(SfxItemState::SET == rSet->GetItemState( RES_PAGEDESC, false, &pItem ))
+ if(const SwFormatPageDesc* pPageDescItem = rSet->GetItemIfSet( RES_PAGEDESC, false ))
{
OUString sPageDesc;
- const SwPageDesc* pDesc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc();
+ const SwPageDesc* pDesc = pPageDescItem->GetPageDesc();
- ::std::optional<sal_uInt16> oNumOffset = static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset();
+ ::std::optional<sal_uInt16> oNumOffset = pPageDescItem->GetNumOffset();
if (oNumOffset)
{
m_xPageNoCB->set_active(true);
@@ -1522,9 +1516,8 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
}
}
- if(SfxItemState::SET == rSet->GetItemState( RES_BREAK, false, &pItem ))
+ if(const SvxFormatBreakItem* pPageBreak = rSet->GetItemIfSet( RES_BREAK, false ))
{
- const SvxFormatBreakItem* pPageBreak = static_cast<const SvxFormatBreakItem*>(pItem);
SvxBreak eBreak = pPageBreak->GetBreak();
if ( eBreak != SvxBreak::NONE )
@@ -1585,9 +1578,9 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
m_xPageCollLB->set_sensitive(false);
}
- if(SfxItemState::SET == rSet->GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem ))
+ if(const SfxUInt16Item* pHeadlineItem = rSet->GetItemIfSet( FN_PARAM_TABLE_HEADLINE, false ))
{
- sal_uInt16 nRep = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
+ sal_uInt16 nRep = pHeadlineItem->GetValue();
m_xHeadLineCB->set_active(nRep > 0);
m_xHeadLineCB->save_state();
m_xRepeatHeaderNF->set_value(nRep);
generated by cgit (git 2.34.1) at 2025-02-07 04:29:53 +0000