diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-10-16 07:27:28 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-10-16 12:12:26 +0200 |
| commit | 67fe42070332709823f0b00e6311809bc3e5341c (patch) | |
| tree | 68362fef0a62d78e32db2085127ce3ca89825773 | |
| parent | 901f6da81b5006d33d7ad1f97b70f4c60708d609 (diff) | |
sfx items: The bDeep parameter of SFX_ITEMSET_ARG is always false.
Change-Id: Ifdffc82c9b4ec2e534204294575a78e34e0338c1
72 files changed, 267 insertions, 284 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6d83d5536a66..08d1276cac9d 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -68,22 +68,22 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte m_pCharCodeText->set_width_request(m_pCharCodeText->get_preferred_size().Width()); get(m_pSymbolText, "symboltext"); - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, false ); + SFX_ITEMSET_ARG(pSet, pItem, SfxBoolItem, FN_PARAM_1); if ( pItem ) bOne = pItem->GetValue(); init(); - SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, false ); + SFX_ITEMSET_ARG(pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR); if ( pCharItem ) SetChar( pCharItem->GetValue() ); - SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, false ); + SFX_ITEMSET_ARG(pSet, pDisableItem, SfxBoolItem, FN_PARAM_2); if ( pDisableItem && pDisableItem->GetValue() ) DisableFontSelection(); - SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); - SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, false ); + SFX_ITEMSET_ARG(pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); + SFX_ITEMSET_ARG(pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME); if ( pFontItem ) { vcl::Font aTmpFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 8292dbf335e5..8efcbf850787 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -72,11 +72,11 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) if ( _pSet ) { - SFX_ITEMSET_ARG( _pSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, false ); + SFX_ITEMSET_ARG(_pSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG); if ( pItem && pItem->GetValue() ) bShowSWOptions = true; - SFX_ITEMSET_ARG( _pSet, pItem2, SfxBoolItem, SID_OPEN_SMARTTAGOPTIONS, false ); + SFX_ITEMSET_ARG(_pSet, pItem2, SfxBoolItem, SID_OPEN_SMARTTAGOPTIONS); if ( pItem2 && pItem2->GetValue() ) bOpenSmartTagOptions = true; } @@ -1857,7 +1857,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) bool bShowSWOptions = false; - SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, false ); + SFX_ITEMSET_ARG(&rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG); if ( pItem && pItem->GetValue() ) bShowSWOptions = true; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 7f009a562b9e..1ef807703fab 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1509,7 +1509,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE); if (pFlagItem) { diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index c1fb557acdc4..c876fc843509 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1208,8 +1208,8 @@ void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxBorderTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pSWModeItem,SfxUInt16Item,SID_SWMODE_TYPE); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE); if (pSWModeItem) { nSWMode = static_cast<SwBorderModes>(pSWModeItem->GetValue()); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 4fb8d0457b91..547c0d7b7b43 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1346,9 +1346,9 @@ void SvxCharNamePage::SetPreviewBackgroundToCharacter() void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,false); - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL,false); + SFX_ITEMSET_ARG(&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE); + SFX_ITEMSET_ARG(&aSet,pDisalbeItem,SfxUInt16Item,SID_DISABLE_CTL); if (pFontListItem) SetFontList(*pFontListItem); @@ -2620,8 +2620,8 @@ void SvxCharEffectsPage::SetPreviewBackgroundToCharacter() void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,false); - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE); if (pDisableCtlItem) DisableControls(pDisableCtlItem->GetValue()); @@ -3390,7 +3390,7 @@ void SvxCharPositionPage::SetPreviewBackgroundToCharacter() void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); @@ -3628,7 +3628,7 @@ void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter() void SvxCharTwoLinesPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index d1696bd52380..060fa7974095 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -512,7 +512,7 @@ void SvxConnectionPage::FillTypeLB() } void SvxConnectionPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,false); + SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue()) ); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 2ffa6abf46cd..3ad49e6cc668 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -820,7 +820,7 @@ void SvxMeasurePage::FillUnitLB() } void SvxMeasurePage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST,false); + SFX_ITEMSET_ARG(&aSet,pOfaPtrItem,OfaPtrItem,SID_OBJECT_LIST); if (pOfaPtrItem) SetView( static_cast<SdrView *>(pOfaPtrItem->GetValue())); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index aacd985faf56..0efb9baf99aa 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1808,8 +1808,8 @@ void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, b void SvxNumberFormatTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO,false); - SFX_ITEMSET_ARG (&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pNumberInfoItem,SvxNumberInfoItem,SID_ATTR_NUMBERFORMAT_INFO); + SFX_ITEMSET_ARG(&aSet,pLinkItem,SfxLinkItem,SID_LINK_TYPE); if (pNumberInfoItem) SetNumberFormatList(*pNumberInfoItem); if (pLinkItem) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 741b96a47050..5f429a126271 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -532,7 +532,7 @@ IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); + SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT); if (pBulletCharFmt) SetCharFormatName( pBulletCharFmt->GetValue()); @@ -786,8 +786,8 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,false); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); + SFX_ITEMSET_ARG(&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT); + SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT); if (pNumCharFmt &&pBulletCharFmt) @@ -3671,10 +3671,10 @@ void SvxNumOptionsTabPage::SetModified(bool bRepaint) void SvxNumOptionsTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX,false); - SFX_ITEMSET_ARG (&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT,false); - SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,false); + SFX_ITEMSET_ARG(&aSet,pListItem,SfxStringListItem,SID_CHAR_FMT_LIST_BOX); + SFX_ITEMSET_ARG(&aSet,pNumCharFmt,SfxStringItem,SID_NUM_CHAR_FMT); + SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT); + SFX_ITEMSET_ARG(&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM); if (pNumCharFmt &&pBulletCharFmt) SetCharFmts( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); @@ -3693,7 +3693,7 @@ void SvxNumOptionsTabPage::PageCreated(const SfxAllItemSet& aSet) void SvxNumPositionTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM,false); + SFX_ITEMSET_ARG(&aSet,pMetricItem,SfxAllEnumItem,SID_METRIC_ITEM); if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5f379daf7280..46c2b3e9f499 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1758,13 +1758,13 @@ bool SvxPageDescPage::IsMarginOutOfRange() void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE,false); - SFX_ITEMSET_ARG (&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START,false); - SFX_ITEMSET_ARG (&aSet,pPaperEndItem,SfxAllEnumItem,SID_PAPER_END,false); - SFX_ITEMSET_ARG (&aSet,pCollectListItem,SfxStringListItem,SID_COLLECT_LIST,false); + SFX_ITEMSET_ARG(&aSet,pModeItem,SfxAllEnumItem,SID_ENUM_PAGE_MODE); + SFX_ITEMSET_ARG(&aSet,pPaperStartItem,SfxAllEnumItem,SID_PAPER_START); + SFX_ITEMSET_ARG(&aSet,pPaperEndItem,SfxAllEnumItem,SID_PAPER_END); + SFX_ITEMSET_ARG(&aSet,pCollectListItem,SfxStringListItem,SID_COLLECT_LIST); //UUUU - SFX_ITEMSET_ARG (&aSet, pSupportDrawingLayerFillStyleItem, SfxBoolItem, SID_DRAWINGLAYER_FILLSTYLES, false); + SFX_ITEMSET_ARG(&aSet, pSupportDrawingLayerFillStyleItem, SfxBoolItem, SID_DRAWINGLAYER_FILLSTYLES); if (pModeItem) { diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 4b0830400560..8c010e609c3a 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -943,9 +943,9 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) 0x0008 --->EnableNegativeMode() 0x0010 --->EnableContextualMode() */ - SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,false); - SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,false); - SFX_ITEMSET_ARG (&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,false); + SFX_ITEMSET_ARG(&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH); + SFX_ITEMSET_ARG(&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET); + SFX_ITEMSET_ARG(&aSet,pLineDistItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST); if (pPageWidthItem) SetPageWidth(pPageWidthItem->GetValue()); @@ -1353,7 +1353,7 @@ void SvxParaAlignTabPage::EnableJustifyExt() void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,false); + SFX_ITEMSET_ARG(&aSet,pBoolItem,SfxBoolItem,SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT); if (pBoolItem) if(pBoolItem->GetValue()) EnableJustifyExt(); @@ -2166,7 +2166,7 @@ IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListB void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK,false); + SFX_ITEMSET_ARG(&aSet,pDisablePageBreakItem,SfxBoolItem,SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK); if (pDisablePageBreakItem) if ( pDisablePageBreakItem->GetValue()) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 20659bdc7f18..04d523b2bc34 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -689,7 +689,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void) void SvxTabulatorTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS,false); + SFX_ITEMSET_ARG(&aSet,pControlItem,SfxUInt16Item,SID_SVXTABULATORTABPAGE_CONTROLFLAGS); if (pControlItem) DisableControls(pControlItem->GetValue()); } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 1fc0b48f3f73..0ebb8ef9dad2 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -701,7 +701,7 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight() const void SvxTextAttrPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,false); + SFX_ITEMSET_ARG(&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW); if (pViewItem) SetView( static_cast<SdrView *>(pViewItem->GetValue())); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 35ff35f36152..3fdde8a72ecc 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -482,7 +482,7 @@ void SvxTransparenceTabPage::ChangesApplied() void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG(&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); @@ -577,8 +577,8 @@ void SvxTransparenceTabPage::InvalidatePreview (bool bEnable) void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE); + SFX_ITEMSET_ARG(&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); @@ -851,8 +851,8 @@ void SvxAreaTabPage::Construct() void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nCount(0); - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); - SFX_ITEMSET_ARG (&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,false); + SFX_ITEMSET_ARG(&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE); + SFX_ITEMSET_ARG(&rSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if (pPosItem) @@ -2447,16 +2447,16 @@ void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT eRcPt ) void SvxAreaTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,false); - SFX_ITEMSET_ARG (&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST,false); - SFX_ITEMSET_ARG (&aSet,pHatchingListItem,SvxHatchListItem,SID_HATCH_LIST,false); - SFX_ITEMSET_ARG (&aSet,pBitmapListItem,SvxBitmapListItem,SID_BITMAP_LIST,false); - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS,false); + SFX_ITEMSET_ARG(&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE); + SFX_ITEMSET_ARG(&aSet,pGradientListItem,SvxGradientListItem,SID_GRADIENT_LIST); + SFX_ITEMSET_ARG(&aSet,pHatchingListItem,SvxHatchListItem,SID_HATCH_LIST); + SFX_ITEMSET_ARG(&aSet,pBitmapListItem,SvxBitmapListItem,SID_BITMAP_LIST); + SFX_ITEMSET_ARG(&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE); + SFX_ITEMSET_ARG(&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE); + SFX_ITEMSET_ARG(&aSet,pPosItem,SfxUInt16Item,SID_TABPAGE_POS); //UUUU - SFX_ITEMSET_ARG (&aSet, pOfferImportItem, SfxBoolItem, SID_OFFER_IMPORT, false); + SFX_ITEMSET_ARG(&aSet, pOfferImportItem, SfxBoolItem, SID_OFFER_IMPORT); if (pColorListItem) SetColorList(pColorListItem->GetColorList()); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index c5bc272373be..9e85f092b047 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -557,7 +557,7 @@ void SvxLineTabPage::FillListboxes() void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG(&rSet,pPageTypeItem,CntUInt16Item,SID_PAGE_TYPE); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if( m_nDlgType == 0 && m_pDashList.is() ) @@ -1812,14 +1812,14 @@ void SvxLineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxLineTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,false); - SFX_ITEMSET_ARG (&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST,false); - SFX_ITEMSET_ARG (&aSet,pLineEndListItem,SvxLineEndListItem,SID_LINEEND_LIST,false); - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pSdrObjListItem,OfaPtrItem,SID_OBJECT_LIST,false); - SFX_ITEMSET_ARG (&aSet,pSymbolAttrItem,SfxTabDialogItem,SID_ATTR_SET,false); - SFX_ITEMSET_ARG (&aSet,pGraphicItem,SvxGraphicItem,SID_GRAPHIC,false); + SFX_ITEMSET_ARG(&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE); + SFX_ITEMSET_ARG(&aSet,pDashListItem,SvxDashListItem,SID_DASH_LIST); + SFX_ITEMSET_ARG(&aSet,pLineEndListItem,SvxLineEndListItem,SID_LINEEND_LIST); + SFX_ITEMSET_ARG(&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE); + SFX_ITEMSET_ARG(&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE); + SFX_ITEMSET_ARG(&aSet,pSdrObjListItem,OfaPtrItem,SID_OBJECT_LIST); + SFX_ITEMSET_ARG(&aSet,pSymbolAttrItem,SfxTabDialogItem,SID_ATTR_SET); + SFX_ITEMSET_ARG(&aSet,pGraphicItem,SvxGraphicItem,SID_GRAPHIC); if (pColorListItem) SetColorList(pColorListItem->GetColorList()); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index afb9c9306b12..39e31b08845e 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -201,7 +201,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) sal_Int32 nPos; sal_Int32 nCount; - SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); + SFX_ITEMSET_ARG(&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); @@ -564,9 +564,9 @@ void SvxShadowTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) void SvxShadowTabPage::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,false); - SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,false); - SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE); + SFX_ITEMSET_ARG(&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE); + SFX_ITEMSET_ARG(&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE); if (pColorListItem) SetColorList(pColorListItem->GetColorList()); diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index e9ac976a5025..8155aa5b0e57 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -118,9 +118,9 @@ template<class T> bool checkSfxPoolItem(const SfxPoolItem* pItem) #define SFX_REQUEST_ARG(rReq, pItem, ItemType, nSlotId, bDeep) \ const ItemType *pItem = static_cast<const ItemType*>( \ rReq.GetArg( nSlotId, bDeep, checkSfxPoolItem<ItemType> ) ) -#define SFX_ITEMSET_ARG(pArgs, pItem, ItemType, nSlotId, bDeep) \ +#define SFX_ITEMSET_ARG(pArgs, pItem, ItemType, nSlotId) \ const ItemType *pItem = static_cast<const ItemType*>( \ - SfxRequest::GetItem( pArgs, nSlotId, bDeep, checkSfxPoolItem<ItemType> ) ) + SfxRequest::GetItem( pArgs, nSlotId, false, checkSfxPoolItem<ItemType> ) ) #endif diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index b3718366d1af..8022f4f6403e 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -343,13 +343,13 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUS uno::Sequence< beans::NamedValue > XclExpRoot::GetEncryptionData() const { uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( GetMedium().GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); + SFX_ITEMSET_ARG(GetMedium().GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; else { // try to get the encryption data from the password - SFX_ITEMSET_ARG( GetMedium().GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false ); + SFX_ITEMSET_ARG(GetMedium().GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) aEncryptionData = GenerateEncryptionData( pPasswordItem->GetValue() ); } diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index b69fa64fc5cf..7c1c89d5a612 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -105,12 +105,12 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords ) { uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; OUString aPassword; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 524bd341d15d..bbd008639162 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -568,7 +568,7 @@ bool ScDocShell::Load( SfxMedium& rMedium ) { if (GetMedium()) { - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; } @@ -860,7 +860,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) aValues[0].Name = "FilterName"; aValues[0].Value <<= OUString( GetMedium()->GetFilter()->GetFilterName() ); - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aValues.realloc( 2 ); @@ -983,7 +983,7 @@ bool ScDocShell::LoadFrom( SfxMedium& rMedium ) if (GetMedium()) { - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; } @@ -1052,7 +1052,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) // So make sure that we transfer the whole file with CreateFileStream rMedium.GetPhysicalName(); //! Call CreateFileStream directly, if available - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; const SfxFilter* pFilter = rMedium.GetFilter(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index d923654d4ebd..e9afbb60c010 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2365,7 +2365,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() if ( GetMedium() ) { - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aArgs.realloc( 2 ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 12d61c54102f..9556611b18fd 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2349,8 +2349,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pDlg->Execute() == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pItem && pFontItem ) { diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 00b324e0cc25..c5f812ffdcb2 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -64,7 +64,7 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); + SFX_ITEMSET_ARG(pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS); if ( !pGalleryItem ) return; diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 9bbaa7c6e13b..40cadfc8ed01 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -353,8 +353,8 @@ bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( &rFrame.GetWindow(), aSet, rFrame.GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if ( pDlg->Execute() == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pItem ) rString = pItem->GetValue(); if ( pFontItem ) diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 47ba9f569bb6..7cb6a60151f5 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1542,7 +1542,7 @@ void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const OUString& rP if(pMedium && pMedium->IsStorage()) { SfxItemSet * pSet = pMedium->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); + SFX_ITEMSET_ARG(pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); uno::Sequence < beans::NamedValue > aEncryptionData; if (pEncryptionDataItem) pEncryptionDataItem->GetValue() >>= aEncryptionData; diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 0585682cd3b5..fe9df81505c4 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -253,7 +253,7 @@ void SdPrintOptions::PageCreated (const SfxAllItemSet& ) { #ifdef MACOSX - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,false); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 6d9dac5f2806..46475ca2e3df 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -662,7 +662,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls() void SdTpOptionsMisc::PageCreated(const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,false); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG); if (pFlagItem) { sal_uInt32 nFlags=pFlagItem->GetValue(); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 461749f55bd0..030fcbcf56c3 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -202,8 +202,8 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pFItem ) { aFont.SetName( pFItem->GetFamilyName() ); diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index f13a8035cc0a..c98b2300ddb6 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -68,7 +68,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq ) } const SfxItemSet* pArgs = rReq.GetArgs(); - SFX_ITEMSET_ARG( pArgs, pPageItem, SfxStringItem, FN_PARAM_1, false ); + SFX_ITEMSET_ARG(pArgs, pPageItem, SfxStringItem, FN_PARAM_1); if ( !pArgs || pPageItem ) { diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index e3c527af1a96..2e4d14e0ab1d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2596,7 +2596,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) // actually it runs always in window mode in case of ActiveX control if ( !maPresSettings.mbFullScreen && mpDocSh && mpDocSh->GetMedium() ) { - SFX_ITEMSET_ARG( mpDocSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, false ); + SFX_ITEMSET_ARG(mpDocSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY); if ( pItem && pItem->GetValue() ) { // this is a plugin/activex mode, no toolbars should be visible during slide show diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index dd215abec346..7d4388ef7bec 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -912,7 +912,7 @@ bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) co if (pMedium == NULL) break; - SFX_ITEMSET_ARG(pMedium->GetItemSet(),pViewOnlyItem,SfxBoolItem,SID_VIEWONLY,false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(),pViewOnlyItem,SfxBoolItem,SID_VIEWONLY); if (pViewOnlyItem == NULL) break; diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 7623e4bbb0c0..70444ab7df79 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -74,7 +74,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) const SfxItemSet* pArgs = rReq.GetArgs(); - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); + SFX_ITEMSET_ARG(pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS); if ( !pGalleryItem ) return; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index cb74ee028399..3aecc38f4007 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, false); + SFX_ITEMSET_ARG(pSet, pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); + SFX_ITEMSET_ARG(pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index e08fb056db53..9bd8e892a335 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -360,7 +360,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Reference< XFrame > xFrame; const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl(); - SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); + SFX_ITEMSET_ARG(pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); @@ -1142,7 +1142,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< XFrame > xFrame; const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl(); - SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); + SFX_ITEMSET_ARG(pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index c5cd347ae427..b0b1c8a08127 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, false ); + SFX_ITEMSET_ARG(&rSet, pItem, SfxPoolItem, nWhich); 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, false ); + SFX_ITEMSET_ARG(&rSet, pItem, SfxPoolItem, nWhich); if ( pItem ) //??? { sal_uInt16 nSubCount = rArg.pType->nAttribs; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index edb8f4d00f3b..2c08d3871e85 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, false ); + SFX_ITEMSET_ARG(pShell->GetMedium()->GetItemSet(), pItem, SfxUInt16Item, SID_UPDATEDOCMODE); if ( pItem ) nUpdateMode = pItem->GetValue(); } diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index f3930bef0732..32179734f293 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, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pPicklistItem, SfxBoolItem, SID_PICKLIST); 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, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); 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 d1f2b7657b41..e1d4db121284 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, false ); + SFX_ITEMSET_ARG(pObjShell->GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) return true; } diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index e4116ea3c951..c978a19ae798 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -574,7 +574,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** pOldFilter = 0; else { - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if ( ( pOldFilter->GetFilterFlags() & SfxFilterFlags::PACKED ) && pSalvageItem ) // Salvage is always done without packing pOldFilter = 0; @@ -584,7 +584,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** const SfxFilter* pFilter = pOldFilter; bool bPreview = rMedium.IsPreview_Impl(); - SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER); if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) ) return ERRCODE_ABORT; @@ -621,7 +621,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** } bool bHidden = bPreview; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS); if ( !bHidden && pFlags ) { OUString aFlags( pFlags->GetValue() ); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index c3aacf3c8ff3..b9af39dcbfdd 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -280,11 +280,11 @@ bool SfxProgress::SetState { // don't show status indicator for hidden documents (only valid while loading) SfxMedium* pMedium = pObjSh->GetMedium(); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL); Reference< XStatusIndicator > xInd; if ( pIndicatorItem && (pIndicatorItem->GetValue()>>=xInd) ) pImp->xStatusInd = xInd; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index a50c052fb14c..353223eb3df1 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1300,7 +1300,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne { bool bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER ); SfxObjectShell* pSh = xImp->pFrame->GetObjectShell(); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, false ); + SFX_ITEMSET_ARG(pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY); bool bIsViewer = pItem && pItem->GetValue(); if ( bIsViewer != bViewerTbx ) continue; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index cddec72cb564..b7030c2e565d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -712,7 +712,7 @@ void SfxDocumentDescPage::Reset(const SfxItemSet *rSet) m_pKeywordsEd->SetText( m_pInfoItem->getKeywords() ); m_pCommentEd->SetText( m_pInfoItem->getDescription() ); - SFX_ITEMSET_ARG( rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, false ); + SFX_ITEMSET_ARG(rSet, pROItem, SfxBoolItem, SID_DOC_READONLY); if ( pROItem && pROItem->GetValue() ) { m_pTitleEd->SetReadOnly(); @@ -919,7 +919,7 @@ void SfxDocumentPage::ImplCheckPasswordState() SfxItemSet* pMedSet = pShell->GetMedium()->GetItemSet(); if (!pMedSet) break; - SFX_ITEMSET_ARG( pMedSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); + SFX_ITEMSET_ARG(pMedSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); uno::Sequence< beans::NamedValue > aEncryptionData; if (pEncryptionDataItem) pEncryptionDataItem->GetValue() >>= aEncryptionData; @@ -1154,7 +1154,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, static_cast<const SfxDocumentInfoItem &>(rItemSet.Get( SID_DOCINFO )); #ifdef DBG_UTIL - SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, false ); + SFX_ITEMSET_ARG(&rItemSet, pURLItem, SfxStringItem, SID_BASEURL); DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" ); #endif diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 6bbddc0e744e..611e32ef1840 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1374,15 +1374,15 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, // check password checkbox if the document had password before if( mbHasPassword ) { - SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, false ); + SFX_ITEMSET_ARG(rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION); mbPwdCheckBoxState = ( pPassItem != NULL && pPassItem->GetValue() ); // in case the document has password to modify, the dialog should be shown - SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, false ); + SFX_ITEMSET_ARG(rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO); mbPwdCheckBoxState |= ( pPassToModifyItem && pPassToModifyItem->GetValue().hasValue() ); } - SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, false ); + SFX_ITEMSET_ARG(rpSet, pSelectItem, SfxBoolItem, SID_SELECTION); if ( pSelectItem ) mbSelection = pSelectItem->GetValue(); else diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 40c5ea0e433a..a72ab28ce2b3 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -445,8 +445,8 @@ IMPL_LINK_TYPED( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) aSet.Put( SfxStringItem( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ) ); SfxItemSet* pSet = pObjShell->GetMedium()->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, false ); - SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, false ); + SFX_ITEMSET_ARG(pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME); + SFX_ITEMSET_ARG(pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS); if ( pFilterItem ) aSet.Put( *pFilterItem ); if ( pFilterOptItem ) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 5843f5ab3f57..746eed2b960f 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -418,7 +418,7 @@ Reference < XContent > SfxMedium::GetContent() const Reference < ::com::sun::star::ucb::XContent > xContent; Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; - SFX_ITEMSET_ARG( pImp->m_pSet, pItem, SfxUnoAnyItem, SID_CONTENT, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pItem, SfxUnoAnyItem, SID_CONTENT); if ( pItem ) pItem->GetValue() >>= xContent; @@ -712,12 +712,12 @@ bool SfxMedium::IsStorage() bool SfxMedium::IsPreview_Impl() { bool bPreview = false; - SFX_ITEMSET_ARG( GetItemSet(), pPreview, SfxBoolItem, SID_PREVIEW, false); + SFX_ITEMSET_ARG(GetItemSet(), pPreview, SfxBoolItem, SID_PREVIEW); if ( pPreview ) bPreview = pPreview->GetValue(); else { - SFX_ITEMSET_ARG( GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false); + SFX_ITEMSET_ARG(GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS); if ( pFlags ) { OUString aFileFlags = pFlags->GetValue(); @@ -961,7 +961,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) if ( !bResult ) { // no read-write access is necessary on loading if the document is explicitly opened as copy - SFX_ITEMSET_ARG( GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, false ); + SFX_ITEMSET_ARG(GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE); bResult = ( bLoading && pTemplateItem && pTemplateItem->GetValue() ); } @@ -1036,7 +1036,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) { // the error should be set in case it is storing process // or the document has been opened for editing explicitly - SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY); if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); @@ -1073,7 +1073,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) if ( !bResult ) { // no read-write access is necessary on loading if the document is explicitly opened as copy - SFX_ITEMSET_ARG( GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); + SFX_ITEMSET_ARG(GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE); bResult = ( bLoading && pTemplateItem && pTemplateItem->GetValue() ); } @@ -1270,7 +1270,7 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool bNoUI ) { // the error should be set in case it is storing process // or the document has been opened for editing explicitly - SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY); if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); @@ -1309,7 +1309,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo ) if ( GetError() ) return pImp->xStorage; - SFX_ITEMSET_ARG( GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, false); + SFX_ITEMSET_ARG(GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE); if ( pRepairItem && pRepairItem->GetValue() ) { // the storage should be created for repairing mode @@ -1319,7 +1319,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo ) Reference< ::com::sun::star::ucb::XProgressHandler > xProgressHandler; Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator; - SFX_ITEMSET_ARG( GetItemSet(), pxProgressItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, false ); + SFX_ITEMSET_ARG(GetItemSet(), pxProgressItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL); if( pxProgressItem && ( pxProgressItem->GetValue() >>= xStatusIndicator ) ) xProgressHandler = Reference< ::com::sun::star::ucb::XProgressHandler >( new utl::ProgressHandlerWrap( xStatusIndicator ) ); @@ -1385,7 +1385,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo ) GetVersionList(); } - SFX_ITEMSET_ARG( pImp->m_pSet, pVersion, SfxInt16Item, SID_VERSION, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pVersion, SfxInt16Item, SID_VERSION); bool bResetStorage = false; if ( pVersion && pVersion->GetValue() ) @@ -1690,8 +1690,8 @@ bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, if( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext(), aTempCont ) ) { bool bTransactStarted = false; - SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, false ); - SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, false ); + SFX_ITEMSET_ARG(GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE); + SFX_ITEMSET_ARG(GetItemSet(), pRename, SfxBoolItem, SID_RENAME); bool bRename = pRename && pRename->GetValue(); bool bOverWrite = pOverWrite ? pOverWrite->GetValue() : !bRename; @@ -1776,14 +1776,14 @@ bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet // if the document had no password it should be stored without password // if the document had password it should be stored with the same password // otherwise the stream copying can not be done - SFX_ITEMSET_ARG( &aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD, false ); - SFX_ITEMSET_ARG( GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD, false ); + SFX_ITEMSET_ARG(&aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD); + SFX_ITEMSET_ARG(GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD); if ( ( !pNewPassItem && !pOldPassItem ) || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue() == pOldPassItem->GetValue() ) ) { // the filter must be the same - SFX_ITEMSET_ARG( &aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME, false ); - SFX_ITEMSET_ARG( GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(&aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME); + SFX_ITEMSET_ARG(GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME); if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue() == pOldFilterItem->GetValue() ) { // get the input stream and copy it @@ -1808,8 +1808,8 @@ bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet InsertCommandArgument aInsertArg; aInsertArg.Data = xInStream; - SFX_ITEMSET_ARG( &aTargetSet, pRename, SfxBoolItem, SID_RENAME, false ); - SFX_ITEMSET_ARG( &aTargetSet, pOverWrite, SfxBoolItem, SID_OVERWRITE, false ); + SFX_ITEMSET_ARG(&aTargetSet, pRename, SfxBoolItem, SID_RENAME); + SFX_ITEMSET_ARG(&aTargetSet, pOverWrite, SfxBoolItem, SID_OVERWRITE); if ( (pOverWrite && !pOverWrite->GetValue()) // argument says: never overwrite || (pRename && pRename->GetValue()) ) // argument says: rename file aInsertArg.ReplaceExisting = false; @@ -1862,7 +1862,7 @@ void SfxMedium::Transfer_Impl() if (pImp->m_aLogicName.startsWith("private:stream")) { // TODO/LATER: support storing to SID_STREAM - SFX_ITEMSET_ARG( pImp->m_pSet, pOutStreamItem, SfxUnoAnyItem, SID_OUTPUTSTREAM, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pOutStreamItem, SfxUnoAnyItem, SID_OUTPUTSTREAM); if( pOutStreamItem && ( pOutStreamItem->GetValue() >>= rOutStream ) ) { if ( pImp->xStorage.is() ) @@ -1926,7 +1926,7 @@ void SfxMedium::Transfer_Impl() return; } - SFX_ITEMSET_ARG( GetItemSet(), pSegmentSize, SfxInt32Item, SID_SEGMENTSIZE, false); + SFX_ITEMSET_ARG(GetItemSet(), pSegmentSize, SfxInt32Item, SID_SEGMENTSIZE); if ( pSegmentSize ) { // this file must be stored into a disk spanned package @@ -2059,8 +2059,8 @@ void SfxMedium::Transfer_Impl() (void)::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent ); // check for external parameters that may customize the handling of NameClash situations - SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, false ); - SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, false ); + SFX_ITEMSET_ARG(GetItemSet(), pRename, SfxBoolItem, SID_RENAME); + SFX_ITEMSET_ARG(GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE); sal_Int32 nNameClash; if ( pOverWrite && !pOverWrite->GetValue() ) // argument says: never overwrite @@ -2081,9 +2081,9 @@ void SfxMedium::Transfer_Impl() if ( IsInCheckIn( ) ) { eOperation = ::ucbhelper::InsertOperation_CHECKIN; - SFX_ITEMSET_ARG( GetItemSet(), pMajor, SfxBoolItem, SID_DOCINFO_MAJOR, false ); + SFX_ITEMSET_ARG(GetItemSet(), pMajor, SfxBoolItem, SID_DOCINFO_MAJOR); bMajor = pMajor && pMajor->GetValue( ); - SFX_ITEMSET_ARG( GetItemSet(), pComments, SfxStringItem, SID_DOCINFO_COMMENTS, false ); + SFX_ITEMSET_ARG(GetItemSet(), pComments, SfxStringItem, SID_DOCINFO_COMMENTS); if ( pComments ) sComment = pComments->GetValue( ); } @@ -2302,7 +2302,7 @@ void SfxMedium::GetLockingStream_Impl() if ( GetURLObject().GetProtocol() == INetProtocol::File && !pImp->m_xLockingStream.is() ) { - SFX_ITEMSET_ARG( pImp->m_pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM); if ( pWriteStreamItem ) pWriteStreamItem->GetValue() >>= pImp->m_xLockingStream; @@ -2344,8 +2344,8 @@ void SfxMedium::GetMedium_Impl() Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = GetInteractionHandler(); //TODO/MBA: need support for SID_STREAM - SFX_ITEMSET_ARG( pImp->m_pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM, false); - SFX_ITEMSET_ARG( pImp->m_pSet, pInStreamItem, SfxUnoAnyItem, SID_INPUTSTREAM, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pWriteStreamItem, SfxUnoAnyItem, SID_STREAM); + SFX_ITEMSET_ARG(pImp->m_pSet, pInStreamItem, SfxUnoAnyItem, SID_INPUTSTREAM); if ( pWriteStreamItem ) { pWriteStreamItem->GetValue() >>= pImp->xStream; @@ -2524,7 +2524,7 @@ void SfxMedium::Init_Impl() // TODO/LATER: handle lifetime of storages pImp->bDisposeStorage = false; - SFX_ITEMSET_ARG( pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if ( pSalvageItem && pSalvageItem->GetValue().isEmpty() ) { pSalvageItem = NULL; @@ -2567,7 +2567,7 @@ void SfxMedium::Init_Impl() // in case output stream is by mistake here // clear the reference - SFX_ITEMSET_ARG( pImp->m_pSet, pOutStreamItem, SfxUnoAnyItem, SID_OUTPUTSTREAM, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pOutStreamItem, SfxUnoAnyItem, SID_OUTPUTSTREAM); if( pOutStreamItem && ( !( pOutStreamItem->GetValue() >>= rOutStream ) || !pImp->m_aLogicName.startsWith("private:stream")) ) @@ -2579,7 +2579,7 @@ void SfxMedium::Init_Impl() if (!pImp->m_aLogicName.isEmpty()) { // if the logic name is set it should be set in MediaDescriptor as well - SFX_ITEMSET_ARG( pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME); if ( !pFileNameItem ) { // let the ItemSet be created if necessary @@ -2630,7 +2630,7 @@ SfxMedium::GetInteractionHandler( bool bGetAlways ) if ( pImp->m_pSet ) { ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xHandler; - SFX_ITEMSET_ARG( pImp->m_pSet, pHandler, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); + SFX_ITEMSET_ARG(pImp->m_pSet, pHandler, SfxUnoAnyItem, SID_INTERACTIONHANDLER); if ( pHandler && (pHandler->GetValue() >>= xHandler) && xHandler.is() ) return xHandler; } @@ -2999,7 +2999,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : pImp->m_pFilter = pImp->m_pCustomFilter.get(); } - SFX_ITEMSET_ARG( pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if( pSalvageItem ) { // QUESTION: there is some treatment of Salvage in Init_Impl; align! @@ -3008,7 +3008,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file // that must be copied here - SFX_ITEMSET_ARG( pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME); if (!pFileNameItem) throw uno::RuntimeException(); OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() ); if ( !aNewTempFileURL.isEmpty() ) @@ -3026,11 +3026,11 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : } bool readOnly = false; - SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY); if ( pReadOnlyItem && pReadOnlyItem->GetValue() ) readOnly = true; - SFX_ITEMSET_ARG( pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME); if (!pFileNameItem) throw uno::RuntimeException(); pImp->m_aLogicName = pFileNameItem->GetValue(); pImp->m_nStorOpenMode = readOnly ? SFX_STREAM_READONLY : SFX_STREAM_READWRITE; @@ -3341,7 +3341,7 @@ bool SfxMedium::IsReadOnly() const // c) the API can force the readonly state! if (!bReadOnly) { - SFX_ITEMSET_ARG( GetItemSet(), pItem, SfxBoolItem, SID_DOC_READONLY, false); + SFX_ITEMSET_ARG(GetItemSet(), pItem, SfxBoolItem, SID_DOC_READONLY); if (pItem) bReadOnly = pItem->GetValue(); } @@ -3743,7 +3743,7 @@ OUString SfxMedium::SwitchDocumentToTempFile() // remove the readonly state bool bWasReadonly = false; pImp->m_nStorOpenMode = SFX_STREAM_READWRITE; - SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, false ); + SFX_ITEMSET_ARG(pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY); if ( pReadOnlyItem && pReadOnlyItem->GetValue() ) bWasReadonly = true; GetItemSet()->ClearItem( SID_DOC_READONLY ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e0ba8c5c25fa..4c70d0c2f031 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1043,7 +1043,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // the following two arguments can not be converted in MediaDescriptor, // so they should be removed from the ItemSet after retrieving - SFX_ITEMSET_ARG( pDialogParams, pRecommendReadOnly, SfxBoolItem, SID_RECOMMENDREADONLY, false ); + SFX_ITEMSET_ARG(pDialogParams, pRecommendReadOnly, SfxBoolItem, SID_RECOMMENDREADONLY); m_bRecommendReadOnly = ( pRecommendReadOnly && pRecommendReadOnly->GetValue() ); pDialogParams->ClearItem( SID_RECOMMENDREADONLY ); diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 503318cb9cbc..0af7fe7e89c1 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -396,7 +396,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() ) return; - SFX_ITEMSET_ARG( pFile->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(pFile->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); sal_Int16 bCanUpdateFromTemplate = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; // created from template? diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 46516211d5ee..66a4ce5f0bbc 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -835,7 +835,7 @@ OUString SfxObjectShell::GetTitle if ( pMed ) { - SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE); if ( pNameItem ) aTitle = pNameItem->GetValue(); } @@ -862,7 +862,7 @@ OUString SfxObjectShell::GetTitle // If a specific title was given at open: // important for URLs: use INetProtocol::File for which the set title is not // considered. (See below, analysis of aTitleMap_Impl) - SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE); if ( pNameItem ) return X( pNameItem->GetValue() ); } @@ -1024,7 +1024,7 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) SfxApplication* pSfxApp = SfxGetpApp(); if ( !pSfxApp->IsDowning() && !IsLoading() && pFrame && !pFrame->GetFrame().IsClosing_Impl() ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { sal_uInt16 nId = pImp->nEventId; @@ -1162,7 +1162,7 @@ void SfxObjectShell::InitOwnModel_Impl() { if ( !pImp->bModelInitialized ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if ( pSalvageItem ) { pImp->aTempName = pMedium->GetPhysicalName(); @@ -1197,7 +1197,7 @@ void SfxObjectShell::InitOwnModel_Impl() void SfxObjectShell::FinishedLoading( SfxLoadedFlags nFlags ) { bool bSetModifiedTRUE = false; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if( ( nFlags & SfxLoadedFlags::MAINDOCUMENT ) && !(pImp->nLoadedFlags & SfxLoadedFlags::MAINDOCUMENT ) && !(pImp->nFlagsInProgress & SfxLoadedFlags::MAINDOCUMENT )) { @@ -1258,7 +1258,7 @@ void SfxObjectShell::FinishedLoading( SfxLoadedFlags nFlags ) if ( (pImp->nLoadedFlags & SfxLoadedFlags::MAINDOCUMENT ) && (pImp->nLoadedFlags & SfxLoadedFlags::IMAGES ) ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE); bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); // closing the streams on loading should be under control of SFX! @@ -1296,7 +1296,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() if ( pTmpMedium ) { OUString aName( pTmpMedium->GetName() ); - SFX_ITEMSET_ARG( pTmpMedium->GetItemSet(), pTemplNamItem, SfxStringItem, SID_TEMPLATE_NAME, false); + SFX_ITEMSET_ARG(pTmpMedium->GetItemSet(), pTemplNamItem, SfxStringItem, SID_TEMPLATE_NAME); OUString aTemplateName; if ( pTemplNamItem ) aTemplateName = pTemplNamItem->GetValue(); @@ -1342,7 +1342,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() assert(pMedium != 0); if( ok ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); bool bSalvage = pSalvageItem != nullptr; if ( !bSalvage ) @@ -1685,7 +1685,7 @@ bool SfxObjectShell::IsPreview() const return false; bool bPreview = false; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS); if ( pFlags ) { // Distributed values among individual items @@ -1697,7 +1697,7 @@ bool SfxObjectShell::IsPreview() const if ( !bPreview ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pItem, SfxBoolItem, SID_PREVIEW, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pItem, SfxBoolItem, SID_PREVIEW); if ( pItem ) bPreview = pItem->GetValue(); } @@ -1750,7 +1750,7 @@ vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) { vcl::Window* pWindow = 0; SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, false ); + SFX_ITEMSET_ARG(pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME); if ( pUnoItem ) { uno::Reference < frame::XFrame > xFrame( pUnoItem->GetFrame() ); @@ -1760,7 +1760,7 @@ vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) if ( !pWindow ) { SfxFrame* pFrame = 0; - SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, false ); + SFX_ITEMSET_ARG(pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME); if( pFrameItem && pFrameItem->GetFrame() ) // get target frame from ItemSet pFrame = pFrameItem->GetFrame(); @@ -1783,7 +1783,7 @@ vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) if ( pWindow ) { // this frame may be invisible, show it if it is allowed - SFX_ITEMSET_ARG( pSet, pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); + SFX_ITEMSET_ARG(pSet, pHiddenItem, SfxBoolItem, SID_HIDDEN); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { pWindow->Show(); @@ -1861,7 +1861,7 @@ sal_Int16 SfxObjectShell_Impl::getCurrentMacroExecMode() const OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getCurrentMacroExecMode: no medium!" ); if ( pMedium ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pMacroModeItem, SfxUInt16Item, SID_MACROEXECMODE, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pMacroModeItem, SfxUInt16Item, SID_MACROEXECMODE); if ( pMacroModeItem ) nImposedExecMode = pMacroModeItem->GetValue(); } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 2b80ec9e9d96..7e33950825b8 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -277,14 +277,14 @@ bool SfxObjectShell::APISaveAs_Impl if ( GetMedium() ) { OUString aFilterName; - SFX_ITEMSET_ARG( aParams, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(aParams, pFilterNameItem, SfxStringItem, SID_FILTER_NAME); if( pFilterNameItem ) { aFilterName = pFilterNameItem->GetValue(); } else { - SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, false ); + SFX_ITEMSET_ARG(aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE); if ( pContentTypeItem ) { const SfxFilter* pFilter = SfxFilterMatcher( OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SfxFilterFlags::EXPORT ); @@ -310,7 +310,7 @@ bool SfxObjectShell::APISaveAs_Impl SfxObjectShellRef xLock( this ); // ??? // use the title that is provided in the media descriptor - SFX_ITEMSET_ARG( aParams, pDocTitleItem, SfxStringItem, SID_DOCINFO_TITLE, false ); + SFX_ITEMSET_ARG(aParams, pDocTitleItem, SfxStringItem, SID_DOCINFO_TITLE); if ( pDocTitleItem ) getDocProperties()->setTitle( pDocTitleItem->GetValue() ); @@ -503,7 +503,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) ScopedVclPtr<SfxDocumentInfoDialog> pDlg(CreateDocumentInfoDialog(0, aSet)); if ( RET_OK == pDlg->Execute() ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, false); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO); if ( pDocInfoItem ) { // user has done some changes to DocumentInfo @@ -565,7 +565,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( nId == SID_SAVEASDOC || nId == SID_SAVEASREMOTE ) { // in case of plugin mode the SaveAs operation means SaveTo - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, false ); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) rReq.AppendItem( SfxBoolItem( SID_SAVETO, true ) ); } @@ -636,8 +636,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) bool bPreselectPassword = false; - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, false ); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD); if ( pOldEncryptionDataItem || pOldPasswordItem ) bPreselectPassword = true; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 507099443a94..8998ace450a8 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -188,7 +188,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named bool bResult = false; if ( pSet ) { - SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); + SFX_ITEMSET_ARG(pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionDataItem ) { pEncryptionDataItem->GetValue() >>= o_rEncryptionData; @@ -196,7 +196,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named } else { - SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, false); + SFX_ITEMSET_ARG(pSet, pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem ) { OUString aPassword = pPasswordItem->GetValue(); @@ -639,19 +639,15 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SfxItemSet* pSet = pMedium->GetItemSet(); if( !pImp->nEventId ) { - SFX_ITEMSET_ARG( - pSet, pTemplateItem, SfxBoolItem, - SID_TEMPLATE, false); + SFX_ITEMSET_ARG(pSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE); SetActivateEvent_Impl( ( pTemplateItem && pTemplateItem->GetValue() ) ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ); } - - SFX_ITEMSET_ARG( pSet, pBaseItem, SfxStringItem, - SID_BASEURL, false); + SFX_ITEMSET_ARG(pSet, pBaseItem, SfxStringItem, SID_BASEURL); OUString aBaseURL; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if( pBaseItem ) aBaseURL = pBaseItem->GetValue(); else @@ -698,7 +694,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) try { bool bWarnMediaTypeFallback = false; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairPackageItem, SfxBoolItem, SID_REPAIRPACKAGE, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pRepairPackageItem, SfxBoolItem, SID_REPAIRPACKAGE); // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); @@ -733,7 +729,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( bOk ) { // the document loaded from template has no name - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE); if ( !pTemplateItem || !pTemplateItem->GetValue() ) bHasName = true; } @@ -853,9 +849,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( SfxObjectCreateMode::EMBEDDED != eCreateMode ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pAsTempItem, SfxBoolItem, SID_TEMPLATE, false); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPreviewItem, SfxBoolItem, SID_PREVIEW, false); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pAsTempItem, SfxBoolItem, SID_TEMPLATE); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pPreviewItem, SfxBoolItem, SID_PREVIEW); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN); if( bOk && !pMedium->GetOrigURL().isEmpty() && !( pAsTempItem && pAsTempItem->GetValue() ) && !( pPreviewItem && pPreviewItem->GetValue() ) @@ -865,8 +861,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) } } - const SfxBoolItem* pDdeReconnectItem = static_cast<const SfxBoolItem*>( - SfxRequest::GetItem(pMedium->GetItemSet(), SID_DDE_RECONNECT_ONLOAD, false, checkSfxPoolItem< SfxBoolItem >)); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pDdeReconnectItem, SfxBoolItem, SID_DDE_RECONNECT_ONLOAD); bool bReconnectDde = true; // by default, we try to auto-connect DDE connections. if (pDdeReconnectItem) @@ -889,8 +884,8 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo { sal_uInt32 nError = ERRCODE_NONE; SfxItemSet* pSet = pMedium->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false ); - SFX_ITEMSET_ARG( pSet, pData, SfxUnoAnyItem, SID_FILTER_DATA, false ); + SFX_ITEMSET_ARG(pSet, pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS); + SFX_ITEMSET_ARG(pSet, pData, SfxUnoAnyItem, SID_FILTER_DATA); if ( !pData && !pOptions ) { com::sun::star::uno::Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); @@ -947,19 +942,11 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo aNewParams, NULL ); - SFX_ITEMSET_ARG( &aNewParams, - pFilterOptions, - SfxStringItem, - SID_FILE_FILTEROPTIONS, - false ); + SFX_ITEMSET_ARG(&aNewParams, pFilterOptions, SfxStringItem, SID_FILE_FILTEROPTIONS); if ( pFilterOptions ) pSet->Put( *pFilterOptions ); - SFX_ITEMSET_ARG( &aNewParams, - pFilterData, - SfxUnoAnyItem, - SID_FILTER_DATA, - false ); + SFX_ITEMSET_ARG(&aNewParams, pFilterData, SfxUnoAnyItem, SID_FILTER_DATA); if ( pFilterData ) pSet->Put( *pFilterData ); } @@ -1204,7 +1191,7 @@ bool SfxObjectShell::SaveTo_Impl SfxItemSet *pMedSet = rMedium.GetItemSet(); if( pMedSet ) { - SFX_ITEMSET_ARG( pMedSet, pSaveToItem, SfxBoolItem, SID_SAVETO, false ); + SFX_ITEMSET_ARG(pMedSet, pSaveToItem, SfxBoolItem, SID_SAVETO); bCopyTo = GetCreateMode() == SfxObjectCreateMode::EMBEDDED || (pSaveToItem && pSaveToItem->GetValue()); } @@ -2539,7 +2526,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // an interaction handler here can acquire only in case of GUI Saving // and should be removed after the saving is done com::sun::star::uno::Reference< XInteractionHandler > xInteract; - SFX_ITEMSET_ARG( pArgs, pxInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false ); + SFX_ITEMSET_ARG(pArgs, pxInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER); if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) && xInteract.is() ) pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny( xInteract ) ) ); @@ -2596,10 +2583,10 @@ bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) pImp->bIsSaving = true; bool bSaved = false; - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if ( pSalvageItem ) { - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, false); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME); OUString aFilterName; const SfxFilter *pFilter = NULL; if ( pFilterItem ) @@ -2608,7 +2595,7 @@ bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) SfxMedium *pMed = new SfxMedium( pSalvageItem->GetValue(), STREAM_READWRITE | StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC, pFilter ); - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false ); + SFX_ITEMSET_ARG(GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem ) pMed->GetItemSet()->Put( *pPasswordItem ); @@ -2664,7 +2651,7 @@ bool SfxObjectShell::CommonSaveAs_Impl DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "Illegal URL!" ); DBG_ASSERT( aParams->Count() != 0, "Incorrect Parameter"); - SFX_ITEMSET_ARG( aParams, pSaveToItem, SfxBoolItem, SID_SAVETO, false ); + SFX_ITEMSET_ARG(aParams, pSaveToItem, SfxBoolItem, SID_SAVETO); bool bSaveTo = pSaveToItem && pSaveToItem->GetValue(); const SfxFilter* pFilter = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ); @@ -2676,7 +2663,7 @@ bool SfxObjectShell::CommonSaveAs_Impl return false; } - SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, false ); + SFX_ITEMSET_ARG(aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE); if ( bSaveTo && pCopyStreamItem && pCopyStreamItem->GetValue() && !IsModified() ) { if ( pMedium->TryDirectTransfer( aURL.GetMainURL( INetURLObject::NO_DECODE ), *aParams ) ) @@ -2834,7 +2821,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl } // check if a "SaveTo" is wanted, no "SaveAs" - SFX_ITEMSET_ARG( pParams, pSaveToItem, SfxBoolItem, SID_SAVETO, false ); + SFX_ITEMSET_ARG(pParams, pSaveToItem, SfxBoolItem, SID_SAVETO); bool bCopyTo = GetCreateMode() == SfxObjectCreateMode::EMBEDDED || (pSaveToItem && pSaveToItem->GetValue()); // distinguish between "Save" and "SaveAs" @@ -3060,7 +3047,7 @@ bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium ) if ( xStorage.is() ) { // Password - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, false ); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD); if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, SfxGetpApp()->GetPool(), pMedium ) ) { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index c5adfa0252c8..1a8c6c750dee 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -1105,8 +1105,8 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte { uno::Sequence < beans::PropertyValue > aProps; TransformItems( SID_OPENDOC, rSet, aProps ); - SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false); - SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, false); + SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME); + SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME); OUString aURL; OUString aTarget("_blank"); if ( pFileNameItem ) diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index a1d7a3be8c44..a0d2d7d6ff44 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -940,12 +940,12 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& aSet.ClearItem( SID_FILLFRAME ); pMedium->GetItemSet()->Put( aSet ); - SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(&aSet, pItem, SfxStringItem, SID_FILTER_NAME); if ( pItem ) pMedium->SetFilter( pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( pItem->GetValue() ) ); - SFX_ITEMSET_ARG( &aSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE, false ); + SFX_ITEMSET_ARG(&aSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE); if ( pTitleItem ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pObjectShell ); @@ -1669,7 +1669,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL loadCmisProperties( ); #if OSL_DEBUG_LEVEL > 0 - SFX_ITEMSET_ARG( m_pData->m_pObjectShell->GetMedium()->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, false); + SFX_ITEMSET_ARG(m_pData->m_pObjectShell->GetMedium()->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif } @@ -1799,7 +1799,7 @@ void setUpdatePickList( SfxMedium* pMedium ) return; bool bHidden = false; - SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN); if (pHidItem) bHidden = pHidItem->GetValue(); @@ -1843,7 +1843,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA } OUString aFilterName; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterNameItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pFilterNameItem, SfxStringItem, SID_FILTER_NAME); if( pFilterNameItem ) aFilterName = pFilterNameItem->GetValue(); if( !m_pData->m_pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ) ) @@ -1853,7 +1853,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA throw frame::IllegalArgumentIOException(); } - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); bool bSalvage = pSalvageItem != nullptr; // load document @@ -1868,7 +1868,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() ) { OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE); if ( !pRepairItem || !pRepairItem->GetValue() ) { RequestPackageReparation aRequest( aDocName ); @@ -1907,7 +1907,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if( bSalvage ) { // file recovery: restore original filter - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME); SfxFilterMatcher& rMatcher = SfxGetpApp()->GetFilterMatcher(); const SfxFilter* pSetFilter = rMatcher.GetFilter4FilterName( pFilterItem->GetValue() ); pMedium->SetFilter( pSetFilter ); @@ -1917,7 +1917,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA // TODO/LATER: may be the mode should be retrieved from outside and the preused filter should not be set if ( m_pData->m_pObjectShell->GetCreateMode() == SfxObjectCreateMode::EMBEDDED ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME); if ( pFilterItem ) m_pData->m_aPreusedFilterName = pFilterItem->GetValue(); } @@ -1932,7 +1932,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA setUpdatePickList(pMedium); #if OSL_DEBUG_LEVEL > 0 - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif } @@ -2680,7 +2680,7 @@ SfxMedium* SfxBaseModel::handleLoadError( sal_uInt32 nError, SfxMedium* pMedium } bool bSilent = false; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSilentItem, SfxBoolItem, SID_SILENT, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSilentItem, SfxBoolItem, SID_SILENT); if( pSilentItem ) bSilent = pSilentItem->GetValue(); @@ -3019,7 +3019,7 @@ void SfxBaseModel::impl_store( const OUString& sURL TransformParameters( SID_SAVEASDOC, seqArguments, *aParams ); - SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, false ); + SFX_ITEMSET_ARG(aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE); if ( pCopyStreamItem && pCopyStreamItem->GetValue() && !bSaveTo ) { @@ -3032,7 +3032,7 @@ void SfxBaseModel::impl_store( const OUString& sURL sal_uInt32 nModifyPasswordHash = 0; Sequence< beans::PropertyValue > aModifyPasswordInfo; - SFX_ITEMSET_ARG( aParams, pModifyPasswordInfoItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, false ); + SFX_ITEMSET_ARG(aParams, pModifyPasswordInfoItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO); if ( pModifyPasswordInfoItem ) { // it contains either a simple hash or a set of PropertyValues @@ -3073,7 +3073,7 @@ void SfxBaseModel::impl_store( const OUString& sURL } Reference < task::XInteractionHandler > xHandler; - SFX_ITEMSET_ARG( aParams, pItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); + SFX_ITEMSET_ARG(aParams, pItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER); if ( pItem ) pItem->GetValue() >>= xHandler; @@ -3739,7 +3739,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& // allow to use an interactionhandler (if there is one) pMedium->UseInteractionHandler( true ); - SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); + SFX_ITEMSET_ARG(&aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE); bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ); m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = false; @@ -3773,7 +3773,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& TransformParameters( SID_SAVEASDOC, aMediaDescriptor, aSet ); // TODO/LATER: may be a special URL "private:storage" should be used - SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG(&aSet, pItem, SfxStringItem, SID_FILTER_NAME); sal_Int32 nVersion = SOFFICE_FILEFORMAT_CURRENT; if( pItem ) { @@ -3998,7 +3998,7 @@ OUString SAL_CALL SfxBaseModel::getTitle() catch (const ucb::CommandAbortedException &) { } - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, false ); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE); if ( pRepairedDocItem && pRepairedDocItem->GetValue() ) aResult += SfxResId(STR_REPAIREDDOCUMENT).toString(); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 79287c3a3314..771947209035 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -415,7 +415,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) const SfxMedium *pMed = pDoc->GetMedium(); GetDescriptor()->SetActualURL( pMed->GetOrigURL() ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC); bool bEditable = ( !pItem || pItem->GetValue() ); GetDescriptor()->SetEditable( bEditable ); @@ -428,9 +428,9 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) if ( pFilter ) aFilter = pFilter->GetFilterName(); - SFX_ITEMSET_ARG( pItemSet, pRefererItem, SfxStringItem, SID_REFERER, false); - SFX_ITEMSET_ARG( pItemSet, pOptionsItem, SfxStringItem, SID_FILE_FILTEROPTIONS, false); - SFX_ITEMSET_ARG( pItemSet, pTitle1Item, SfxStringItem, SID_DOCINFO_TITLE, false); + SFX_ITEMSET_ARG(pItemSet, pRefererItem, SfxStringItem, SID_REFERER); + SFX_ITEMSET_ARG(pItemSet, pOptionsItem, SfxStringItem, SID_FILE_FILTEROPTIONS); + SFX_ITEMSET_ARG(pItemSet, pTitle1Item, SfxStringItem, SID_DOCINFO_TITLE); SfxItemSet *pSet = GetDescriptor()->GetArgs(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 46914d490d8c..9db77b1f3ba4 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -327,7 +327,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxMedium* pMed = pSh->GetMedium(); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, false ); + SFX_ITEMSET_ARG(pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY); if ( pItem && pItem->GetValue() ) { SfxApplication* pApp = SfxGetpApp(); @@ -335,17 +335,17 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) ); aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); aSet.Put( SfxStringItem( SID_TARGETNAME, OUString("_blank") ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER); if ( pReferer ) aSet.Put( *pReferer ); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION, false ); + SFX_ITEMSET_ARG(pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION); if ( pVersionItem ) aSet.Put( *pVersionItem ); if( pMed->GetFilter() ) { aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS); if ( pOptions ) aSet.Put( *pOptions ); } @@ -427,8 +427,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) OUString aTemp; osl::FileBase::getFileURLFromSystemPath( pMed->GetPhysicalName(), aTemp ); INetURLObject aPhysObj( aTemp ); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), - pVersionItem, SfxInt16Item, SID_VERSION, false ); + SFX_ITEMSET_ARG(pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION); INetURLObject aMedObj( pMed->GetName() ); @@ -511,7 +510,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxApplication* pApp = SfxGetpApp(); SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetName() ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER); if ( pReferer ) aSet.Put( *pReferer ); aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); @@ -521,8 +520,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if( pMed->GetFilter() ) { aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions, - SfxStringItem, SID_FILE_FILTEROPTIONS, false ); + SFX_ITEMSET_ARG(pMed->GetItemSet(), pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS); if ( pOptions ) aSet.Put( *pOptions ); } @@ -669,7 +667,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // If a salvaged file is present, do not enclose the OrigURL // again, since the Template is invalid after reload. - SFX_ITEMSET_ARG( pNewSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); + SFX_ITEMSET_ARG(pNewSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE); if( pSalvageItem ) { aURL = pSalvageItem->GetValue(); @@ -694,9 +692,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( pSilentItem && pSilentItem->GetValue() ) pNewSet->Put( SfxBoolItem( SID_SILENT, true ) ); - SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); - SFX_ITEMSET_ARG(pNewSet, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE , false); - SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE , false); + SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER); + SFX_ITEMSET_ARG(pNewSet, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE ); + SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE ); if (!pInteractionItem) { @@ -714,8 +712,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Do not chache the old Document! Is invalid when loading // another document. - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedReferer, SfxStringItem, SID_REFERER, false); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSavedOptions, SfxStringItem, SID_FILE_FILTEROPTIONS); + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pSavedReferer, SfxStringItem, SID_REFERER); bool bHasStorage = pMedium->HasStorage_Impl(); if( bHandsOff ) @@ -879,7 +877,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) rSet.DisableItem( SID_EDITDOC ); else { - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, false ); + SFX_ITEMSET_ARG(pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC); if ( pItem && !pItem->GetValue() ) rSet.DisableItem( SID_EDITDOC ); else diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 276c4eb11461..e927323ab27f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1601,7 +1601,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, if ( frame == GetViewFrame() && &rBC == GetObjectShell() ) { SfxItemSet* pSet = GetObjectShell()->GetMedium()->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pItem, SfxUnoAnyItem, SID_VIEW_DATA, false ); + SFX_ITEMSET_ARG(pSet, pItem, SfxUnoAnyItem, SID_VIEW_DATA); if ( pItem ) { pImp->m_pController->restoreViewData( pItem->GetValue() ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 0108bf66dbbe..3e92de82d3a0 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -1165,7 +1165,7 @@ void SvxHFPage::EnableDynamicSpacing() void SvxHFPage::PageCreated(const SfxAllItemSet &rSet) { //UUUU - SFX_ITEMSET_ARG (&rSet, pSupportDrawingLayerFillStyleItem, SfxBoolItem, SID_DRAWINGLAYER_FILLSTYLES, false); + SFX_ITEMSET_ARG(&rSet, pSupportDrawingLayerFillStyleItem, SfxBoolItem, SID_DRAWINGLAYER_FILLSTYLES); if(pSupportDrawingLayerFillStyleItem) { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index d4d647f08cc8..90facf1fe8fe 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -143,7 +143,7 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() { if ( pSet ) { SfxAllItemSet aSet(*pSet); - SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false); + SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT); if ( pBulletCharFmt ) { diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index e6ad7a6fc4d1..ad3e96bbbc58 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -659,7 +659,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha if ( pDocSh->GetMedium() ) { // if there is no hidden property in the MediaDescriptor it should be removed after loading - SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); + SFX_ITEMSET_ARG(pDocSh->GetMedium()->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN); bRemoveHidden = ( pHiddenItem == NULL || !pHiddenItem->GetValue() ); } diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 7091d250006a..39e737860604 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2987,7 +2987,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec if ( mpMedium ) { - SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); + SFX_ITEMSET_ARG(mpMedium->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionDataItem && ( pEncryptionDataItem->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) { OSL_ENSURE( false, "Unexpected EncryptionData!" ); @@ -2997,7 +2997,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec if ( !aEncryptionData.getLength() ) { // try to generate the encryption data based on password - SFX_ITEMSET_ARG( mpMedium->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false ); + SFX_ITEMSET_ARG(mpMedium->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() && pPasswordItem->GetValue().getLength() <= 15 ) { // Generate random number with a seed of time as salt. diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 60357877f59b..f5a2c61f2046 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5526,7 +5526,7 @@ namespace uno::Sequence< beans::NamedValue > InitXorWord95Codec( ::msfilter::MSCodec_XorWord95& rCodec, SfxMedium& rMedium, WW8Fib* pWwFib ) { uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) aEncryptionData.realloc( 0 ); @@ -5585,7 +5585,7 @@ namespace uno::Sequence< beans::NamedValue > InitStd97Codec( ::msfilter::MSCodec_Std97& rCodec, sal_uInt8 pDocId[16], SfxMedium& rMedium ) { uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pEncryptionData, SfxUnoAnyItem, SID_ENCRYPTIONDATA); if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) aEncryptionData.realloc( 0 ); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 3e5419f14c21..6667624185ae 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -515,8 +515,8 @@ IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, SelectHdl, ListBox&, void) void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pListItem,SfxBoolItem,SID_FAX_LIST,false); - SFX_ITEMSET_ARG (&aSet,pPreviewItem,SfxBoolItem,SID_PREVIEWFLAG_TYPE,false); + SFX_ITEMSET_ARG(&aSet,pListItem,SfxBoolItem,SID_FAX_LIST); + SFX_ITEMSET_ARG(&aSet,pPreviewItem,SfxBoolItem,SID_PREVIEWFLAG_TYPE); if (pPreviewItem) { SetPreview(pPreviewItem->GetValue()); @@ -1089,7 +1089,7 @@ IMPL_LINK_TYPED( SwStdFontTabPage, LoseFocusHdl, Control&, rControl, void ) void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE, false); + SFX_ITEMSET_ARG(&aSet,pFlagItem,SfxUInt16Item, SID_FONTMODE_TYPE); if (pFlagItem) SetFontMode(sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue())); } @@ -1306,7 +1306,7 @@ IMPL_LINK_NOARG_TYPED(SwTableOptionsTabPage, CheckBoxHdl, Button*, void) void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) { - SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); + SFX_ITEMSET_ARG(&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL); if (pWrtSh) SetWrtShell(pWrtSh->GetValue()); } @@ -1411,7 +1411,7 @@ VclPtr<SfxTabPage> SwShdwCrsrOptionsTabPage::Create( vcl::Window* pParent, const void SwShdwCrsrOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) { - SFX_ITEMSET_ARG (&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL,false); + SFX_ITEMSET_ARG(&aSet,pWrtSh,SwWrtShellItem,SID_WRT_SHELL); if (pWrtSh) SetWrtShell(pWrtSh->GetValue()); } diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 9b107f8137cf..ca76e79f8646 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -82,7 +82,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCo //enable 'active' language selection m_pFormatLB->SetShowLanguageControl(true); - SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, false ); + SFX_ITEMSET_ARG(&rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO); if ( pItem ) pItem->GetValue() >>= xCustomPropertySet; } diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index b092ed925ca2..0c90ebb08df4 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -116,8 +116,8 @@ IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if (RET_OK == pDlg->Execute()) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pItem ) { m_pNumberCharEdit->SetText( pItem->GetValue() ); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index b314dfc10f6f..5a1b12985b60 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -403,7 +403,7 @@ IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if( RET_OK == pMap->Execute() ) { - SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, false ); + SFX_ITEMSET_ARG(pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR); if ( pItem ) m_pDelimEdt->SetText( OUString(sal_Unicode(pItem->GetValue())) ); } diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index e4bc0358bfbf..c6fa1fd7d634 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -701,9 +701,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // update fixed fields if (pDocSh->GetMedium()) { - SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), - pTemplateItem, SfxBoolItem, - SID_TEMPLATE, false); + SFX_ITEMSET_ARG(pDocSh->GetMedium()->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE); if (pTemplateItem && pTemplateItem->GetValue()) { pDocSh->GetDoc()->getIDocumentFieldsAccess().SetFixFields(false, 0); @@ -714,7 +712,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // Update all FIX-Date/Time fields if( pWrtSh ) { - SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(pDocSh->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); bool bUpdateFields = true; if( pUpdateDocItem && pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE) bUpdateFields = false; diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 2c0505721897..612c8d7c8845 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -198,7 +198,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, return 0; // #i30171# set the UpdateDocMode at the SwDocShell - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; if (!pFlt->GetDefaultTemplate().isEmpty()) diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 080b36a0413b..863ab65caca0 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -869,7 +869,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( pArgs && SfxItemState::SET == pArgs->GetItemState( nWhich, false, &pItem ) ) { aFileName = static_cast<const SfxStringItem*>(pItem)->GetValue(); - SFX_ITEMSET_ARG( pArgs, pTemplItem, SfxStringItem, SID_TEMPLATE_NAME, false ); + SFX_ITEMSET_ARG(pArgs, pTemplItem, SfxStringItem, SID_TEMPLATE_NAME); if ( pTemplItem ) aTemplateName = pTemplItem->GetValue(); } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 4659bc969423..786f6844f740 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -502,7 +502,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) m_xBasePool = new SwDocStyleSheetPool( *m_pDoc, SfxObjectCreateMode::ORGANIZER == GetCreateMode() ); if(GetCreateMode() != SfxObjectCreateMode::ORGANIZER) { - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE); m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; } diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 7e052fbeeaf5..a600043af013 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1709,8 +1709,8 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pFontItem ) { aFont.SetName( pFontItem->GetFamilyName() ); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index f1ff60c77ec4..eb2279086347 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -708,7 +708,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_GALLERY_FORMATS: { - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); + SFX_ITEMSET_ARG(pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS); if ( !pGalleryItem ) break; diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index f42477ab59de..52e50fdf963b 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -748,8 +748,8 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) sal_uInt16 nResult = pDlg->Execute(); if( nResult == RET_OK ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pFontItem ) { aFont.SetName( pFontItem->GetFamilyName() ); diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index d8adc8d98ca0..eac502c36574 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -1042,8 +1042,8 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP )); if( RET_OK == pDlg->Execute() ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP, false ); - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pCItem, SfxStringItem, SID_CHARMAP); + SFX_ITEMSET_ARG(pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT); if ( pFontItem ) { aNewFont.SetName( pFontItem->GetFamilyName() ); |