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 /sc | |
parent | 901f6da81b5006d33d7ad1f97b70f4c60708d609 (diff) |
sfx items: The bDeep parameter of SFX_ITEMSET_ARG is always false.
Change-Id: Ifdffc82c9b4ec2e534204294575a78e34e0338c1
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/xeroot.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/ftools/fapihelper.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh9.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewutil.cxx | 4 |
7 files changed, 14 insertions, 14 deletions
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 ) |