sc/source/core/tool/progress.cxx | 6 +++---
sc/source/filter/excel/xeextlst.cxx | 5 ++---
sc/source/filter/excel/xehelper.cxx | 11 +++++------
sc/source/filter/excel/xestyle.cxx | 5 ++---
sc/source/filter/html/htmlexp.cxx | 5 ++---
sc/source/filter/rtf/eeimpars.cxx | 5 ++---
sc/source/filter/xcl97/xcl97rec.cxx | 5 ++---
7 files changed, 18 insertions(+), 24 deletions(-)
New commits:
commit 1e157252a2074729d1d89d6b49054dfd74ffe789
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Mar 1 11:06:32 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 1 11:03:59 2022 +0100
use SfxItemSet::GetItemIfSet in sc/source/filter
Change-Id: I8ba941cea8f3b8ed0f37d2dc6b2520ae89652afe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130744
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 9a695bb8cfe5..83f4e687f609 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -53,9 +53,9 @@ static bool lcl_IsHiddenDocument( const SfxObjectShell*
pObjSh )
if (pMed)
{
SfxItemSet* pSet = pMed->GetItemSet();
- const SfxPoolItem* pItem;
- if ( pSet && SfxItemState::SET == pSet->GetItemState( SID_HIDDEN,
true, &pItem ) &&
- static_cast<const SfxBoolItem*>(pItem)->GetValue() )
+ const SfxBoolItem* pItem;
+ if ( pSet && (pItem = pSet->GetItemIfSet( SID_HIDDEN )) &&
+ pItem->GetValue() )
return true;
}
}
diff --git a/sc/source/filter/excel/xeextlst.cxx
b/sc/source/filter/excel/xeextlst.cxx
index f556c47ecdca..242f21dbb8fa 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -221,10 +221,9 @@ void XclExpExtCF::SaveXml( XclExpXmlStream& rStrm )
std::unique_ptr<XclExpDxfFont> pFont(new XclExpDxfFont(GetRoot(), rSet));
std::unique_ptr<XclExpNumFmt> pNumFormat;
- const SfxPoolItem *pPoolItem = nullptr;
- if( rSet.GetItemState( ATTR_VALUE_FORMAT, true, &pPoolItem ) ==
SfxItemState::SET )
+ if( const SfxUInt32Item* pPoolItem = rSet.GetItemIfSet( ATTR_VALUE_FORMAT
) )
{
- sal_uInt32 nScNumFmt = static_cast< const SfxUInt32Item*
>(pPoolItem)->GetValue();
+ sal_uInt32 nScNumFmt = pPoolItem->GetValue();
XclExpNumFmtBuffer& rNumFmtBuffer = GetRoot().GetNumFmtBuffer();
sal_uInt32 nXclNumFmt = rNumFmtBuffer.Insert(nScNumFmt);
pNumFormat.reset(new XclExpNumFmt(nScNumFmt, nXclNumFmt,
rNumFmtBuffer.GetFormatCode(nScNumFmt)));
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index bd60fd355cd5..aeed23121e35 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -464,10 +464,9 @@ XclExpStringRef lclCreateFormattedString(
if( aSel.nStartPos + 1 == aSel.nEndPos )
{
// test if the character is a text field
- const SfxPoolItem* pItem;
- if( aEditSet.GetItemState( EE_FEATURE_FIELD, false, &pItem )
== SfxItemState::SET )
+ if( const SvxFieldItem* pItem = aEditSet.GetItemIfSet(
EE_FEATURE_FIELD, false ) )
{
- const SvxFieldData* pField = static_cast< const
SvxFieldItem* >( pItem )->GetField();
+ const SvxFieldData* pField = pItem->GetField();
if( const SvxURLField* pUrlField = dynamic_cast<const
SvxURLField*>( pField ) )
{
// convert URL field to string representation
@@ -807,11 +806,11 @@ void XclExpHFConverter::AppendPortion( const
EditTextObject* pTextObj, sal_Unico
// --- text content or text fields ---
- const SfxPoolItem* pItem;
+ const SvxFieldItem* pItem;
if( (aSel.nStartPos + 1 == aSel.nEndPos) && // fields are
single characters
- (aEditSet.GetItemState( EE_FEATURE_FIELD, false, &pItem )
== SfxItemState::SET) )
+ (pItem = aEditSet.GetItemIfSet( EE_FEATURE_FIELD, false ))
)
{
- if( const SvxFieldData* pFieldData = static_cast< const
SvxFieldItem* >( pItem )->GetField() )
+ if( const SvxFieldData* pFieldData = pItem->GetField() )
{
if( dynamic_cast<const SvxPageField*>( pFieldData) !=
nullptr )
aParaText.append("&P");
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 1dd6401a79eb..1e9c426a3dc9 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3151,10 +3151,9 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
std::unique_ptr<XclExpDxfFont> pFont(new
XclExpDxfFont(rRoot, rSet));
std::unique_ptr<XclExpNumFmt> pNumFormat;
- const SfxPoolItem *pPoolItem = nullptr;
- if( rSet.GetItemState( ATTR_VALUE_FORMAT, true,
&pPoolItem ) == SfxItemState::SET )
+ if( const SfxUInt32Item *pPoolItem =
rSet.GetItemIfSet( ATTR_VALUE_FORMAT ) )
{
- sal_uInt32 nScNumFmt = static_cast< const
SfxUInt32Item* >(pPoolItem)->GetValue();
+ sal_uInt32 nScNumFmt = pPoolItem->GetValue();
sal_Int32 nXclNumFmt =
GetRoot().GetNumFmtBuffer().Insert(nScNumFmt);
pNumFormat.reset(new XclExpNumFmt( nScNumFmt,
nXclNumFmt, GetNumberFormatCode( *this, nScNumFmt, xFormatter.get(),
mpKeywordTable.get() )));
}
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 3290e2cf4d5d..b912f506d735 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1287,11 +1287,10 @@ bool ScHTMLExport::WriteFieldText( const
EditTextObject* pData )
// fields are single characters
if ( nEnd == nStart+1 )
{
- const SfxPoolItem* pItem;
SfxItemSet aSet = rEngine.GetAttribs( aSel );
- if ( aSet.GetItemState( EE_FEATURE_FIELD, false, &pItem )
== SfxItemState::SET )
+ if ( const SvxFieldItem* pFieldItem = aSet.GetItemIfSet(
EE_FEATURE_FIELD, false ) )
{
- const SvxFieldData* pField = static_cast<const
SvxFieldItem*>(pItem)->GetField();
+ const SvxFieldData* pField = pFieldItem->GetField();
if (const SvxURLField* pURLField = dynamic_cast<const
SvxURLField*>(pField))
{
bUrl = true;
diff --git a/sc/source/filter/rtf/eeimpars.cxx
b/sc/source/filter/rtf/eeimpars.cxx
index 2768d054b9a4..e3cdd25adee9 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -357,10 +357,9 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows,
double nOutputFactor, SvNu
bool bTextFormat = false;
- const SfxPoolItem* pNumFmt = nullptr;
- if (rAttrItemSet2.GetItemState(ATTR_VALUE_FORMAT, false,
&pNumFmt) == SfxItemState::SET)
+ if (const SfxUInt32Item* pNumFmt =
rAttrItemSet2.GetItemIfSet(ATTR_VALUE_FORMAT, false))
{
- sal_uInt32 nNumFmt = static_cast<const
SfxUInt32Item*>(pNumFmt)->GetValue();
+ sal_uInt32 nNumFmt = pNumFmt->GetValue();
SvNumFormatType nType = pFormatter->GetType(nNumFmt);
if (nType == SvNumFormatType::TEXT)
// Format is set to Text.
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index 243c7b27c630..3cc27e9e0bad 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -902,10 +902,9 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const
EditTextObject& rEditObj, SdrObje
if( !aParaText.isEmpty() )
{
const SfxItemSet& aSet( rEditObj.GetParaAttribs( 0));
- const SfxPoolItem* pItem = nullptr;
- if( aSet.GetItemState( EE_PARA_JUST, true, &pItem ) ==
SfxItemState::SET )
+ if( const SvxAdjustItem* pItem = aSet.GetItemIfSet( EE_PARA_JUST ) )
{
- SvxAdjust eEEAlign = static_cast< const SvxAdjustItem& >( *pItem
).GetAdjust();
+ SvxAdjust eEEAlign = pItem->GetAdjust();
pCaption->SetMergedItem( SvxAdjustItem( eEEAlign, EE_PARA_JUST ) );
}
}
