summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/appopen.cxx4
-rw-r--r--sfx2/source/appl/appserv.cxx4
-rw-r--r--sfx2/source/appl/appuno.cxx4
-rw-r--r--sfx2/source/appl/linkmgr2.cxx2
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx4
-rw-r--r--sfx2/source/appl/workwin.cxx2
6 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 79f733719b38..3cddd76ee9a0 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -232,12 +232,12 @@ sal_uInt32 CheckPasswd_Impl
{
// use the comphelper password helper to request a password
OUString aPassword;
- SFX_ITEMSET_ARG(pSet, pPasswordItem, SfxStringItem, SID_PASSWORD);
+ const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(pSet, SID_PASSWORD, false);
if ( pPasswordItem )
aPassword = pPasswordItem->GetValue();
uno::Sequence< beans::NamedValue > aEncryptionData;
- SFX_ITEMSET_ARG(pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA);
+ const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pSet, SID_ENCRYPTIONDATA, false);
if ( pEncryptionDataItem )
pEncryptionDataItem->GetValue() >>= aEncryptionData;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 2fa9faefc408..4fa868e6e4d0 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -359,7 +359,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Reference< XFrame > xFrame;
const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
- SFX_ITEMSET_ARG(pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME);
+ const SfxUnoFrameItem* pFrameItem = SfxItemSet::GetItem<SfxUnoFrameItem>(pIntSet, SID_FILLFRAME, false);
if ( pFrameItem )
xFrame = pFrameItem->GetFrame();
@@ -1138,7 +1138,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
Reference< XFrame > xFrame;
const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
- SFX_ITEMSET_ARG(pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME);
+ const SfxUnoFrameItem* pFrameItem = SfxItemSet::GetItem<SfxUnoFrameItem>(pIntSet, SID_FILLFRAME, false);
if ( pFrameItem )
xFrame = pFrameItem->GetFrame();
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index b0b1c8a08127..5f1a86aad79d 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1277,7 +1277,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
// slot is a property
sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
- SFX_ITEMSET_ARG(&rSet, pItem, SfxPoolItem, nWhich);
+ const SfxPoolItem* pItem = rSet.GetItem<SfxPoolItem>(nWhich, false);
if ( pItem ) //???
{
sal_uInt16 nSubCount = pType->nAttribs;
@@ -1329,7 +1329,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
- SFX_ITEMSET_ARG(&rSet, pItem, SfxPoolItem, nWhich);
+ const SfxPoolItem* pItem = rSet.GetItem<SfxPoolItem>(nWhich, false);
if ( pItem ) //???
{
sal_uInt16 nSubCount = rArg.pType->nAttribs;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 2c08d3871e85..fe9d1e851250 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -588,7 +588,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
if( pShell && pShell->GetMedium() )
{
sReferer = pShell->GetMedium()->GetBaseURL();
- SFX_ITEMSET_ARG(pShell->GetMedium()->GetItemSet(), pItem, SfxUInt16Item, SID_UPDATEDOCMODE);
+ const SfxUInt16Item* pItem = SfxItemSet::GetItem<SfxUInt16Item>(pShell->GetMedium()->GetItemSet(), SID_UPDATEDOCMODE, false);
if ( pItem )
nUpdateMode = pItem->GetValue();
}
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 32179734f293..c1f120390650 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -179,7 +179,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
return;
// add no document that forbids this (for example Message-Body)
- SFX_ITEMSET_ARG(pMed->GetItemSet(), pPicklistItem, SfxBoolItem, SID_PICKLIST);
+ const SfxBoolItem* pPicklistItem = SfxItemSet::GetItem<SfxBoolItem>(pMed->GetItemSet(), SID_PICKLIST, false);
if ( pPicklistItem && !pPicklistItem->GetValue() )
return;
@@ -200,7 +200,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled())
{
// not modified => the document matches what is in the shell
- SFX_ITEMSET_ARG(pMed->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA);
+ const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pMed->GetItemSet(), SID_ENCRYPTIONDATA, false);
if ( pEncryptionDataItem )
{
// encrypted document, will show a generic document icon instead
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index e1d4db121284..b03c12d44542 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1213,7 +1213,7 @@ bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell )
{
if ( pObjShell && pObjShell->GetMedium() )
{
- SFX_ITEMSET_ARG(pObjShell->GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY);
+ const SfxBoolItem* pViewOnlyItem = SfxItemSet::GetItem<SfxBoolItem>(pObjShell->GetMedium()->GetItemSet(), SID_VIEWONLY, false);
if ( pViewOnlyItem && pViewOnlyItem->GetValue() )
return true;
}
generated by cgit (git 2.34.1) at 2024-07-18 21:57:34 +0000