diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-07-27 19:12:45 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-07-28 08:13:40 +0200 |
| commit | f5dd4faef6c6ee23bb33a0662087e1892db78b3d (patch) | |
| tree | 32848118bd734bfd0d812abb159cf0c38aa953df | |
| parent | 0c45d90cfb1cc60218fbce3743df442b1f1d3f70 (diff) | |
SfxMedium::GetItemSet never returns nullptr
Change-Id: Ibfc98a49022aa09ebf5315e5d3328308c1e51d66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154997
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
72 files changed, 505 insertions, 666 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index e442f39d259a..2af13be14a0a 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -122,7 +122,7 @@ public: const std::shared_ptr<const SfxFilter>& GetFilter() const; const OUString& GetOrigURL() const; - SfxItemSet * GetItemSet() const; + SfxItemSet& GetItemSet() const; void SetArgs(const css::uno::Sequence<css::beans::PropertyValue>& rArgs); const css::uno::Sequence<css::beans::PropertyValue> & GetArgs() const; void Close(bool bInDestruction = false); diff --git a/sc/qa/unit/helper/scfiltertestbase.cxx b/sc/qa/unit/helper/scfiltertestbase.cxx index d68a9c3267c9..0e8f4525ef11 100644 --- a/sc/qa/unit/helper/scfiltertestbase.cxx +++ b/sc/qa/unit/helper/scfiltertestbase.cxx @@ -34,8 +34,7 @@ ScDocShellRef ScFilterTestBase::loadDoc(const OUString& rURL, const OUString& rF SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ); pSrcMed->SetFilter(pFilter); pSrcMed->UseInteractionHandler(false); - SfxItemSet* pSet = pSrcMed->GetItemSet(); - pSet->Put( + pSrcMed->GetItemSet().Put( SfxUInt16Item(SID_MACROEXECMODE, css::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN)); SAL_INFO("sc.qa", "about to load " << rURL); if (!xDocShRef->DoLoad(pSrcMed)) diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 83f4e687f609..892f1821dce2 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -52,10 +52,8 @@ static bool lcl_IsHiddenDocument( const SfxObjectShell* pObjSh ) SfxMedium* pMed = pObjSh->GetMedium(); if (pMed) { - SfxItemSet* pSet = pMed->GetItemSet(); - const SfxBoolItem* pItem; - if ( pSet && (pItem = pSet->GetItemIfSet( SID_HIDDEN )) && - pItem->GetValue() ) + if (const SfxBoolItem* pItem = pMed->GetItemSet().GetItemIfSet(SID_HIDDEN); + pItem && pItem->GetValue()) return true; } } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 2236c433400d..8420cc696a90 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -133,7 +133,7 @@ static tools::SvRef<SotStorage> lcl_DRMDecrypt(const SfxMedium& rMedium, const t // Set the media descriptor data uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(""); - rMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); + rMedium.GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); } catch (const std::exception&) { @@ -256,7 +256,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, { uno::Reference< packages::XPackageEncryption > xPackageEncryption; uno::Sequence< beans::NamedValue > aEncryptionData; - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(rMedium.GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = rMedium.GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); SvStream* pOriginalMediaStrm = pMedStrm; std::shared_ptr<SvStream> pMediaStrm; if (pEncryptionDataItem && (pEncryptionDataItem->GetValue() >>= aEncryptionData)) @@ -280,7 +280,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, pMedStrm = pMediaStrm.get(); // Temp removal of EncryptionData to avoid password protection triggering - rMedium.GetItemSet()->ClearItem(SID_ENCRYPTIONDATA); + rMedium.GetItemSet().ClearItem(SID_ENCRYPTIONDATA); } } } @@ -391,7 +391,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, xEncryptedRootStrg->Commit(); // Restore encryption data - rMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); + rMedium.GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); } return eRet; @@ -447,8 +447,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportXLS(SvStream& rStream) ScDLL::Init(); SfxMedium aMedium; css::uno::Reference<css::io::XInputStream> xStm(new utl::OInputStreamWrapper(rStream)); - aMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_INPUTSTREAM, css::uno::Any(xStm))); - aMedium.GetItemSet()->Put(SfxUInt16Item(SID_UPDATEDOCMODE, css::document::UpdateDocMode::NO_UPDATE)); + aMedium.GetItemSet().Put(SfxUnoAnyItem(SID_INPUTSTREAM, css::uno::Any(xStm))); + aMedium.GetItemSet().Put(SfxUInt16Item(SID_UPDATEDOCMODE, css::document::UpdateDocMode::NO_UPDATE)); ScDocShellRef xDocShell = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT | SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS | diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 7d4400f4f617..51f58557e9fe 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -167,8 +167,7 @@ void ImportExcel::ReadFileSharing() if((nRecommendReadOnly == 0) && (nPasswordHash == 0)) return; - if( SfxItemSet* pItemSet = GetMedium().GetItemSet() ) - pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetMedium().GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); if( SfxObjectShell* pShell = GetDocShell() ) { diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 807a24aae60b..3e068284e666 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -335,13 +335,13 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( std::u16s uno::Sequence< beans::NamedValue > XclExpRoot::GetEncryptionData() const { uno::Sequence< beans::NamedValue > aEncryptionData; - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(GetMedium().GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = GetMedium().GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; else { // try to get the encryption data from the password - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium().GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswordItem = GetMedium().GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) aEncryptionData = GenerateEncryptionData( pPasswordItem->GetValue() ); } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index f816339b34d7..587b7cff6612 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -134,9 +134,8 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, maMaxPos.SetTab( ::std::min( maScMaxPos.Tab(), maXclMaxPos.Tab() ) ); // document URL and path - if( const SfxItemSet* pItemSet = mrMedium.GetItemSet() ) - if( const SfxStringItem* pItem = pItemSet->GetItem<SfxStringItem>( SID_FILE_NAME ) ) - maDocUrl = pItem->GetValue(); + if( const SfxStringItem* pItem = mrMedium.GetItemSet().GetItem( SID_FILE_NAME ) ) + maDocUrl = pItem->GetValue(); maBasePath = maDocUrl.copy( 0, maDocUrl.lastIndexOf( '/' ) + 1 ); // extended document options - always own object, try to copy existing data from document diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 4abfc79be671..a8cb2f59d102 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -103,12 +103,12 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords ) { uno::Sequence< beans::NamedValue > aEncryptionData; - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(rMedium.GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = rMedium.GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; OUString aPassword; - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(rMedium.GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswordItem = rMedium.GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); @@ -117,11 +117,11 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S rVerifier, aEncryptionData, aPassword, rMedium.GetInteractionHandler(), rMedium.GetOrigURL(), ::comphelper::DocPasswordRequestType::MS, pDefaultPasswords, &bIsDefaultPassword ); - rMedium.GetItemSet()->ClearItem( SID_PASSWORD ); - rMedium.GetItemSet()->ClearItem( SID_ENCRYPTIONDATA ); + rMedium.GetItemSet().ClearItem( SID_PASSWORD ); + rMedium.GetItemSet().ClearItem( SID_ENCRYPTIONDATA ); if( !bIsDefaultPassword && aEncryptionData.hasElements() ) - rMedium.GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); + rMedium.GetItemSet().Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); return aEncryptionData; } diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index e7fdb44ca91e..1d3bc9c46234 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -35,13 +35,10 @@ namespace uno::Reference<task::XStatusIndicator> getStatusIndicator(const SfxMedium& rMedium) { uno::Reference<task::XStatusIndicator> xStatusIndicator; - SfxItemSet* pSet = rMedium.GetItemSet(); - if (pSet) - { - const SfxUnoAnyItem* pItem = pSet->GetItem<SfxUnoAnyItem>(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem) - xStatusIndicator.set(pItem->GetValue(), uno::UNO_QUERY); - } + const SfxUnoAnyItem* pItem + = rMedium.GetItemSet().GetItem<SfxUnoAnyItem>(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem) + xStatusIndicator.set(pItem->GetValue(), uno::UNO_QUERY); return xStatusIndicator; } diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 3546bfe5f043..f1eadd91c4b6 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -94,13 +94,9 @@ uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator() uno::Reference<task::XStatusIndicator> xStatusIndicator; if (pMedium) { - SfxItemSet* pSet = pMedium->GetItemSet(); - if (pSet) - { - const SfxUnoAnyItem* pItem = pSet->GetItem<SfxUnoAnyItem>(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem) - xStatusIndicator.set(pItem->GetValue(), uno::UNO_QUERY); - } + const SfxUnoAnyItem* pItem = pMedium->GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem) + xStatusIndicator.set(pItem->GetValue(), uno::UNO_QUERY); } return xStatusIndicator; } @@ -358,10 +354,10 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) OUString aName; if (SfxObjectCreateMode::EMBEDDED == mrDocShell.GetCreateMode()) { - if ( pMedium && pMedium->GetItemSet() ) + if ( pMedium ) { const SfxStringItem* pDocHierarchItem = - pMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); + pMedium->GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); if ( pDocHierarchItem ) aName = pDocHierarchItem->GetValue(); } @@ -822,10 +818,10 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) if( SfxObjectCreateMode::EMBEDDED == pObjSh->GetCreateMode() ) { OUString aName("dummyObjectName"); - if ( pMedium && pMedium->GetItemSet() ) + if ( pMedium ) { const SfxStringItem* pDocHierarchItem = - pMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); + pMedium->GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); if ( pDocHierarchItem ) aName = pDocHierarchItem->GetValue(); } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 6df765293f9b..5902ab697789 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -937,7 +937,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) GetMedium()->GetFilter()->GetFilterName()) }; - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswordItem = GetMedium()->GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aValues.realloc( 2 ); @@ -945,7 +945,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) pValues[1].Name = "Password"; pValues[1].Value <<= pPasswordItem->GetValue(); } - const SfxUnoAnyItem* pEncryptionItem = SfxItemSet::GetItem<SfxUnoAnyItem>(GetMedium()->GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionItem = GetMedium()->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if (pEncryptionItem) { aValues.realloc(aValues.getLength() + 1); @@ -1211,10 +1211,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) else if (aFltName == pFilterLotus) { OUString sItStr; - SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS, true )) ) + if ( const SfxStringItem* pOptionsItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS, true ) ) { sItStr = pOptionsItem->GetValue(); } @@ -1293,13 +1290,10 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else if (aFltName == SC_TEXT_CSV_FILTER_NAME) { - SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pOptionsItem; ScAsciiOptions aOptions; bool bOptInit = false; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { aOptions.ReadFromString( pOptionsItem->GetValue() ); bOptInit = true; @@ -1339,9 +1333,8 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (const bool bIncludeBOM = aImpEx.GetIncludeBOM()) { aOptions.SetIncludeBOM(bIncludeBOM); - if (rMedium.GetItemSet() != nullptr) - rMedium.GetItemSet()->Put( - SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions.WriteToString())); + rMedium.GetItemSet().Put( + SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions.WriteToString())); } // for mobile case, we use a copy of the original document and give it a temporary name before editing @@ -1390,10 +1383,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) else if (aFltName == pFilterDBase) { OUString sItStr; - SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { sItStr = pOptionsItem->GetValue(); } @@ -1432,10 +1422,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) { ErrCode eError; OUString sItStr; - SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { sItStr = pOptionsItem->GetValue(); } @@ -1584,10 +1571,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) LanguageType eLang = LANGUAGE_SYSTEM; bool bDateConvert = false; bool bScientificConvert = true; - SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { OUString aFilterOption = pOptionsItem->GetValue(); lcl_parseHtmlFilterOption(aFilterOption, eLang, bDateConvert, bScientificConvert); @@ -2449,13 +2433,13 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) whether they want to save without it. */ if( (rMed.GetFilter()->GetFilterFlags() & SfxFilterFlags::ENCRYPTION) == SfxFilterFlags::NONE ) { - SfxItemSet* pItemSet = rMed.GetItemSet(); - if( pItemSet && pItemSet->GetItemState( SID_PASSWORD ) == SfxItemState::SET ) + SfxItemSet& rItemSet = rMed.GetItemSet(); + if( rItemSet.GetItemState( SID_PASSWORD ) == SfxItemState::SET ) { bDoSave = ScWarnPassword::WarningOnPassword( rMed ); // #i42858# remove password from medium (warn only one time) if( bDoSave ) - pItemSet->ClearItem( SID_PASSWORD ); + rItemSet.ClearItem( SID_PASSWORD ); } } @@ -2488,10 +2472,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) else if (aFltName == SC_TEXT_CSV_FILTER_NAME) { OUString sItStr; - SfxItemSet* pSet = rMed.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMed.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { sItStr = pOptionsItem->GetValue(); } @@ -2615,10 +2596,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) else if (aFltName == pFilterDBase) { OUString sCharSet; - SfxItemSet* pSet = rMed.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMed.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { sCharSet = pOptionsItem->GetValue(); } @@ -2654,7 +2632,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) bRet = true; if ( bHasMemo ) { - const SfxStringItem* pNameItem = rMed.GetItemSet()->GetItem<SfxStringItem>( SID_FILE_NAME ); + const SfxStringItem* pNameItem = rMed.GetItemSet().GetItem<SfxStringItem>( SID_FILE_NAME ); assert(pNameItem && "SID_FILE_NAME is required"); INetURLObject aDbtFile( pNameItem->GetValue(), INetProtocol::File ); aDbtFile.setExtension(u"dbt"); @@ -2690,10 +2668,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) if (pStream) { OUString sItStr; - SfxItemSet* pSet = rMed.GetItemSet(); - const SfxStringItem* pOptionsItem; - if ( pSet && - (pOptionsItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pOptionsItem = rMed.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { sItStr = pOptionsItem->GetValue(); } @@ -2738,10 +2713,9 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) SvStream* pStream = rMed.GetOutStream(); if ( pStream ) { - SfxItemSet* pSet = rMed.GetItemSet(); OUString sFilterOptions; - if (const SfxStringItem* pOptionsItem = pSet->GetItemIfSet(SID_FILE_FILTEROPTIONS)) + if (const SfxStringItem* pOptionsItem = rMed.GetItemSet().GetItemIfSet(SID_FILE_FILTEROPTIONS)) sFilterOptions = pOptionsItem->GetValue(); weld::WaitObject aWait(GetActiveDialogParent()); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 99cf080cb7f3..8c9d227a84ca 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -119,8 +119,7 @@ void ScDocShell::SetInitialLinkUpdate( const SfxMedium* pMed ) { if (pMed) { - const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>( pMed->GetItemSet(), - SID_UPDATEDOCMODE, false); + const SfxUInt16Item* pUpdateDocItem = pMed->GetItemSet().GetItem(SID_UPDATEDOCMODE, false); m_nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : css::document::UpdateDocMode::NO_UPDATE; } @@ -2696,8 +2695,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void } const SfxPoolItem* pItem = nullptr; const SfxInt16Item* pInt16Item(nullptr); - SfxItemSet* pSet = pMed->GetItemSet(); - if (pSet && pSet->GetItemState(SID_VERSION, true, &pItem) == SfxItemState::SET) + if (pMed->GetItemSet().GetItemState(SID_VERSION, true, &pItem) == SfxItemState::SET) { pInt16Item = dynamic_cast<const SfxInt16Item*>(pItem); } @@ -2758,7 +2756,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() if ( GetMedium() ) { - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswordItem = GetMedium()->GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() ) { aArgs.realloc( 2 ); @@ -2766,7 +2764,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() pArgs[1].Name = "Password"; pArgs[1].Value <<= pPasswordItem->GetValue(); } - const SfxUnoAnyItem* pEncryptionItem = SfxItemSet::GetItem<SfxUnoAnyItem>(GetMedium()->GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionItem = GetMedium()->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if (pEncryptionItem) { aArgs.realloc(aArgs.getLength() + 1); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 7ba8527db28a..f99011e5d7fd 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2581,7 +2581,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt SfxMedium* pMedium = pShell->GetMedium(); if (pMedium) { - const SfxUInt16Item* pItem = pMedium->GetItemSet()->GetItemIfSet( SID_MACROEXECMODE, false ); + const SfxUInt16Item* pItem = pMedium->GetItemSet().GetItemIfSet( SID_MACROEXECMODE, false ); if (pItem && pItem->GetValue() != css::document::MacroExecMode::NEVER_EXECUTE) pSet->Put( SfxUInt16Item( SID_MACROEXECMODE, css::document::MacroExecMode::USE_CONFIG)); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 7fd32eb23780..1058bd49ef2a 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -422,9 +422,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) OUString ScDocumentLoader::GetOptions( const SfxMedium& rMedium ) { - SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pItem; - if ( pSet && (pItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if ( const SfxStringItem* pItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) return pItem->GetValue(); return OUString(); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 7fb2bce1dc8a..1098319506f8 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -616,7 +616,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, aInsDoc.ResetClip( &rDoc, nSrcTab ); SfxMedium aMed; - aMed.GetItemSet()->Put( SfxUnoAnyItem( SID_INPUTSTREAM, uno::Any( xStm ) ) ); + aMed.GetItemSet().Put( SfxUnoAnyItem( SID_INPUTSTREAM, uno::Any( xStm ) ) ); ErrCode eErr = ScFormatFilter::Get().ScImportExcel( aMed, &aInsDoc, EIF_AUTO ); if ( eErr == ERRCODE_NONE ) { diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 4866b269f776..d296a624b78a 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -251,9 +251,9 @@ bool SdGRFFilter::Export() if ( pPage ) { uno::Reference< lang::XComponent > xSource( pPage->getUnoPage(), uno::UNO_QUERY ); - SfxItemSet* pSet = mrMedium.GetItemSet(); - if ( pSet && xSource.is() ) + if (xSource.is()) { + SfxItemSet& rSet = mrMedium.GetItemSet(); const OUString aTypeName( mrMedium.GetFilter()->GetTypeName() ); GraphicFilter &rGraphicFilter = GraphicFilter::GetGraphicFilter(); const sal_uInt16 nFilter = rGraphicFilter.GetExportFormatNumberForTypeName( aTypeName ); @@ -262,7 +262,7 @@ bool SdGRFFilter::Export() uno::Reference< task::XInteractionHandler > xInteractionHandler; beans::PropertyValues aArgs; - TransformItems( SID_SAVEASDOC, *pSet, aArgs ); + TransformItems( SID_SAVEASDOC, rSet, aArgs ); static constexpr OUStringLiteral sFilterName( u"FilterName" ); OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); @@ -296,8 +296,8 @@ bool SdGRFFilter::Export() } // take selection if needed - if( ( SfxItemState::SET == pSet->GetItemState( SID_SELECTION ) ) - && pSet->Get( SID_SELECTION ).GetValue() + if( ( SfxItemState::SET == rSet.GetItemState( SID_SELECTION ) ) + && rSet.Get( SID_SELECTION ).GetValue() && pDrawViewShell ) { uno::Reference< view::XSelectionSupplier > xSelectionSupplier( diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index f7a3bc10f2aa..a86b1ad29051 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -36,11 +36,9 @@ bool SdHTMLFilter::Export() mrMedium.Close(); mrMedium.Commit(); - SfxItemSet* pSet = mrMedium.GetItemSet(); - css::uno::Sequence<css::beans::PropertyValue> aParams; - if (const SfxUnoAnyItem* pItem = pSet->GetItemIfSet(SID_FILTER_DATA, false)) + if (const SfxUnoAnyItem* pItem = mrMedium.GetItemSet().GetItemIfSet(SID_FILTER_DATA, false)) pItem->GetValue() >>= aParams; HtmlExport aExport(mrMedium.GetName(), aParams, &mrDocument, &mrDocShell); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3eaebfd1892b..464c934ab780 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1256,18 +1256,10 @@ bool ImplSdPPTImport::Import() switch ( m_aUserEditAtom.eLastViewType ) { case PptViewTypeEnum::Outline: - { - SfxItemSet* pSet = mrMed.GetItemSet(); - if ( pSet ) - pSet->Put( SfxUInt16Item( SID_VIEW_ID, 3 ) ); - } + mrMed.GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, 3 ) ); break; case PptViewTypeEnum::SlideSorter: - { - SfxItemSet* pSet = mrMed.GetItemSet(); - if ( pSet ) - pSet->Put( SfxUInt16Item( SID_VIEW_ID, 2 ) ); - } + mrMed.GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, 2 ) ); break; case PptViewTypeEnum::TitleMaster: nSelectedPage = 1; diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index e1ee1393226e..ec95da771ced 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -54,7 +54,7 @@ void SdFilter::CreateStatusIndicator() { // The status indicator must be retrieved from the provided medium arguments const SfxUnoAnyItem* pStatusBarItem = - mrMedium.GetItemSet()->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + mrMedium.GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); if ( pStatusBarItem ) pStatusBarItem->GetValue() >>= mxStatusIndicator; diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index da2032816393..64a1fa1f1934 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -132,7 +132,7 @@ static tools::SvRef<SotStorage> lcl_DRMDecrypt(const SfxMedium& rMedium, const t // Set the media descriptor data Sequence<NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(""); - rMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, Any(aEncryptionData))); + rMedium.GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, Any(aEncryptionData))); } catch (const std::exception&) { @@ -216,7 +216,7 @@ bool SdPPTFilter::Export() Sequence< NamedValue > aEncryptionData; Reference< css::packages::XPackageEncryption > xPackageEncryption; - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(mrMedium.GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = mrMedium.GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); std::shared_ptr<SvStream> pMediaStrm; if (pEncryptionDataItem && (pEncryptionDataItem->GetValue() >>= aEncryptionData)) { @@ -239,7 +239,7 @@ bool SdPPTFilter::Export() pOutputStrm = pMediaStrm.get(); // Temp removal of EncryptionData to avoid password protection triggering - mrMedium.GetItemSet()->ClearItem(SID_ENCRYPTIONDATA); + mrMedium.GetItemSet().ClearItem(SID_ENCRYPTIONDATA); } } } @@ -309,7 +309,7 @@ bool SdPPTFilter::Export() xEncryptedRootStrg->Commit(); // Restore encryption data - mrMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, Any(aEncryptionData))); + mrMedium.GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, Any(aEncryptionData))); } } } diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 099f56ee9e22..6dba0df7b4db 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -504,14 +504,10 @@ bool SdXMLFilter::Import( ErrCode& nError ) // try to get an XStatusIndicator from the Medium { - SfxItemSet* pSet = mrMedium.GetItemSet(); - if(pSet) + const SfxUnoAnyItem* pItem = mrMedium.GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem) { - const SfxUnoAnyItem* pItem = pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem) - { - pItem->GetValue() >>= mxStatusIndicator; - } + pItem->GetValue() >>= mxStatusIndicator; } if(mxStatusIndicator.is()) @@ -561,13 +557,10 @@ bool SdXMLFilter::Import( ErrCode& nError ) if( ERRCODE_NONE == nRet && SfxObjectCreateMode::EMBEDDED == mrDocShell.GetCreateMode() ) { OUString aName; - if ( mrMedium.GetItemSet() ) - { - const SfxStringItem* pDocHierarchItem = - mrMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); - if ( pDocHierarchItem ) - aName = pDocHierarchItem->GetValue(); - } + const SfxStringItem* pDocHierarchItem = + mrMedium.GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); + if ( pDocHierarchItem ) + aName = pDocHierarchItem->GetValue(); else aName = "dummyObjectName" ; @@ -797,13 +790,10 @@ bool SdXMLFilter::Export() if( SfxObjectCreateMode::EMBEDDED == mrDocShell.GetCreateMode() ) { OUString aName; - if ( mrMedium.GetItemSet() ) - { - const SfxStringItem* pDocHierarchItem = - mrMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); - if ( pDocHierarchItem ) - aName = pDocHierarchItem->GetValue(); - } + const SfxStringItem* pDocHierarchItem = + mrMedium.GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); + if ( pDocHierarchItem ) + aName = pDocHierarchItem->GetValue(); if( !aName.isEmpty() ) { diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 881d5aa1eefd..0a4f7d5e587b 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -431,8 +431,8 @@ SfxFrame* SdModule::CreateFromTemplate(const OUString& rTemplatePath, const Refe } else if( pDocShell ) { - if (pDocShell->GetMedium() && pDocShell->GetMedium()->GetItemSet()) - pDocShell->GetMedium()->GetItemSet()->Put(SfxBoolItem(SID_REPLACEABLE, bReplaceable)); + if (pDocShell->GetMedium()) + pDocShell->GetMedium()->GetItemSet().Put(SfxBoolItem(SID_REPLACEABLE, bReplaceable)); SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pDocShell, i_rFrame ); OSL_ENSURE( pViewFrame, "SdModule::CreateFromTemplate: no view frame - was the document really loaded?" ); pFrame = pViewFrame ? &pViewFrame->GetFrame() : nullptr; @@ -520,8 +520,8 @@ SfxFrame* SdModule::CreateEmptyDocument( const Reference< XFrame >& i_rFrame ) pDoc->CreateFirstPages(); pDoc->StopWorkStartupDelay(); } - if (pNewDocSh->GetMedium() && pNewDocSh->GetMedium()->GetItemSet()) - pNewDocSh->GetMedium()->GetItemSet()->Put(SfxBoolItem(SID_REPLACEABLE, true)); + if (pNewDocSh->GetMedium()) + pNewDocSh->GetMedium()->GetItemSet().Put(SfxBoolItem(SID_REPLACEABLE, true)); SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pNewDocSh, i_rFrame ); OSL_ENSURE( pViewFrame, "SdModule::CreateEmptyDocument: no view frame - was the document really loaded?" ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index aeee4709208a..c240399053b9 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -277,21 +277,18 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) bool bStartPresentation = false; ErrCode nError = ERRCODE_NONE; - SfxItemSet* pSet = rMedium.GetItemSet(); + SfxItemSet& rSet = rMedium.GetItemSet(); - if( pSet ) + if( ( SfxItemState::SET == rSet.GetItemState(SID_PREVIEW ) ) && rSet.Get( SID_PREVIEW ).GetValue() ) { - if( ( SfxItemState::SET == pSet->GetItemState(SID_PREVIEW ) ) && pSet->Get( SID_PREVIEW ).GetValue() ) - { - mpDoc->SetStarDrawPreviewMode( true ); - } + mpDoc->SetStarDrawPreviewMode( true ); + } - if( SfxItemState::SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&& - pSet->Get( SID_DOC_STARTPRESENTATION ).GetValue() ) - { - bStartPresentation = true; - mpDoc->SetStartWithPresentation( true ); - } + if( SfxItemState::SET == rSet.GetItemState(SID_DOC_STARTPRESENTATION)&& + rSet.Get( SID_DOC_STARTPRESENTATION ).GetValue() ) + { + bStartPresentation = true; + mpDoc->SetStartWithPresentation( true ); } bRet = SfxObjectShell::Load( rMedium ); @@ -340,9 +337,7 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) // tell SFX to change viewshell when in preview mode if( IsPreview() || bStartPresentation ) { - SfxItemSet *pMediumSet = GetMedium()->GetItemSet(); - if( pMediumSet ) - pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, bStartPresentation ? 1 : 5 ) ); + GetMedium()->GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, bStartPresentation ? 1 : 5 ) ); } return bRet; @@ -368,10 +363,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) // tell SFX to change viewshell when in preview mode if( IsPreview() ) { - SfxItemSet *pSet = GetMedium()->GetItemSet(); - - if( pSet ) - pSet->Put( SfxUInt16Item( SID_VIEW_ID, 5 ) ); + GetMedium()->GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, 5 ) ); } return bRet; @@ -428,21 +420,16 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium, const bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition); - SfxItemSet* pSet = rMedium.GetItemSet(); - if( pSet ) + SfxItemSet& rSet = rMedium.GetItemSet(); + if( SfxItemState::SET == rSet.GetItemState(SID_DOC_STARTPRESENTATION)&& + rSet.Get( SID_DOC_STARTPRESENTATION ).GetValue() ) { - if( SfxItemState::SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&& - pSet->Get( SID_DOC_STARTPRESENTATION ).GetValue() ) - { - mpDoc->SetStartWithPresentation( true ); + mpDoc->SetStartWithPresentation( true ); - // tell SFX to change viewshell when in preview mode - if( IsPreview() ) - { - SfxItemSet *pMediumSet = GetMedium()->GetItemSet(); - if( pMediumSet ) - pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 1 ) ); - } + // tell SFX to change viewshell when in preview mode + if( IsPreview() ) + { + GetMedium()->GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, 1 ) ); } } @@ -460,20 +447,17 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) SetWaitCursor( true ); - SfxItemSet* pSet = rMedium.GetItemSet(); - if( pSet ) + SfxItemSet& rSet = rMedium.GetItemSet(); + if( ( SfxItemState::SET == rSet.GetItemState(SID_PREVIEW ) ) && rSet.Get( SID_PREVIEW ).GetValue() ) { - if( ( SfxItemState::SET == pSet->GetItemState(SID_PREVIEW ) ) && pSet->Get( SID_PREVIEW ).GetValue() ) - { - mpDoc->SetStarDrawPreviewMode( true ); - } + mpDoc->SetStarDrawPreviewMode( true ); + } - if( SfxItemState::SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&& - pSet->Get( SID_DOC_STARTPRESENTATION ).GetValue() ) - { - bStartPresentation = true; - mpDoc->SetStartWithPresentation( true ); - } + if( SfxItemState::SET == rSet.GetItemState(SID_DOC_STARTPRESENTATION)&& + rSet.Get( SID_DOC_STARTPRESENTATION ).GetValue() ) + { + bStartPresentation = true; + mpDoc->SetStartWithPresentation( true ); } if( aFilterName == pFilterPowerPoint97 @@ -526,19 +510,14 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) // tell SFX to change viewshell when in preview mode if( IsPreview() ) { - SfxItemSet *pMediumSet = GetMedium()->GetItemSet(); - - if( pMediumSet ) - pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 5 ) ); + GetMedium()->GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, 5 ) ); } SetWaitCursor( false ); // tell SFX to change viewshell when in preview mode if( IsPreview() || bStartPresentation ) { - SfxItemSet *pMediumSet = GetMedium()->GetItemSet(); - if( pMediumSet ) - pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, bStartPresentation ? 1 : 5 ) ); + GetMedium()->GetItemSet().Put( SfxUInt16Item( SID_VIEW_ID, bStartPresentation ? 1 : 5 ) ); } return bRet; @@ -893,7 +872,7 @@ bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium ) OUString aLayoutName; - SfxStringItem const * pLayoutItem = rMedium.GetItemSet()->GetItemIfSet(SID_TEMPLATE_NAME, false); + SfxStringItem const * pLayoutItem = rMedium.GetItemSet().GetItemIfSet(SID_TEMPLATE_NAME, false); if( pLayoutItem ) { aLayoutName = pLayoutItem->GetValue(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 692b3d73ef64..42ed20634499 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2439,7 +2439,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) if ( !(!maPresSettings.mbFullScreen && mpDocSh && mpDocSh->GetMedium()) ) return; - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(mpDocSh->GetMedium()->GetItemSet(), SID_VIEWONLY, false); + const SfxBoolItem* pItem = mpDocSh->GetMedium()->GetItemSet().GetItem(SID_VIEWONLY, false); if ( !(pItem && pItem->GetValue()) ) return; diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 0db84b25a3b4..b3ea6ee8ded2 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -873,7 +873,7 @@ bool ToolBarManager::Implementation::CheckPlugInMode (std::u16string_view rsName if (pMedium == nullptr) break; - const SfxBoolItem* pViewOnlyItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_VIEWONLY, false); + const SfxBoolItem* pViewOnlyItem = pMedium->GetItemSet().GetItem(SID_VIEWONLY, false); if (pViewOnlyItem == nullptr) break; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index b3b11d626362..3d11988c2c75 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -214,67 +214,64 @@ ErrCode CheckPasswd_Impl nRet = ERRCODE_SFX_CANTGETPASSWD; - SfxItemSet *pSet = pFile->GetItemSet(); - if( pSet ) + SfxItemSet& rSet = pFile->GetItemSet(); + Reference< css::task::XInteractionHandler > xInteractionHandler = pFile->GetInteractionHandler(); + if( xInteractionHandler.is() ) { - Reference< css::task::XInteractionHandler > xInteractionHandler = pFile->GetInteractionHandler(); - if( xInteractionHandler.is() ) + // use the comphelper password helper to request a password + OUString aPassword; + const SfxStringItem* pPasswordItem = rSet.GetItem(SID_PASSWORD, false); + if ( pPasswordItem ) + aPassword = pPasswordItem->GetValue(); + + uno::Sequence< beans::NamedValue > aEncryptionData; + const SfxUnoAnyItem* pEncryptionDataItem = rSet.GetItem(SID_ENCRYPTIONDATA, false); + if ( pEncryptionDataItem ) + pEncryptionDataItem->GetValue() >>= aEncryptionData; + + // try if one of the public key entries is + // decryptable, then extract session key + // from it + if ( !aEncryptionData.hasElements() && aGpgProperties.hasElements() ) + aEncryptionData = ::comphelper::DocPasswordHelper::decryptGpgSession(aGpgProperties); + + // tdf#93389: if recovering a document, encryption data should contain + // entries for the real filter, not only for recovery ODF, to keep it + // encrypted. Pass this in encryption data. + // TODO: pass here the real filter (from AutoRecovery::implts_openDocs) + // to marshal this to requestAndVerifyDocPassword + if (rSet.GetItemState(SID_DOC_SALVAGE, false) == SfxItemState::SET) { - // use the comphelper password helper to request a password - OUString aPassword; - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(pSet, SID_PASSWORD, false); - if ( pPasswordItem ) - aPassword = pPasswordItem->GetValue(); - - uno::Sequence< beans::NamedValue > aEncryptionData; - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pSet, SID_ENCRYPTIONDATA, false); - if ( pEncryptionDataItem ) - pEncryptionDataItem->GetValue() >>= aEncryptionData; - - // try if one of the public key entries is - // decryptable, then extract session key - // from it - if ( !aEncryptionData.hasElements() && aGpgProperties.hasElements() ) - aEncryptionData = ::comphelper::DocPasswordHelper::decryptGpgSession(aGpgProperties); - - // tdf#93389: if recovering a document, encryption data should contain - // entries for the real filter, not only for recovery ODF, to keep it - // encrypted. Pass this in encryption data. - // TODO: pass here the real filter (from AutoRecovery::implts_openDocs) - // to marshal this to requestAndVerifyDocPassword - if (pSet->GetItemState(SID_DOC_SALVAGE, false) == SfxItemState::SET) - { - aEncryptionData = comphelper::concatSequences( - aEncryptionData, std::initializer_list<beans::NamedValue>{ - { "ForSalvage", css::uno::Any(true) } }); - } + aEncryptionData = comphelper::concatSequences( + aEncryptionData, std::initializer_list<beans::NamedValue>{ + { "ForSalvage", css::uno::Any(true) } }); + } + + SfxDocPasswordVerifier aVerifier( xStorage ); + aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( + aVerifier, aEncryptionData, aPassword, xInteractionHandler, pFile->GetOrigURL(), comphelper::DocPasswordRequestType::Standard ); - SfxDocPasswordVerifier aVerifier( xStorage ); - aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( - aVerifier, aEncryptionData, aPassword, xInteractionHandler, pFile->GetOrigURL(), comphelper::DocPasswordRequestType::Standard ); + rSet.ClearItem( SID_PASSWORD ); + rSet.ClearItem( SID_ENCRYPTIONDATA ); - pSet->ClearItem( SID_PASSWORD ); - pSet->ClearItem( SID_ENCRYPTIONDATA ); + if ( aEncryptionData.hasElements() ) + { + rSet.Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); - if ( aEncryptionData.hasElements() ) + try + { + // update the version list of the medium using the new password + pFile->GetVersionList(); + } + catch( uno::Exception& ) { - pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); - - try - { - // update the version list of the medium using the new password - pFile->GetVersionList(); - } - catch( uno::Exception& ) - { - // TODO/LATER: set the error code - } - - nRet = ERRCODE_NONE; + // TODO/LATER: set the error code } - else - nRet = ERRCODE_IO_ABORT; + + nRet = ERRCODE_NONE; } + else + nRet = ERRCODE_IO_ABORT; } } } @@ -390,7 +387,7 @@ ErrCode SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString & css::uno::Reference< css::frame::XModel > xModel = xDoc->GetModel(); if ( xModel.is() ) { - std::unique_ptr<SfxItemSet> pNew = xDoc->GetMedium()->GetItemSet()->Clone(); + std::unique_ptr<SfxItemSet> pNew = xDoc->GetMedium()->GetItemSet().Clone(); pNew->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); pNew->ClearItem( SID_FILTER_NAME ); css::uno::Sequence< css::beans::PropertyValue > aArgs; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 6a3e0c7e8821..f529fb11d468 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -599,7 +599,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) if( pShell && pShell->GetMedium() ) { sReferer = pShell->GetMedium()->GetBaseURL(); - const SfxUInt16Item* pItem = SfxItemSet::GetItem<SfxUInt16Item>(pShell->GetMedium()->GetItemSet(), SID_UPDATEDOCMODE, false); + const SfxUInt16Item* pItem = pShell->GetMedium()->GetItemSet().GetItem(SID_UPDATEDOCMODE, false); if ( pItem ) nUpdateMode = pItem->GetValue(); } diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index fb676d981d35..bc7a339bc853 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -100,7 +100,7 @@ void SfxPickListImpl::AddDocumentToPickList( const SfxObjectShell* pDocSh ) officecfg::Office::Common::History::RecentDocsThumbnail::get()) { // not modified => the document matches what is in the shell - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pMed->GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = pMed->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if ( pEncryptionDataItem ) { // encrypted document, will show a generic document icon instead diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 0e9308da6c63..60d900ccb026 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1136,7 +1136,7 @@ bool SfxWorkWindow::IsPluginMode( SfxObjectShell const * pObjShell ) { if ( pObjShell && pObjShell->GetMedium() ) { - const SfxBoolItem* pViewOnlyItem = SfxItemSet::GetItem<SfxBoolItem>(pObjShell->GetMedium()->GetItemSet(), SID_VIEWONLY, false); + const SfxBoolItem* pViewOnlyItem = pObjShell->GetMedium()->GetItemSet().GetItem(SID_VIEWONLY, false); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) return true; } diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index b907bb65faec..ef171e199fa3 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -373,7 +373,7 @@ ErrCode SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, std: aDescriptor[utl::MediaDescriptor::PROP_URL ] <<= sURL; aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM ] <<= xInStream; aDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER] <<= rMedium.GetInteractionHandler(); - SfxStringItem const * it = rMedium.GetItemSet()->GetItem(SID_REFERER); + SfxStringItem const * it = rMedium.GetItemSet().GetItem(SID_REFERER); if (it != nullptr) { aDescriptor[utl::MediaDescriptor::PROP_REFERRER] <<= it->GetValue(); @@ -494,7 +494,7 @@ ErrCode SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, std::shared_ptr<cons pOldFilter = nullptr; else { - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(rMedium.GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = rMedium.GetItemSet().GetItem(SID_DOC_SALVAGE, false); if ( ( pOldFilter->GetFilterFlags() & SfxFilterFlags::PACKED ) && pSalvageItem ) // Salvage is always done without packing pOldFilter = nullptr; @@ -504,7 +504,7 @@ ErrCode SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, std::shared_ptr<cons std::shared_ptr<const SfxFilter> pFilter = pOldFilter; bool bPreview = rMedium.IsPreview_Impl(); - const SfxStringItem* pReferer = SfxItemSet::GetItem<SfxStringItem>(rMedium.GetItemSet(), SID_REFERER, false); + const SfxStringItem* pReferer = rMedium.GetItemSet().GetItem(SID_REFERER, false); if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) ) return ERRCODE_ABORT; @@ -541,7 +541,7 @@ ErrCode SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, std::shared_ptr<cons } bool bHidden = bPreview; - const SfxStringItem* pFlags = SfxItemSet::GetItem<SfxStringItem>(rMedium.GetItemSet(), SID_OPTIONS, false); + const SfxStringItem* pFlags = rMedium.GetItemSet().GetItem(SID_OPTIONS, false); if ( !bHidden && pFlags ) { OUString aFlags( pFlags->GetValue() ); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 6d73d8316c01..f0dacde85834 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -208,10 +208,10 @@ void SfxProgress::SetState { // don't show status indicator for hidden documents (only valid while loading) SfxMedium* pMedium = pObjSh->GetMedium(); - const SfxBoolItem* pHiddenItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_HIDDEN, false); + const SfxBoolItem* pHiddenItem = pMedium->GetItemSet().GetItem(SID_HIDDEN, false); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { - const SfxUnoAnyItem* pIndicatorItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pMedium->GetItemSet(), SID_PROGRESS_STATUSBAR_CONTROL, false); + const SfxUnoAnyItem* pIndicatorItem = pMedium->GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL, false); Reference< XStatusIndicator > xInd; if ( pIndicatorItem && (pIndicatorItem->GetValue()>>=xInd) ) pImpl->xStatusInd = xInd; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 88377c073155..f7ff0b75e4ec 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1179,7 +1179,7 @@ void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne { bool bViewerTbx( nFlags & SfxVisibilityFlags::Viewer ); SfxObjectShell* pSh = xImp->pFrame->GetObjectShell(); - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(pSh->GetMedium()->GetItemSet(), SID_VIEWONLY, false); + const SfxBoolItem* pItem = pSh->GetMedium()->GetItemSet().GetItem(SID_VIEWONLY, false); bool bIsViewer = pItem && pItem->GetValue(); if ( bIsViewer != bViewerTbx ) continue; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 800f912b2ac9..24c4f509559f 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -775,9 +775,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl, weld::Button&, void) { if (!pShell) break; - SfxItemSet* pMedSet = pShell->GetMedium()->GetItemSet(); - if (!pMedSet) - break; + SfxItemSet& rMedSet = pShell->GetMedium()->GetItemSet(); std::shared_ptr<const SfxFilter> pFilter = pShell->GetMedium()->GetFilter(); if (!pFilter) break; @@ -789,11 +787,11 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl, weld::Button&, void) VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create(); m_xPasswordDialog = pFact->CreatePasswordToOpenModifyDialog(GetFrameWeld(), maxPwdLen, false); m_xPasswordDialog->AllowEmpty(); // needed to remove password - m_xPasswordDialog->StartExecuteAsync([this, pFilter, pMedSet, pShell](sal_Int32 nResult) + m_xPasswordDialog->StartExecuteAsync([this, pFilter, &rMedSet, pShell](sal_Int32 nResult) { if (nResult == RET_OK) { - sfx2::SetPassword(pFilter, pMedSet, m_xPasswordDialog->GetPasswordToOpen(), + sfx2::SetPassword(pFilter, &rMedSet, m_xPasswordDialog->GetPasswordToOpen(), m_xPasswordDialog->GetPasswordToOpen(), true); tools::JsonWriter payloadJson; payloadJson.put("password", m_xPasswordDialog->GetPasswordToOpen()); @@ -805,7 +803,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl, weld::Button&, void) m_xPasswordDialog->disposeOnce(); }); } else { - sfx2::RequestPassword(pFilter, OUString(), pMedSet, GetFrameWeld()->GetXWindow()); + sfx2::RequestPassword(pFilter, OUString(), &rMedSet, GetFrameWeld()->GetXWindow()); pShell->SetModified(); } } @@ -855,10 +853,7 @@ void SfxDocumentPage::ImplCheckPasswordState() { if (!pShell) break; - SfxItemSet* pMedSet = pShell->GetMedium()->GetItemSet(); - if (!pMedSet) - break; - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pMedSet, SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = pShell->GetMedium()->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); uno::Sequence< beans::NamedValue > aEncryptionData; if (pEncryptionDataItem) pEncryptionDataItem->GetValue() >>= aEncryptionData; diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index f4122906d91d..b0904b38ab34 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -265,7 +265,7 @@ void SfxVersionDialog::Open_Impl() SfxStringItem aFile( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ); uno::Sequence< beans::NamedValue > aEncryptionData; - if ( GetEncryptionData_Impl( pObjShell->GetMedium()->GetItemSet(), aEncryptionData ) ) + if ( GetEncryptionData_Impl( &pObjShell->GetMedium()->GetItemSet(), aEncryptionData ) ) { // there is a password, it should be used during the opening SfxUnoAnyItem aEncryptionDataItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ); @@ -355,9 +355,9 @@ IMPL_LINK(SfxVersionDialog, ButtonHdl_Impl, weld::Button&, rButton, void) aSet.Put(SfxInt16Item(SID_VERSION, nEntry + 1)); aSet.Put(SfxStringItem(SID_FILE_NAME, pObjShell->GetMedium()->GetName())); - SfxItemSet* pSet = pObjShell->GetMedium()->GetItemSet(); - const SfxStringItem* pFilterItem = SfxItemSet::GetItem<SfxStringItem>(pSet, SID_FILTER_NAME, false); - const SfxStringItem* pFilterOptItem = SfxItemSet::GetItem<SfxStringItem>(pSet, SID_FILE_FILTEROPTIONS, false); + SfxItemSet& rSet = pObjShell->GetMedium()->GetItemSet(); + const SfxStringItem* pFilterItem = rSet.GetItem(SID_FILTER_NAME, false); + const SfxStringItem* pFilterOptItem = rSet.GetItem(SID_FILE_FILTEROPTIONS, false); if ( pFilterItem ) aSet.Put( *pFilterItem ); if ( pFilterOptItem ) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 93573acb827b..f195552210ae 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -641,7 +641,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) return OUString(); } - if (const SfxStringItem* pBaseURLItem = GetItemSet()->GetItem<SfxStringItem>(SID_DOC_BASEURL)) + if (const SfxStringItem* pBaseURLItem = GetItemSet().GetItem<SfxStringItem>(SID_DOC_BASEURL)) return pBaseURLItem->GetValue(); OUString aBaseURL; @@ -664,7 +664,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving ) bool SfxMedium::IsSkipImages() const { - const SfxStringItem* pSkipImagesItem = GetItemSet()->GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS); + const SfxStringItem* pSkipImagesItem = GetItemSet().GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS); return pSkipImagesItem && pSkipImagesItem->GetValue() == "SkipImages"; } @@ -896,12 +896,12 @@ bool SfxMedium::IsStorage() bool SfxMedium::IsPreview_Impl() const { bool bPreview = false; - const SfxBoolItem* pPreview = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_PREVIEW, false); + const SfxBoolItem* pPreview = GetItemSet().GetItem(SID_PREVIEW, false); if ( pPreview ) bPreview = pPreview->GetValue(); else { - const SfxStringItem* pFlags = SfxItemSet::GetItem<SfxStringItem>(GetItemSet(), SID_OPTIONS, false); + const SfxStringItem* pFlags = GetItemSet().GetItem(SID_OPTIONS, false); if ( pFlags ) { OUString aFileFlags = pFlags->GetValue(); @@ -1138,7 +1138,7 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const LockFileEntr if ( !bOwnLock ) // bIsLoading implied from outermost condition { // means that a copy of the document should be opened - GetItemSet()->Put( SfxBoolItem( SID_TEMPLATE, true ) ); + GetItemSet().Put( SfxBoolItem( SID_TEMPLATE, true ) ); } else nResult = ShowLockResult::Succeeded; @@ -1167,7 +1167,7 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const LockFileEntr // TODO/LATER: alien lock on saving, user has selected to retry saving if (bIsLoading) - GetItemSet()->Put(SfxBoolItem(SID_DOC_READONLY, true)); + GetItemSet().Put(SfxBoolItem(SID_DOC_READONLY, true)); else nResult = ShowLockResult::Try; } @@ -1179,7 +1179,7 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const LockFileEntr // if no interaction handler is provided the default answer is open readonly // that usually happens in case the document is loaded per API // so the document must be opened readonly for backward compatibility - GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } else SetError(ERRCODE_IO_ACCESSDENIED); @@ -1232,7 +1232,7 @@ bool SfxMedium::ShowLockFileProblemDialog(MessageDlg nWhichDlg) } if (bReadOnly) - GetItemSet()->Put(SfxBoolItem(SID_DOC_READONLY, true)); + GetItemSet().Put(SfxBoolItem(SID_DOC_READONLY, true)); return bReadOnly; } @@ -1320,7 +1320,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN if ( !bResult ) { // no read-write access is necessary on loading if the document is explicitly opened as copy - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = GetItemSet().GetItem(SID_TEMPLATE, false); bIsTemplate = ( bLoading && pTemplateItem && pTemplateItem->GetValue() ); } @@ -1429,7 +1429,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) SetError(ERRCODE_IO_ACCESSDENIED); else - GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } // when the file is locked, get the current file date @@ -1462,7 +1462,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN if ( !bResult ) { // no read-write access is necessary on loading if the document is explicitly opened as copy - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = GetItemSet().GetItem(SID_TEMPLATE, false); bResult = ( bLoading && pTemplateItem && pTemplateItem->GetValue() ); } @@ -1680,7 +1680,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) SetError(ERRCODE_IO_ACCESSDENIED); else - GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } // when the file is locked, get the current file date @@ -1720,7 +1720,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempFile ) if ( GetError() ) return pImpl->xStorage; - const SfxBoolItem* pRepairItem = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_REPAIRPACKAGE, false); + const SfxBoolItem* pRepairItem = GetItemSet().GetItem(SID_REPAIRPACKAGE, false); if ( pRepairItem && pRepairItem->GetValue() ) { // the storage should be created for repairing mode @@ -1730,7 +1730,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempFile ) Reference< css::ucb::XProgressHandler > xProgressHandler; Reference< css::task::XStatusIndicator > xStatusIndicator; - const SfxUnoAnyItem* pxProgressItem = SfxItemSet::GetItem<SfxUnoAnyItem>(GetItemSet(), SID_PROGRESS_STATUSBAR_CONTROL, false); + const SfxUnoAnyItem* pxProgressItem = GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL, false); if( pxProgressItem && ( pxProgressItem->GetValue() >>= xStatusIndicator ) ) xProgressHandler.set( new utl::ProgressHandlerWrap( xStatusIndicator ) ); @@ -1851,7 +1851,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempFile ) SetPhysicalName_Impl( aTemp ); pImpl->bIsTemp = true; - GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); // TODO/MBA pImpl->aVersions.realloc(0); } @@ -2107,7 +2107,7 @@ void SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, if( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::DecodeMechanism::NONE ), xDummyEnv, comphelper::getProcessComponentContext(), aTempCont ) ) { bool bTransactStarted = false; - const SfxBoolItem* pOverWrite = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_OVERWRITE, false); + const SfxBoolItem* pOverWrite = GetItemSet().GetItem<SfxBoolItem>(SID_OVERWRITE, false); bool bOverWrite = !pOverWrite || pOverWrite->GetValue(); bool bResult = false; @@ -2211,14 +2211,14 @@ bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet const & aTar // 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 - const SfxStringItem* pNewPassItem = aTargetSet.GetItem<SfxStringItem>(SID_PASSWORD, false); - const SfxStringItem* pOldPassItem = SfxItemSet::GetItem<SfxStringItem>(GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pNewPassItem = aTargetSet.GetItem(SID_PASSWORD, false); + const SfxStringItem* pOldPassItem = GetItemSet().GetItem(SID_PASSWORD, false); if ( ( !pNewPassItem && !pOldPassItem ) || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue() == pOldPassItem->GetValue() ) ) { // the filter must be the same - const SfxStringItem* pNewFilterItem = aTargetSet.GetItem<SfxStringItem>(SID_FILTER_NAME, false); - const SfxStringItem* pOldFilterItem = SfxItemSet::GetItem<SfxStringItem>(GetItemSet(), SID_FILTER_NAME, false); + const SfxStringItem* pNewFilterItem = aTargetSet.GetItem(SID_FILTER_NAME, false); + const SfxStringItem* pOldFilterItem = GetItemSet().GetItem(SID_FILTER_NAME, false); if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue() == pOldFilterItem->GetValue() ) { // get the input stream and copy it @@ -2472,7 +2472,7 @@ void SfxMedium::Transfer_Impl() (void)::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::DecodeMechanism::NONE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent ); // check for external parameters that may customize the handling of NameClash situations - const SfxBoolItem* pOverWrite = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_OVERWRITE, false); + const SfxBoolItem* pOverWrite = GetItemSet().GetItem<SfxBoolItem>(SID_OVERWRITE, false); sal_Int32 nNameClash; if ( pOverWrite && !pOverWrite->GetValue() ) // argument says: never overwrite @@ -2490,9 +2490,9 @@ void SfxMedium::Transfer_Impl() if ( IsInCheckIn( ) ) { eOperation = ::ucbhelper::InsertOperation::Checkin; - const SfxBoolItem* pMajor = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_DOCINFO_MAJOR, false); + const SfxBoolItem* pMajor = GetItemSet().GetItem<SfxBoolItem>(SID_DOCINFO_MAJOR, false); bMajor = pMajor && pMajor->GetValue( ); - const SfxStringItem* pComments = SfxItemSet::GetItem<SfxStringItem>(GetItemSet(), SID_DOCINFO_COMMENTS, false); + const SfxStringItem* pComments = GetItemSet().GetItem(SID_DOCINFO_COMMENTS, false); if ( pComments ) sComment = pComments->GetValue( ); } @@ -2753,7 +2753,7 @@ void SfxMedium::GetLockingStream_Impl() // open the original document uno::Sequence< beans::PropertyValue > xProps; - TransformItems( SID_OPENDOC, *GetItemSet(), xProps ); + TransformItems( SID_OPENDOC, GetItemSet(), xProps ); utl::MediaDescriptor aMedium( xProps ); aMedium.addInputStreamOwnLock(); @@ -2824,22 +2824,22 @@ void SfxMedium::GetMedium_Impl() if ( !bFromTempFile ) { - GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, aFileName ) ); + GetItemSet().Put( SfxStringItem( SID_FILE_NAME, aFileName ) ); if( !(pImpl->m_nStorOpenMode & StreamMode::WRITE) ) - GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); if (xInteractionHandler.is()) - GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, Any(xInteractionHandler) ) ); + GetItemSet().Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, Any(xInteractionHandler) ) ); } if ( pImpl->m_xInputStreamToLoadFrom.is() ) { pImpl->xInputStream = pImpl->m_xInputStreamToLoadFrom; if (pImpl->m_bInputStreamIsReadOnly) - GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } else { - TransformItems( SID_OPENDOC, *GetItemSet(), xProps ); + TransformItems( SID_OPENDOC, GetItemSet(), xProps ); utl::MediaDescriptor aMedium( xProps ); if ( pImpl->m_xLockingStream.is() && !bFromTempFile ) @@ -2887,9 +2887,9 @@ void SfxMedium::GetMedium_Impl() { //TODO/MBA: need support for SID_STREAM if ( pImpl->xStream.is() ) - GetItemSet()->Put( SfxUnoAnyItem( SID_STREAM, Any( pImpl->xStream ) ) ); + GetItemSet().Put( SfxUnoAnyItem( SID_STREAM, Any( pImpl->xStream ) ) ); - GetItemSet()->Put( SfxUnoAnyItem( SID_INPUTSTREAM, Any( pImpl->xInputStream ) ) ); + GetItemSet().Put( SfxUnoAnyItem( SID_INPUTSTREAM, Any( pImpl->xInputStream ) ) ); } } @@ -2992,7 +2992,7 @@ void SfxMedium::Init_Impl() pImpl->m_aLogicName = aUrl.GetURLNoMark( INetURLObject::DecodeMechanism::NONE ); if (chkEditLock.owns_lock()) chkEditLock.unlock(); - GetItemSet()->Put( SfxStringItem( SID_JUMPMARK, aUrl.GetMark() ) ); + GetItemSet().Put( SfxStringItem( SID_JUMPMARK, aUrl.GetMark() ) ); } // try to convert the URL into a physical name - but never change a physical name @@ -3037,7 +3037,7 @@ void SfxMedium::Init_Impl() if ( !pFileNameItem ) { // let the ItemSet be created if necessary - GetItemSet()->Put( + GetItemSet().Put( SfxStringItem( SID_FILE_NAME, INetURLObject( pImpl->m_aLogicName ).GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) ); } @@ -3439,9 +3439,9 @@ SfxMedium::SfxMedium(const OUString &rName, const OUString &rReferer, StreamMode pImpl(new SfxMedium_Impl) { pImpl->m_pSet = pInSet; - SfxItemSet * s = GetItemSet(); - if (s->GetItem(SID_REFERER) == nullptr) { - s->Put(SfxStringItem(SID_REFERER, rReferer)); + SfxItemSet& s = GetItemSet(); + if (s.GetItem(SID_REFERER) == nullptr) { + s.Put(SfxStringItem(SID_REFERER, rReferer)); } pImpl->m_pFilter = std::move(pFilter); pImpl->m_aLogicName = rName; @@ -3541,9 +3541,9 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS pImpl->bDisposeStorage = false; // always take BaseURL first, could be overwritten by ItemSet - GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) ); + GetItemSet().Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) ); if ( p ) - GetItemSet()->Put( *p ); + GetItemSet().Put( *p ); } @@ -3558,9 +3558,9 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS pImpl->bDisposeStorage = false; // always take BaseURL first, could be overwritten by ItemSet - GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) ); + GetItemSet().Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) ); if ( p ) - GetItemSet()->Put( *p ); + GetItemSet().Put( *p ); } // NOTE: should only be called on main thread @@ -3644,12 +3644,11 @@ void SfxMedium::SetStorage_Impl( const uno::Reference < embed::XStorage >& rStor } -SfxItemSet* SfxMedium::GetItemSet() const +SfxItemSet& SfxMedium::GetItemSet() const { - // this method *must* return an ItemSet, returning NULL can cause crashes if (!pImpl->m_pSet) pImpl->m_pSet = std::make_shared<SfxAllItemSet>( SfxGetpApp()->GetPool() ); - return pImpl->m_pSet.get(); + return *pImpl->m_pSet; } @@ -3809,7 +3808,7 @@ bool SfxMedium::IsReadOnly() const // c) the API can force the readonly state! if (!bReadOnly) { - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(GetItemSet(), SID_DOC_READONLY, false); + const SfxBoolItem* pItem = GetItemSet().GetItem(SID_DOC_READONLY, false); if (pItem) bReadOnly = pItem->GetValue(); } @@ -4440,7 +4439,7 @@ OUString SfxMedium::SwitchDocumentToTempFile() const SfxBoolItem* pReadOnlyItem = SfxItemSet::GetItem<SfxBoolItem>(pImpl->m_pSet.get(), SID_DOC_READONLY, false); if ( pReadOnlyItem && pReadOnlyItem->GetValue() ) bWasReadonly = true; - GetItemSet()->ClearItem( SID_DOC_READONLY ); + GetItemSet().ClearItem( SID_DOC_READONLY ); GetMedium_Impl(); LockOrigFileOnDemand( false, false ); @@ -4463,7 +4462,7 @@ OUString SfxMedium::SwitchDocumentToTempFile() { // set the readonly state back pImpl->m_nStorOpenMode = SFX_STREAM_READONLY; - GetItemSet()->Put(SfxBoolItem(SID_DOC_READONLY, true)); + GetItemSet().Put(SfxBoolItem(SID_DOC_READONLY, true)); } if ( aResult.isEmpty() ) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index fb75f3fdffc3..7caf864dd32a 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -462,7 +462,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() ) return; - const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(pFile->GetItemSet(), SID_UPDATEDOCMODE, false); + const SfxUInt16Item* pUpdateDocItem = pFile->GetItemSet().GetItem(SID_UPDATEDOCMODE, false); 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 d0f49831db0c..a5fb72251bf1 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -406,7 +406,7 @@ void SfxObjectShell::SetReadOnly() pMedium->CloseInStream(); pMedium->SetOpenMode( SFX_STREAM_READONLY, true ); - pMedium->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); + pMedium->GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, true ) ); if ( !bWasROUI ) Broadcast( SfxHint(SfxHintId::ModeChanged) ); @@ -736,7 +736,7 @@ OUString SfxObjectShell::GetTitle( sal_uInt16 nMaxLength ) const if ( pMed ) { - const SfxStringItem* pNameItem = SfxItemSet::GetItem<SfxStringItem>(pMed->GetItemSet(), SID_DOCINFO_TITLE, false); + const SfxStringItem* pNameItem = pMed->GetItemSet().GetItem(SID_DOCINFO_TITLE, false); if ( pNameItem ) aTitle = pNameItem->GetValue(); } @@ -757,7 +757,7 @@ OUString SfxObjectShell::GetTitle( sal_uInt16 nMaxLength ) const // 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) - const SfxStringItem* pNameItem = SfxItemSet::GetItem<SfxStringItem>(pMed->GetItemSet(), SID_DOCINFO_TITLE, false); + const SfxStringItem* pNameItem = pMed->GetItemSet().GetItem(SID_DOCINFO_TITLE, false); if ( pNameItem ) return pNameItem->GetValue(); } @@ -906,7 +906,7 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame const * pFrame ) if ( pSfxApp->IsDowning() || IsLoading() || !pFrame || pFrame->GetFrame().IsClosing_Impl() ) return; - const SfxBoolItem* pHiddenItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_HIDDEN, false); + const SfxBoolItem* pHiddenItem = pMedium->GetItemSet().GetItem(SID_HIDDEN, false); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { SfxEventHintId nId = pImpl->nEventId; @@ -1040,29 +1040,29 @@ void SfxObjectShell::InitOwnModel_Impl() if ( pImpl->bModelInitialized ) return; - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = pMedium->GetItemSet().GetItem(SID_DOC_SALVAGE, false); if ( pSalvageItem ) { pImpl->aTempName = pMedium->GetPhysicalName(); - pMedium->GetItemSet()->ClearItem( SID_DOC_SALVAGE ); - pMedium->GetItemSet()->ClearItem( SID_FILE_NAME ); - pMedium->GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, pMedium->GetOrigURL() ) ); + pMedium->GetItemSet().ClearItem( SID_DOC_SALVAGE ); + pMedium->GetItemSet().ClearItem( SID_FILE_NAME ); + pMedium->GetItemSet().Put( SfxStringItem( SID_FILE_NAME, pMedium->GetOrigURL() ) ); } else { - pMedium->GetItemSet()->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); - pMedium->GetItemSet()->ClearItem( SID_DOCUMENT ); + pMedium->GetItemSet().ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); + pMedium->GetItemSet().ClearItem( SID_DOCUMENT ); } - pMedium->GetItemSet()->ClearItem( SID_REFERER ); + pMedium->GetItemSet().ClearItem( SID_REFERER ); uno::Reference< frame::XModel > xModel = GetModel(); if ( xModel.is() ) { - SfxItemSet *pSet = GetMedium()->GetItemSet(); + SfxItemSet& rSet = GetMedium()->GetItemSet(); if ( !GetMedium()->IsReadOnly() ) - pSet->ClearItem( SID_INPUTSTREAM ); + rSet.ClearItem( SID_INPUTSTREAM ); uno::Sequence< beans::PropertyValue > aArgs; - TransformItems( SID_OPENDOC, *pSet, aArgs ); + TransformItems( SID_OPENDOC, rSet, aArgs ); xModel->attachResource( GetMedium()->GetOrigURL(), aArgs ); impl_addToModelCollection(xModel); } @@ -1073,7 +1073,7 @@ void SfxObjectShell::InitOwnModel_Impl() void SfxObjectShell::FinishedLoading( SfxLoadedFlags nFlags ) { bool bSetModifiedTRUE = false; - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = pMedium->GetItemSet().GetItem(SID_DOC_SALVAGE, false); if( ( nFlags & SfxLoadedFlags::MAINDOCUMENT ) && !(pImpl->nLoadedFlags & SfxLoadedFlags::MAINDOCUMENT ) && !(pImpl->nFlagsInProgress & SfxLoadedFlags::MAINDOCUMENT )) { @@ -1132,7 +1132,7 @@ void SfxObjectShell::FinishedLoading( SfxLoadedFlags nFlags ) if ( (pImpl->nLoadedFlags & SfxLoadedFlags::MAINDOCUMENT ) && (pImpl->nLoadedFlags & SfxLoadedFlags::IMAGES ) ) { - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = pMedium->GetItemSet().GetItem(SID_TEMPLATE, false); bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); // closing the streams on loading should be under control of SFX! @@ -1169,7 +1169,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() return; const OUString aName( pTmpMedium->GetName() ); - const SfxStringItem* pTemplNamItem = SfxItemSet::GetItem<SfxStringItem>(pTmpMedium->GetItemSet(), SID_TEMPLATE_NAME, false); + const SfxStringItem* pTemplNamItem = pTmpMedium->GetItemSet().GetItem(SID_TEMPLATE_NAME, false); OUString aTemplateName; if ( pTemplNamItem ) aTemplateName = pTemplNamItem->GetValue(); @@ -1215,7 +1215,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() assert(pMedium != nullptr); if( ok ) { - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = pMedium->GetItemSet().GetItem(SID_DOC_SALVAGE, false); bool bSalvage = pSalvageItem != nullptr; if ( !bSalvage ) @@ -1240,7 +1240,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() } // templates are never readonly - pTmpMedium->GetItemSet()->ClearItem( SID_DOC_READONLY ); + pTmpMedium->GetItemSet().ClearItem( SID_DOC_READONLY ); pTmpMedium->SetOpenMode( SFX_STREAM_READWRITE, true ); // notifications about possible changes in readonly state and document info @@ -1555,7 +1555,7 @@ bool SfxObjectShell::IsPreview() const return false; bool bPreview = false; - const SfxStringItem* pFlags = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_OPTIONS, false); + const SfxStringItem* pFlags = pMedium->GetItemSet().GetItem(SID_OPTIONS, false); if ( pFlags ) { // Distributed values among individual items @@ -1566,7 +1566,7 @@ bool SfxObjectShell::IsPreview() const if ( !bPreview ) { - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_PREVIEW, false); + const SfxBoolItem* pItem = pMedium->GetItemSet().GetItem(SID_PREVIEW, false); if ( pItem ) bPreview = pItem->GetValue(); } @@ -1618,8 +1618,8 @@ bool SfxObjectShell::AdjustMacroMode() css::uno::Reference<css::awt::XWindow> SfxObjectShell::GetDialogParent( SfxMedium const * pLoadingMedium ) { css::uno::Reference<css::awt::XWindow> xWindow; - SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet(); - const SfxUnoFrameItem* pUnoItem = SfxItemSet::GetItem<SfxUnoFrameItem>(pSet, SID_FILLFRAME, false); + SfxItemSet& rSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet(); + const SfxUnoFrameItem* pUnoItem = rSet.GetItem(SID_FILLFRAME, false); if ( pUnoItem ) { const uno::Reference < frame::XFrame >& xFrame( pUnoItem->GetFrame() ); @@ -1629,7 +1629,7 @@ css::uno::Reference<css::awt::XWindow> SfxObjectShell::GetDialogParent( SfxMediu if (!xWindow) { SfxFrame* pFrame = nullptr; - const SfxFrameItem* pFrameItem = SfxItemSet::GetItem<SfxFrameItem>(pSet, SID_DOCFRAME, false); + const SfxFrameItem* pFrameItem = rSet.GetItem<SfxFrameItem>(SID_DOCFRAME, false); if( pFrameItem && pFrameItem->GetFrame() ) // get target frame from ItemSet pFrame = pFrameItem->GetFrame(); @@ -1654,7 +1654,7 @@ css::uno::Reference<css::awt::XWindow> SfxObjectShell::GetDialogParent( SfxMediu if (xWindow) { // this frame may be invisible, show it if it is allowed - const SfxBoolItem* pHiddenItem = SfxItemSet::GetItem<SfxBoolItem>(pSet, SID_HIDDEN, false); + const SfxBoolItem* pHiddenItem = rSet.GetItem(SID_HIDDEN, false); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { xWindow->setVisible(true); @@ -1729,7 +1729,7 @@ sal_Int16 SfxObjectShell_Impl::getCurrentMacroExecMode() const OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getCurrentMacroExecMode: no medium!" ); if ( pMedium ) { - const SfxUInt16Item* pMacroModeItem = SfxItemSet::GetItem<SfxUInt16Item>(pMedium->GetItemSet(), SID_MACROEXECMODE, false); + const SfxUInt16Item* pMacroModeItem = pMedium->GetItemSet().GetItem(SID_MACROEXECMODE, false); if ( pMacroModeItem ) nImposedExecMode = pMacroModeItem->GetValue(); } @@ -1742,7 +1742,7 @@ void SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getCurrentMacroExecMode: no medium!" ); if ( pMedium ) { - pMedium->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, nMacroMode ) ); + pMedium->GetItemSet().Put( SfxUInt16Item( SID_MACROEXECMODE, nMacroMode ) ); } } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index caa1b800f41e..47ee9d4415a8 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -949,7 +949,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( nId == SID_SAVEASDOC || nId == SID_SAVEASREMOTE ) { // in case of plugin mode the SaveAs operation means SaveTo - const SfxBoolItem* pViewOnlyItem = SfxItemSet::GetItem<SfxBoolItem>(GetMedium()->GetItemSet(), SID_VIEWONLY, false); + const SfxBoolItem* pViewOnlyItem = GetMedium()->GetItemSet().GetItem(SID_VIEWONLY, false); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) rReq.AppendItem( SfxBoolItem( SID_SAVETO, true ) ); } @@ -980,7 +980,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { // in case of saving it is not possible to transport the parameters from here // but it is not clear here whether the saving will be done or saveAs operation - GetMedium()->GetItemSet()->Put( aStatIndItem ); + GetMedium()->GetItemSet().Put( aStatIndItem ); } rReq.AppendItem( aStatIndItem ); @@ -990,7 +990,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { // in case of saving it is not possible to transport the parameters from here // but it is not clear here whether the saving will be done or saveAs operation - GetMedium()->GetItemSet()->Put( *pStatusIndicatorItem ); + GetMedium()->GetItemSet().Put( *pStatusIndicatorItem ); } // Introduce an interaction handler for GUI operation @@ -1012,7 +1012,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { // in case of saving it is not possible to transport the parameters from here // but it is not clear here whether the saving will be done or saveAs operation - GetMedium()->GetItemSet()->Put( aInteractionItem ); + GetMedium()->GetItemSet().Put( aInteractionItem ); } rReq.AppendItem( aInteractionItem ); @@ -1021,12 +1021,12 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { // in case of saving it is not possible to transport the parameters from here // but it is not clear here whether the saving will be done or saveAs operation - GetMedium()->GetItemSet()->Put( *pInteractionHandlerItem ); + GetMedium()->GetItemSet().Put( *pInteractionHandlerItem ); } - const SfxStringItem* pOldPasswordItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_PASSWORD, false); - const SfxUnoAnyItem* pOldEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(GetMedium()->GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxStringItem* pOldPasswordItem = GetMedium()->GetItemSet().GetItem(SID_PASSWORD, false); + const SfxUnoAnyItem* pOldEncryptionDataItem = GetMedium()->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); const bool bPreselectPassword = pOldPasswordItem || pOldEncryptionDataItem || (IsLoadReadonly() diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 44b9730e149c..4044bc72fdef 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -477,9 +477,9 @@ bool SfxObjectShell::DoInitNew() uno::Reference< frame::XModel > xModel = GetModel(); if ( xModel.is() ) { - SfxItemSet *pSet = GetMedium()->GetItemSet(); + SfxItemSet &rSet = GetMedium()->GetItemSet(); uno::Sequence< beans::PropertyValue > aArgs; - TransformItems( SID_OPENDOC, *pSet, aArgs ); + TransformItems( SID_OPENDOC, rSet, aArgs ); sal_Int32 nLength = aArgs.getLength(); aArgs.realloc( nLength + 1 ); auto pArgs = aArgs.getArray(); @@ -524,7 +524,7 @@ bool SfxObjectShell::ImportFromGeneratedStream_Impl( SfxAllItemSet aSet( SfxGetpApp()->GetPool() ); TransformParameters( SID_OPENDOC, rMediaDescr, aSet ); - pMedium->GetItemSet()->Put( aSet ); + pMedium->GetItemSet().Put( aSet ); pMedium->CanDisposeStorage_Impl( false ); uno::Reference<text::XTextRange> xInsertTextRange; for (const auto& rProp : rMediaDescr) @@ -578,18 +578,18 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) bool bOk = false; std::shared_ptr<const SfxFilter> pFilter = pMed->GetFilter(); - SfxItemSet* pSet = pMedium->GetItemSet(); + SfxItemSet& rSet = pMedium->GetItemSet(); if( pImpl->nEventId == SfxEventHintId::NONE ) { - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(pSet, SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = rSet.GetItem(SID_TEMPLATE, false); SetActivateEvent_Impl( ( pTemplateItem && pTemplateItem->GetValue() ) ? SfxEventHintId::CreateDoc : SfxEventHintId::OpenDoc ); } - const SfxStringItem* pBaseItem = SfxItemSet::GetItem<SfxStringItem>(pSet, SID_BASEURL, false); + const SfxStringItem* pBaseItem = rSet.GetItem(SID_BASEURL, false); OUString aBaseURL; - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = rSet.GetItem(SID_DOC_SALVAGE, false); if( pBaseItem ) aBaseURL = pBaseItem->GetValue(); else @@ -601,7 +601,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) else aBaseURL = pMed->GetBaseURL(); } - pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, aBaseURL ) ); + pMed->GetItemSet().Put( SfxStringItem( SID_DOC_BASEURL, aBaseURL ) ); pImpl->nLoadedFlags = SfxLoadedFlags::NONE; pImpl->bModelInitialized = false; @@ -629,7 +629,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SetError(nError); if (pMedium->GetFilter()->GetFilterFlags() & SfxFilterFlags::STARTPRESENTATION) - pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, true) ); + rSet.Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, true) ); } EnableSetModified( false ); @@ -648,7 +648,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) try { bool bWarnMediaTypeFallback = false; - const SfxBoolItem* pRepairPackageItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_REPAIRPACKAGE, false); + const SfxBoolItem* pRepairPackageItem = rSet.GetItem(SID_REPAIRPACKAGE, false); // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); @@ -658,7 +658,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( pRepairPackageItem && pRepairPackageItem->GetValue() ) { // the macros in repaired documents should be disabled - pMedium->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, document::MacroExecMode::NEVER_EXECUTE ) ); + pMedium->GetItemSet().Put( SfxUInt16Item( SID_MACROEXECMODE, document::MacroExecMode::NEVER_EXECUTE ) ); // the mediatype was retrieved by using fallback solution but this is a repairing mode // so it is acceptable to open the document if there is no contents that required manifest.xml @@ -683,7 +683,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( bOk ) { // the document loaded from template has no name - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = rSet.GetItem(SID_TEMPLATE, false); if ( !pTemplateItem || !pTemplateItem->GetValue() ) bHasName = true; } @@ -822,9 +822,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( SfxObjectCreateMode::EMBEDDED != eCreateMode ) { - const SfxBoolItem* pAsTempItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_TEMPLATE, false); - const SfxBoolItem* pPreviewItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_PREVIEW, false); - const SfxBoolItem* pHiddenItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_HIDDEN, false); + const SfxBoolItem* pAsTempItem = rSet.GetItem(SID_TEMPLATE, false); + const SfxBoolItem* pPreviewItem = rSet.GetItem(SID_PREVIEW, false); + const SfxBoolItem* pHiddenItem = rSet.GetItem(SID_HIDDEN, false); if( bOk && !pMedium->GetOrigURL().isEmpty() && !( pAsTempItem && pAsTempItem->GetValue() ) && !( pPreviewItem && pPreviewItem->GetValue() ) @@ -834,7 +834,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) } } - const SfxBoolItem* pDdeReconnectItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_DDE_RECONNECT_ONLOAD, false); + const SfxBoolItem* pDdeReconnectItem = rSet.GetItem(SID_DDE_RECONNECT_ONLOAD, false); bool bReconnectDde = true; // by default, we try to auto-connect DDE connections. if (pDdeReconnectItem) @@ -856,9 +856,9 @@ bool SfxObjectShell::DoLoadExternal( SfxMedium *pMed ) ErrCode SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell const * pDoc ) { ErrCode nError = ERRCODE_NONE; - SfxItemSet* pSet = pMedium->GetItemSet(); - const SfxStringItem* pOptions = SfxItemSet::GetItem<SfxStringItem>(pSet, SID_FILE_FILTEROPTIONS, false); - const SfxUnoAnyItem* pData = SfxItemSet::GetItem<SfxUnoAnyItem>(pSet, SID_FILTER_DATA, false); + SfxItemSet& rSet = pMedium->GetItemSet(); + const SfxStringItem* pOptions = rSet.GetItem(SID_FILE_FILTEROPTIONS, false); + const SfxUnoAnyItem* pData = rSet.GetItem(SID_FILTER_DATA, false); const bool bTiledRendering = comphelper::LibreOfficeKit::isActive(); if ( !pData && (bTiledRendering || !pOptions) ) { @@ -893,15 +893,15 @@ ErrCode SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell const * // we need some properties in the media descriptor, so we have to make sure that they are in Any aStreamAny; aStreamAny <<= pMedium->GetInputStream(); - if ( pSet->GetItemState( SID_INPUTSTREAM ) < SfxItemState::SET ) - pSet->Put( SfxUnoAnyItem( SID_INPUTSTREAM, aStreamAny ) ); - if ( pSet->GetItemState( SID_FILE_NAME ) < SfxItemState::SET ) - pSet->Put( SfxStringItem( SID_FILE_NAME, pMedium->GetName() ) ); - if ( pSet->GetItemState( SID_FILTER_NAME ) < SfxItemState::SET ) - pSet->Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); + if ( rSet.GetItemState( SID_INPUTSTREAM ) < SfxItemState::SET ) + rSet.Put( SfxUnoAnyItem( SID_INPUTSTREAM, aStreamAny ) ); + if ( rSet.GetItemState( SID_FILE_NAME ) < SfxItemState::SET ) + rSet.Put( SfxStringItem( SID_FILE_NAME, pMedium->GetName() ) ); + if ( rSet.GetItemState( SID_FILTER_NAME ) < SfxItemState::SET ) + rSet.Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); Sequence< PropertyValue > rProperties; - TransformItems( SID_OPENDOC, *pSet, rProperties ); + TransformItems( SID_OPENDOC, rSet, rProperties ); rtl::Reference<RequestFilterOptions> pFORequest = new RequestFilterOptions( pDoc->GetModel(), rProperties ); rHandler->handle( pFORequest ); @@ -915,11 +915,11 @@ ErrCode SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell const * const SfxStringItem* pFilterOptions = aNewParams.GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS, false); if ( pFilterOptions ) - pSet->Put( *pFilterOptions ); + rSet.Put( *pFilterOptions ); const SfxUnoAnyItem* pFilterData = aNewParams.GetItem<SfxUnoAnyItem>(SID_FILTER_DATA, false); if ( pFilterData ) - pSet->Put( *pFilterData ); + rSet.Put( *pFilterData ); } else bAbort = true; @@ -1014,7 +1014,7 @@ bool SfxObjectShell::DoSave() uno::Sequence< beans::NamedValue > aEncryptionData; if ( IsPackageStorageFormat_Impl( *GetMedium() ) ) { - if ( GetEncryptionData_Impl( GetMedium()->GetItemSet(), aEncryptionData ) ) + if ( GetEncryptionData_Impl( &GetMedium()->GetItemSet(), aEncryptionData ) ) { try { @@ -1397,13 +1397,10 @@ bool SfxObjectShell::SaveTo_Impl LockUIGuard aLockUIGuard(this); bool bCopyTo = false; - SfxItemSet *pMedSet = rMedium.GetItemSet(); - if( pMedSet ) - { - const SfxBoolItem* pSaveToItem = SfxItemSet::GetItem<SfxBoolItem>(pMedSet, SID_SAVETO, false); - bCopyTo = GetCreateMode() == SfxObjectCreateMode::EMBEDDED || - (pSaveToItem && pSaveToItem->GetValue()); - } + SfxItemSet& rMedSet = rMedium.GetItemSet(); + const SfxBoolItem* pSaveToItem = rMedSet.GetItem(SID_SAVETO, false); + bCopyTo = GetCreateMode() == SfxObjectCreateMode::EMBEDDED || + (pSaveToItem && pSaveToItem->GetValue()); bool bOk = false; // TODO/LATER: get rid of bOk @@ -1420,7 +1417,7 @@ bool SfxObjectShell::SaveTo_Impl // transfer password from the parameters to the storage uno::Sequence< beans::NamedValue > aEncryptionData; bool bPasswdProvided = false; - if ( GetEncryptionData_Impl( rMedium.GetItemSet(), aEncryptionData ) ) + if ( GetEncryptionData_Impl( &rMedSet, aEncryptionData ) ) { bPasswdProvided = true; try { @@ -2059,7 +2056,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed, bool bRegisterRecent ) { const OUString& aURL {pNewMed->GetOrigURL()}; uno::Sequence< beans::PropertyValue > aMediaDescr; - TransformItems( SID_OPENDOC, *pNewMed->GetItemSet(), aMediaDescr ); + TransformItems( SID_OPENDOC, pNewMed->GetItemSet(), aMediaDescr ); try { xModel->attachResource( aURL, aMediaDescr ); @@ -2068,7 +2065,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed, bool bRegisterRecent ) {} } - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = pMedium->GetItemSet().GetItem(SID_TEMPLATE, false); bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); // before the title regenerated the document must lose the signatures @@ -2190,7 +2187,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, if ( xFilters->hasByName( aFilterName ) ) { xFilters->getByName( aFilterName ) >>= aProps; - rMedium.GetItemSet()->Put( SfxStringItem( SID_FILTER_NAME, aFilterName ) ); + rMedium.GetItemSet().Put( SfxStringItem( SID_FILTER_NAME, aFilterName ) ); } OUString aFilterImplName; @@ -2221,8 +2218,8 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, xImporter->setTargetDocument( xComp ); uno::Sequence < beans::PropertyValue > lDescriptor; - rMedium.GetItemSet()->Put( SfxStringItem( SID_FILE_NAME, rMedium.GetName() ) ); - TransformItems( SID_OPENDOC, *rMedium.GetItemSet(), lDescriptor ); + rMedium.GetItemSet().Put( SfxStringItem( SID_FILE_NAME, rMedium.GetName() ) ); + TransformItems( SID_OPENDOC, rMedium.GetItemSet(), lDescriptor ); css::uno::Sequence < css::beans::PropertyValue > aArgs ( lDescriptor.getLength() ); css::beans::PropertyValue * pNewValue = aArgs.getArray(); @@ -2398,8 +2395,8 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) xExporter->setSourceDocument( xComp ); css::uno::Sequence < css::beans::PropertyValue > aOldArgs; - SfxItemSet* pItems = rMedium.GetItemSet(); - TransformItems( SID_SAVEASDOC, *pItems, aOldArgs ); + SfxItemSet& rItems = rMedium.GetItemSet(); + TransformItems( SID_SAVEASDOC, rItems, aOldArgs ); const css::beans::PropertyValue * pOldValue = aOldArgs.getConstArray(); css::uno::Sequence < css::beans::PropertyValue > aArgs ( aOldArgs.getLength() ); @@ -2439,7 +2436,7 @@ bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) } // FIXME: Handle this inside TransformItems() - if (pItems->GetItemState(SID_IS_REDACT_MODE) == SfxItemState::SET) + if (rItems.GetItemState(SID_IS_REDACT_MODE) == SfxItemState::SET) bIsRedactMode = true; if ( !bHasOutputStream ) @@ -2575,7 +2572,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // copy the original itemset, but remove the "version" item, because pMediumTmp // is a new medium "from scratch", so no version should be stored into it - std::shared_ptr<SfxItemSet> pSet = std::make_shared<SfxAllItemSet>(*pRetrMedium->GetItemSet()); + std::shared_ptr<SfxItemSet> pSet = std::make_shared<SfxAllItemSet>(pRetrMedium->GetItemSet()); pSet->ClearItem( SID_VERSION ); pSet->ClearItem( SID_DOC_BASEURL ); @@ -2614,9 +2611,9 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) const SfxUnoAnyItem* pxInteractionItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pArgs, SID_INTERACTIONHANDLER, false); if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) && xInteract.is() ) { - if (const SfxUnoAnyItem *pItem = pMediumTmp->GetItemSet()->GetItemIfSet(SID_INTERACTIONHANDLER, false)) + if (const SfxUnoAnyItem *pItem = pMediumTmp->GetItemSet().GetItemIfSet(SID_INTERACTIONHANDLER, false)) aOriginalInteract = pItem->GetValue(); - pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, Any( xInteract ) ) ); + pMediumTmp->GetItemSet().Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, Any( xInteract ) ) ); } const SfxBoolItem* pNoFileSync = pArgs->GetItem<SfxBoolItem>(SID_NO_FILE_SYNC, false); @@ -2628,14 +2625,11 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) { bSaved = true; - if( pMediumTmp->GetItemSet() ) - { - if (aOriginalInteract.hasValue()) - pMediumTmp->GetItemSet()->Put(SfxUnoAnyItem(SID_INTERACTIONHANDLER, aOriginalInteract)); - else - pMediumTmp->GetItemSet()->ClearItem(SID_INTERACTIONHANDLER); - pMediumTmp->GetItemSet()->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); - } + if (aOriginalInteract.hasValue()) + pMediumTmp->GetItemSet().Put(SfxUnoAnyItem(SID_INTERACTIONHANDLER, aOriginalInteract)); + else + pMediumTmp->GetItemSet().ClearItem(SID_INTERACTIONHANDLER); + pMediumTmp->GetItemSet().ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); SetError(pMediumTmp->GetErrorCode()); @@ -2660,11 +2654,8 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // reconnect to object storage DoSaveCompleted(); - if( pRetrMedium->GetItemSet() ) - { - pRetrMedium->GetItemSet()->ClearItem( SID_INTERACTIONHANDLER ); - pRetrMedium->GetItemSet()->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); - } + pRetrMedium->GetItemSet().ClearItem( SID_INTERACTIONHANDLER ); + pRetrMedium->GetItemSet().ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); delete pMediumTmp; } @@ -2684,10 +2675,10 @@ bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) pImpl->bIsSaving = true; bool bSaved = false; - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = GetMedium()->GetItemSet().GetItem(SID_DOC_SALVAGE, false); if ( pSalvageItem ) { - const SfxStringItem* pFilterItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_FILTER_NAME, false); + const SfxStringItem* pFilterItem = GetMedium()->GetItemSet().GetItem(SID_FILTER_NAME, false); std::shared_ptr<const SfxFilter> pFilter; if ( pFilterItem ) pFilter = SfxFilterMatcher( GetFactory().GetFactoryName() ).GetFilter4FilterName( OUString() ); @@ -2695,9 +2686,9 @@ bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) SfxMedium *pMed = new SfxMedium( pSalvageItem->GetValue(), StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC, pFilter ); - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswordItem = GetMedium()->GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswordItem ) - pMed->GetItemSet()->Put( *pPasswordItem ); + pMed->GetItemSet().Put( *pPasswordItem ); bSaved = DoSaveAs( *pMed ); if ( bSaved ) @@ -2792,39 +2783,39 @@ bool SfxObjectShell::CommonSaveAs_Impl(const INetURLObject& aURL, const OUString rItemSet, rArgs)) { // Update Data on media - SfxItemSet *pSet = GetMedium()->GetItemSet(); - pSet->ClearItem( SID_INTERACTIONHANDLER ); - pSet->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); - pSet->ClearItem( SID_STANDARD_DIR ); - pSet->ClearItem( SID_PATH ); + SfxItemSet& rSet = GetMedium()->GetItemSet(); + rSet.ClearItem( SID_INTERACTIONHANDLER ); + rSet.ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); + rSet.ClearItem( SID_STANDARD_DIR ); + rSet.ClearItem( SID_PATH ); if ( !bSaveTo ) { - pSet->ClearItem( SID_REFERER ); - pSet->ClearItem( SID_POSTDATA ); - pSet->ClearItem( SID_TEMPLATE ); - pSet->ClearItem( SID_DOC_READONLY ); - pSet->ClearItem( SID_CONTENTTYPE ); - pSet->ClearItem( SID_CHARSET ); - pSet->ClearItem( SID_FILTER_NAME ); - pSet->ClearItem( SID_OPTIONS ); - pSet->ClearItem( SID_VERSION ); - pSet->ClearItem( SID_EDITDOC ); - pSet->ClearItem( SID_OVERWRITE ); - pSet->ClearItem( SID_DEFAULTFILEPATH ); - pSet->ClearItem( SID_DEFAULTFILENAME ); + rSet.ClearItem( SID_REFERER ); + rSet.ClearItem( SID_POSTDATA ); + rSet.ClearItem( SID_TEMPLATE ); + rSet.ClearItem( SID_DOC_READONLY ); + rSet.ClearItem( SID_CONTENTTYPE ); + rSet.ClearItem( SID_CHARSET ); + rSet.ClearItem( SID_FILTER_NAME ); + rSet.ClearItem( SID_OPTIONS ); + rSet.ClearItem( SID_VERSION ); + rSet.ClearItem( SID_EDITDOC ); + rSet.ClearItem( SID_OVERWRITE ); + rSet.ClearItem( SID_DEFAULTFILEPATH ); + rSet.ClearItem( SID_DEFAULTFILENAME ); const SfxStringItem* pFilterItem = rItemSet.GetItem<SfxStringItem>(SID_FILTER_NAME, false); if ( pFilterItem ) - pSet->Put( *pFilterItem ); + rSet.Put( *pFilterItem ); const SfxStringItem* pOptionsItem = rItemSet.GetItem<SfxStringItem>(SID_OPTIONS, false); if ( pOptionsItem ) - pSet->Put( *pOptionsItem ); + rSet.Put( *pOptionsItem ); const SfxStringItem* pFilterOptItem = rItemSet.GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS, false); if ( pFilterOptItem ) - pSet->Put( *pFilterOptItem ); + rSet.Put( *pFilterOptItem ); #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT if ( IsDocShared() && !aTempFileURL.isEmpty() ) @@ -2858,7 +2849,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& const uno::Sequence<beans::PropertyValue>& rArgs) { // copy all items stored in the itemset of the current medium - std::shared_ptr<SfxAllItemSet> xMergedParams = std::make_shared<SfxAllItemSet>( *pMedium->GetItemSet() ); + std::shared_ptr<SfxAllItemSet> xMergedParams = std::make_shared<SfxAllItemSet>( pMedium->GetItemSet() ); // in "SaveAs" title and password will be cleared ( maybe the new itemset contains new values, otherwise they will be empty ) // #i119366# - As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for setting password together, we need to clear them both. @@ -2941,7 +2932,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& { pNewFile->SetFilter( GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ) ); - if(aFilterName == "writer_pdf_Export" && pNewFile->GetItemSet()) + if (aFilterName == "writer_pdf_Export") { uno::Sequence< beans::PropertyValue > aSaveToFilterDataOptions(2); auto pSaveToFilterDataOptions = aSaveToFilterDataOptions.getArray(); @@ -2965,7 +2956,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& } if( bRet ) - pNewFile->GetItemSet()->Put( SfxUnoAnyItem(SID_FILTER_DATA, uno::Any(aSaveToFilterDataOptions))); + pNewFile->GetItemSet().Put( SfxUnoAnyItem(SID_FILTER_DATA, uno::Any(aSaveToFilterDataOptions))); } } else @@ -3182,11 +3173,11 @@ bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium ) if ( xStorage.is() ) { // Password - const SfxStringItem* pPasswdItem = SfxItemSet::GetItem<SfxStringItem>(rMedium.GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswdItem = rMedium.GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, pMedium ) ) { uno::Sequence< beans::NamedValue > aEncryptionData; - if ( GetEncryptionData_Impl(pMedium->GetItemSet(), aEncryptionData) ) + if ( GetEncryptionData_Impl(&pMedium->GetItemSet(), aEncryptionData) ) { try { @@ -3325,8 +3316,7 @@ bool SfxObjectShell::SaveAsChildren( SfxMedium& rMedium ) } uno::Sequence<OUString> aExceptions; - if (const SfxBoolItem* pNoEmbDS - = SfxItemSet::GetItem(rMedium.GetItemSet(), SID_NO_EMBEDDED_DS, false)) + if (const SfxBoolItem* pNoEmbDS = rMedium.GetItemSet().GetItem(SID_NO_EMBEDDED_DS, false)) { // Don't save data source in case a temporary is being saved for preview in MM wizard if (pNoEmbDS->GetValue()) diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 748ab9b20353..2b34d5fd5b46 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -932,7 +932,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& aSet.ClearItem( SID_FILE_NAME ); aSet.ClearItem( SID_FILLFRAME ); - pMedium->GetItemSet()->Put( aSet ); + pMedium->GetItemSet().Put( aSet ); const SfxStringItem* pItem = aSet.GetItem<SfxStringItem>(SID_FILTER_NAME, false); if ( pItem ) pMedium->SetFilter( @@ -995,7 +995,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs2(const Sequence< // hopefully it is a temporary solution, I guess nonconvertable properties // should not be supported so then there will be only ItemSet from medium - TransformItems( SID_OPENDOC, *(m_pData->m_pObjectShell->GetMedium()->GetItemSet()), seqArgsNew ); + TransformItems( SID_OPENDOC, m_pData->m_pObjectShell->GetMedium()->GetItemSet(), seqArgsNew ); TransformParameters( SID_OPENDOC, m_pData->m_seqArguments, aSet ); TransformItems( SID_OPENDOC, aSet, seqArgsOld ); @@ -1108,7 +1108,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= sValue) { - pMedium->GetItemSet()->Put(SfxStringItem(SID_SUGGESTEDSAVEASNAME, sValue)); + pMedium->GetItemSet().Put(SfxStringItem(SID_SUGGESTEDSAVEASNAME, sValue)); ok = true; } } @@ -1116,7 +1116,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= sValue) { - pMedium->GetItemSet()->Put(SfxStringItem(SID_SUGGESTEDSAVEASDIR, sValue)); + pMedium->GetItemSet().Put(SfxStringItem(SID_SUGGESTEDSAVEASDIR, sValue)); ok = true; } } @@ -1124,7 +1124,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= bValue) { - pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_CONTENT_EXTRACTION, bValue)); + pMedium->GetItemSet().Put(SfxBoolItem(SID_LOCK_CONTENT_EXTRACTION, bValue)); ok = true; } } @@ -1132,7 +1132,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= bValue) { - pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_EXPORT, bValue)); + pMedium->GetItemSet().Put(SfxBoolItem(SID_LOCK_EXPORT, bValue)); ok = true; } } @@ -1140,7 +1140,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= bValue) { - pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_PRINT, bValue)); + pMedium->GetItemSet().Put(SfxBoolItem(SID_LOCK_PRINT, bValue)); ok = true; } } @@ -1148,7 +1148,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= bValue) { - pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_SAVE, bValue)); + pMedium->GetItemSet().Put(SfxBoolItem(SID_LOCK_SAVE, bValue)); ok = true; } } @@ -1156,7 +1156,7 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= bValue) { - pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_EDITDOC, bValue)); + pMedium->GetItemSet().Put(SfxBoolItem(SID_LOCK_EDITDOC, bValue)); ok = true; } } @@ -1164,13 +1164,13 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) { if (rArg.Value >>= bValue) { - pMedium->GetItemSet()->Put(SfxBoolItem(SID_REPLACEABLE, bValue)); + pMedium->GetItemSet().Put(SfxBoolItem(SID_REPLACEABLE, bValue)); ok = true; } } else if (rArg.Name == "EncryptionData") { - pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, rArg.Value)); + pMedium->GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, rArg.Value)); ok = true; } if (!ok) @@ -1754,13 +1754,13 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL } Sequence< beans::PropertyValue > aSequence ; - TransformItems( SID_OPENDOC, *m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence ); + TransformItems( SID_OPENDOC, m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence ); attachResource( rURL, aSequence ); loadCmisProperties( ); #if OSL_DEBUG_LEVEL > 0 - const SfxStringItem* pPasswdItem = SfxItemSet::GetItem<SfxStringItem>(m_pData->m_pObjectShell->GetMedium()->GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswdItem = m_pData->m_pObjectShell->GetMedium()->GetItemSet().GetItem(SID_PASSWORD, false); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif } @@ -1908,7 +1908,7 @@ void setUpdatePickList( SfxMedium* pMedium ) return; bool bHidden = false; - const SfxBoolItem* pHidItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_HIDDEN, false); + const SfxBoolItem* pHidItem = pMedium->GetItemSet().GetItem(SID_HIDDEN, false); if (pHidItem) bHidden = pHidItem->GetValue(); @@ -1947,7 +1947,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA } OUString aFilterName; - const SfxStringItem* pFilterNameItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_FILTER_NAME, false); + const SfxStringItem* pFilterNameItem = pMedium->GetItemSet().GetItem(SID_FILTER_NAME, false); if( pFilterNameItem ) aFilterName = pFilterNameItem->GetValue(); if( !m_pData->m_pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ) ) @@ -1957,7 +1957,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA throw frame::IllegalArgumentIOException(); } - const SfxStringItem* pSalvageItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_DOC_SALVAGE, false); + const SfxStringItem* pSalvageItem = pMedium->GetItemSet().GetItem(SID_DOC_SALVAGE, false); bool bSalvage = pSalvageItem != nullptr; // load document @@ -1972,7 +1972,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() ) { const OUString aDocName( pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ) ); - const SfxBoolItem* pRepairItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_REPAIRPACKAGE, false); + const SfxBoolItem* pRepairItem = pMedium->GetItemSet().GetItem(SID_REPAIRPACKAGE, false); if ( !pRepairItem || !pRepairItem->GetValue() ) { RequestPackageReparation aRequest( aDocName ); @@ -1980,9 +1980,9 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if( aRequest.isApproved() ) { // broken package: try second loading and allow repair - pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, true ) ); - pMedium->GetItemSet()->Put( SfxBoolItem( SID_TEMPLATE, true ) ); - pMedium->GetItemSet()->Put( SfxStringItem( SID_DOCINFO_TITLE, aDocName ) ); + pMedium->GetItemSet().Put( SfxBoolItem( SID_REPAIRPACKAGE, true ) ); + pMedium->GetItemSet().Put( SfxBoolItem( SID_TEMPLATE, true ) ); + pMedium->GetItemSet().Put( SfxStringItem( SID_DOCINFO_TITLE, aDocName ) ); // the error must be reset and the storage must be reopened in new mode pMedium->ResetError(); @@ -2011,7 +2011,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if( bSalvage ) { // file recovery: restore original filter - const SfxStringItem* pFilterItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_FILTER_NAME, false); + const SfxStringItem* pFilterItem = pMedium->GetItemSet().GetItem(SID_FILTER_NAME, false); SfxFilterMatcher& rMatcher = SfxGetpApp()->GetFilterMatcher(); std::shared_ptr<const SfxFilter> pSetFilter = rMatcher.GetFilter4FilterName( pFilterItem->GetValue() ); pMedium->SetFilter( pSetFilter ); @@ -2021,7 +2021,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA // TODO/LATER: maybe the mode should be retrieved from outside and the preused filter should not be set if ( m_pData->m_pObjectShell->GetCreateMode() == SfxObjectCreateMode::EMBEDDED ) { - const SfxStringItem* pFilterItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_FILTER_NAME, false); + const SfxStringItem* pFilterItem = pMedium->GetItemSet().GetItem(SID_FILTER_NAME, false); if ( pFilterItem ) m_pData->m_aPreusedFilterName = pFilterItem->GetValue(); } @@ -2036,7 +2036,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA setUpdatePickList(pMedium); #if OSL_DEBUG_LEVEL > 0 - const SfxStringItem* pPasswdItem = SfxItemSet::GetItem<SfxStringItem>(pMedium->GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswdItem = pMedium->GetItemSet().GetItem(SID_PASSWORD, false); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif } @@ -2605,7 +2605,7 @@ void SAL_CALL SfxBaseModel::checkOut( ) m_pData->m_pObjectShell->GetMedium( )->GetMedium_Impl( ); m_pData->m_xDocumentProperties->setTitle( getTitle( ) ); Sequence< beans::PropertyValue > aSequence ; - TransformItems( SID_OPENDOC, *pMedium->GetItemSet(), aSequence ); + TransformItems( SID_OPENDOC, pMedium->GetItemSet(), aSequence ); attachResource( sURL, aSequence ); // Reload the CMIS properties @@ -2671,7 +2671,7 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage { m_pData->m_xDocumentProperties->setTitle( getTitle( ) ); Sequence< beans::PropertyValue > aSequence ; - TransformItems( SID_OPENDOC, *pMedium->GetItemSet(), aSequence ); + TransformItems( SID_OPENDOC, pMedium->GetItemSet(), aSequence ); attachResource( sNewName, aSequence ); // Reload the CMIS properties @@ -2799,7 +2799,7 @@ SfxMedium* SfxBaseModel::handleLoadError( ErrCode nError, SfxMedium* pMedium ) } bool bSilent = false; - const SfxBoolItem* pSilentItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_SILENT, false); + const SfxBoolItem* pSilentItem = pMedium->GetItemSet().GetItem(SID_SILENT, false); if( pSilentItem ) bSilent = pSilentItem->GetValue(); @@ -2915,9 +2915,8 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , { m_pData->m_sURL = m_pData->m_pObjectShell->GetMedium()->GetName(); - SfxItemSet *pSet = m_pData->m_pObjectShell->GetMedium()->GetItemSet(); Sequence< beans::PropertyValue > aArgs; - TransformItems( SID_SAVEASDOC, *pSet, aArgs ); + TransformItems( SID_SAVEASDOC, m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aArgs ); addTitle_Impl( aArgs, m_pData->m_pObjectShell->GetTitle() ); attachResource( m_pData->m_pObjectShell->GetMedium()->GetName(), aArgs ); } @@ -3068,7 +3067,7 @@ void SfxBaseModel::impl_store( const OUString& sURL bool bFormerPassword = false; { uno::Sequence< beans::NamedValue > aOldEncryptionData; - if (GetEncryptionData_Impl( pMedium->GetItemSet(), aOldEncryptionData )) + if (GetEncryptionData_Impl( &pMedium->GetItemSet(), aOldEncryptionData )) { bFormerPassword = true; } @@ -3099,7 +3098,7 @@ void SfxBaseModel::impl_store( const OUString& sURL } uno::Sequence< beans::NamedValue > aOldEncryptionData; - (void)GetEncryptionData_Impl( pMedium->GetItemSet(), aOldEncryptionData ); + (void)GetEncryptionData_Impl( &pMedium->GetItemSet(), aOldEncryptionData ); if ( !aOldEncryptionData.hasElements() && !aNewEncryptionData.hasElements() ) throw; @@ -3798,7 +3797,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& // the BaseURL is part of the ItemSet SfxMedium* pMedium = new SfxMedium( xStorage, OUString() ); TransformParameters( SID_OPENDOC, aMediaDescriptor, aSet ); - pMedium->GetItemSet()->Put( aSet ); + pMedium->GetItemSet().Put( aSet ); // allow to use an interactionhandler (if there is one) pMedium->UseInteractionHandler( true ); @@ -4030,7 +4029,7 @@ OUString SAL_CALL SfxBaseModel::getTitle() catch (const ucb::CommandAbortedException &) { } - const SfxBoolItem* pRepairedDocItem = SfxItemSet::GetItem<SfxBoolItem>(pMedium->GetItemSet(), SID_REPAIRPACKAGE, false); + const SfxBoolItem* pRepairedDocItem = pMedium->GetItemSet().GetItem(SID_REPAIRPACKAGE, false); if ( pRepairedDocItem && pRepairedDocItem->GetValue() ) aResult += SfxResId(STR_REPAIREDDOCUMENT); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index f65d958e3fc4..ad04da35343b 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -307,16 +307,16 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell const *pDoc ) GetDescriptor()->SetActualURL(); // Mark FileOpen parameter - SfxItemSet* pItemSet = pMed->GetItemSet(); + SfxItemSet& rItemSet = pMed->GetItemSet(); const std::shared_ptr<const SfxFilter>& pFilter = pMed->GetFilter(); OUString aFilter; if ( pFilter ) aFilter = pFilter->GetFilterName(); - const SfxStringItem* pRefererItem = SfxItemSet::GetItem<SfxStringItem>(pItemSet, SID_REFERER, false); - const SfxStringItem* pOptionsItem = SfxItemSet::GetItem<SfxStringItem>(pItemSet, SID_FILE_FILTEROPTIONS, false); - const SfxStringItem* pTitle1Item = SfxItemSet::GetItem<SfxStringItem>(pItemSet, SID_DOCINFO_TITLE, false); + const SfxStringItem* pRefererItem = rItemSet.GetItem<SfxStringItem>(SID_REFERER, false); + const SfxStringItem* pOptionsItem = rItemSet.GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS, false); + const SfxStringItem* pTitle1Item = rItemSet.GetItem<SfxStringItem>(SID_DOCINFO_TITLE, false); SfxItemSet *pSet = GetDescriptor()->GetArgs(); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 5071dda0056b..1ae9ff4ad154 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -240,7 +240,7 @@ SfxFrame* SfxFrame::CreateHidden( SfxObjectShell const & rDoc, vcl::Window& rWin // create load arguments Sequence< PropertyValue > aLoadArgs; - TransformItems( SID_OPENDOC, *rDoc.GetMedium()->GetItemSet(), aLoadArgs ); + TransformItems( SID_OPENDOC, rDoc.GetMedium()->GetItemSet(), aLoadArgs ); ::comphelper::NamedValueCollection aArgs( aLoadArgs ); aArgs.put( "Model", rDoc.GetModel() ); diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 82aa65fa8538..0fcf0b90baf2 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -739,9 +739,9 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA { // Detach the medium from the template, and set proper document name and filter auto pMedium = xDoc->GetMedium(); - auto pItemSet = pMedium->GetItemSet(); - pItemSet->ClearItem(SID_TEMPLATE); - pItemSet->Put(SfxStringItem(SID_FILTER_NAME, pEmptyURLFilter->GetFilterName())); + auto& rItemSet = pMedium->GetItemSet(); + rItemSet.ClearItem(SID_TEMPLATE); + rItemSet.Put(SfxStringItem(SID_FILTER_NAME, pEmptyURLFilter->GetFilterName())); pMedium->SetName(sURL, true); pMedium->SetFilter(pEmptyURLFilter); pMedium->GetInitFileDate(true); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 0766eec86088..2a4d615b25fa 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -327,7 +327,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) chkEditLock = std::unique_lock<std::recursive_mutex>(*pChkEditMutex); pMed->CancelCheckEditableEntry(); - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(pSh->GetMedium()->GetItemSet(), SID_VIEWONLY, false); + const SfxBoolItem* pItem = pMed->GetItemSet().GetItem(SID_VIEWONLY, false); 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::DecodeMechanism::NONE) ) ); aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); aSet.Put( SfxStringItem( SID_TARGETNAME, "_blank" ) ); - const SfxStringItem* pReferer = SfxItemSet::GetItem<SfxStringItem>(pMed->GetItemSet(), SID_REFERER, false); + const SfxStringItem* pReferer = pMed->GetItemSet().GetItem(SID_REFERER, false); if ( pReferer ) aSet.Put( *pReferer ); - const SfxInt16Item* pVersionItem = SfxItemSet::GetItem<SfxInt16Item>(pSh->GetMedium()->GetItemSet(), SID_VERSION, false); + const SfxInt16Item* pVersionItem = pMed->GetItemSet().GetItem(SID_VERSION, false); if ( pVersionItem ) aSet.Put( *pVersionItem ); if( pMed->GetFilter() ) { aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); - const SfxStringItem* pOptions = SfxItemSet::GetItem<SfxStringItem>(pMed->GetItemSet(), SID_FILE_FILTEROPTIONS, false); + const SfxStringItem* pOptions = pMed->GetItemSet().GetItem(SID_FILE_FILTEROPTIONS, false); if ( pOptions ) aSet.Put( *pOptions ); } @@ -423,7 +423,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) OUString sTemp; osl::FileBase::getFileURLFromSystemPath( pMed->GetPhysicalName(), sTemp ); INetURLObject aPhysObj( sTemp ); - const SfxInt16Item* pVersionItem = SfxItemSet::GetItem<SfxInt16Item>(pSh->GetMedium()->GetItemSet(), SID_VERSION, false); + const SfxInt16Item* pVersionItem = pMed->GetItemSet().GetItem(SID_VERSION, false); INetURLObject aMedObj( pMed->GetName() ); @@ -460,7 +460,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) std::optional<bool> aOrigROVal; if (!pVersionItem) { - auto pRO = pMed->GetItemSet()->GetItem<SfxBoolItem>(SID_DOC_READONLY, false); + auto pRO = pMed->GetItemSet().GetItem<SfxBoolItem>(SID_DOC_READONLY, false); if (pRO) aOrigROVal = pRO->GetValue(); } @@ -492,9 +492,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // after call to SfxMedium::GetMedium_Impl. This mimics what happens // when the file is opened initially, when filter detection code also // calls MediaDescriptor::impl_openStreamWithURL without the item set. - pMed->GetItemSet()->ClearItem(SID_DOC_READONLY); + pMed->GetItemSet().ClearItem(SID_DOC_READONLY); pMed->CompleteReOpen(); - pMed->GetItemSet()->Put( + pMed->GetItemSet().Put( SfxBoolItem(SID_DOC_READONLY, !(nOpenMode & StreamMode::WRITE))); if ( nOpenMode & StreamMode::WRITE ) { @@ -505,7 +505,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } // LockOrigFileOnDemand might set the readonly flag itself, it should be set back - pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & StreamMode::WRITE ) ) ); + pMed->GetItemSet().Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & StreamMode::WRITE ) ) ); if ( !pMed->GetErrorCode() ) bOK = true; @@ -542,9 +542,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) pMed->ResetError(); pMed->SetOpenMode( SFX_STREAM_READONLY ); if (aOrigROVal) - pMed->GetItemSet()->Put(SfxBoolItem(SID_DOC_READONLY, *aOrigROVal)); + pMed->GetItemSet().Put(SfxBoolItem(SID_DOC_READONLY, *aOrigROVal)); else - pMed->GetItemSet()->ClearItem(SID_DOC_READONLY); + pMed->GetItemSet().ClearItem(SID_DOC_READONLY); pMed->ReOpen(); pSh->DoSaveCompleted( pMed ); } @@ -559,7 +559,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxApplication* pApp = SfxGetpApp(); SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetName() ) ); - const SfxStringItem* pReferer = SfxItemSet::GetItem<SfxStringItem>(pMed->GetItemSet(), SID_REFERER, false); + const SfxStringItem* pReferer = pMed->GetItemSet().GetItem(SID_REFERER, false); if ( pReferer ) aSet.Put( *pReferer ); aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); @@ -569,7 +569,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if( pMed->GetFilter() ) { aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); - const SfxStringItem* pOptions = SfxItemSet::GetItem<SfxStringItem>(pMed->GetItemSet(), SID_FILE_FILTEROPTIONS, false); + const SfxStringItem* pOptions = pMed->GetItemSet().GetItem(SID_FILE_FILTEROPTIONS, false); if ( pOptions ) aSet.Put( *pOptions ); } @@ -700,11 +700,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxFilterMatcher().GuessFilter( aMedium, pFilter ); if ( pFilter ) pNewSet->Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); - pNewSet->Put( *aMedium.GetItemSet() ); + pNewSet->Put( aMedium.GetItemSet() ); } else { - pNewSet.emplace( *pMedium->GetItemSet() ); + pNewSet.emplace( pMedium->GetItemSet() ); pNewSet->ClearItem( SID_VIEW_ID ); pNewSet->ClearItem( SID_STREAM ); pNewSet->ClearItem( SID_INPUTSTREAM ); @@ -832,9 +832,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } #endif // the Reload and Silent items were only temporary, remove them - xNewObj->GetMedium()->GetItemSet()->ClearItem( SID_RELOAD ); - xNewObj->GetMedium()->GetItemSet()->ClearItem( SID_SILENT ); - TransformItems( SID_OPENDOC, *xNewObj->GetMedium()->GetItemSet(), aLoadArgs ); + xNewObj->GetMedium()->GetItemSet().ClearItem( SID_RELOAD ); + xNewObj->GetMedium()->GetItemSet().ClearItem( SID_SILENT ); + TransformItems( SID_OPENDOC, xNewObj->GetMedium()->GetItemSet(), aLoadArgs ); UpdateDocument_Impl(); @@ -940,7 +940,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) rSet.DisableItem( nWhich ); else { - const SfxBoolItem* pItem = SfxItemSet::GetItem<SfxBoolItem>(pSh->GetMedium()->GetItemSet(), SID_EDITDOC, false); + const SfxBoolItem* pItem = pSh->GetMedium()->GetItemSet().GetItem(SID_EDITDOC, false); if ( pItem && !pItem->GetValue() ) rSet.DisableItem( nWhich ); else @@ -2138,7 +2138,7 @@ void SfxViewFrame::Show() // IsVisible() == true (:#) if ( m_xObjSh.is() ) { - m_xObjSh->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN ); + m_xObjSh->GetMedium()->GetItemSet().ClearItem( SID_HIDDEN ); if ( !m_pImpl->bObjLocked ) LockObjectShell_Impl(); @@ -2614,7 +2614,7 @@ void SfxViewFrame::ExecView_Impl SfxMedium* pMed = GetObjectShell()->GetMedium(); // do not open the new window hidden - pMed->GetItemSet()->ClearItem( SID_HIDDEN ); + pMed->GetItemSet().ClearItem( SID_HIDDEN ); // the view ID (optional arg. TODO: this is currently not supported in the slot definition ...) const SfxUInt16Item* pViewIdItem = rReq.GetArg<SfxUInt16Item>(SID_VIEW_ID); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 6965fc8d372f..a1dc50fc2fdf 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -2087,12 +2087,12 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, { if ( frame == &GetViewFrame() && &rBC == GetObjectShell() ) { - SfxItemSet* pSet = GetObjectShell()->GetMedium()->GetItemSet(); - const SfxUnoAnyItem* pItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pSet, SID_VIEW_DATA, false); + SfxItemSet& rSet = GetObjectShell()->GetMedium()->GetItemSet(); + const SfxUnoAnyItem* pItem = rSet.GetItem(SID_VIEW_DATA, false); if ( pItem ) { pImpl->m_pController->restoreViewData( pItem->GetValue() ); - pSet->ClearItem( SID_VIEW_DATA ); + rSet.ClearItem( SID_VIEW_DATA ); } break; } diff --git a/starmath/source/mathml/export.cxx b/starmath/source/mathml/export.cxx index bafdd7c431a8..ea662541b60c 100644 --- a/starmath/source/mathml/export.cxx +++ b/starmath/source/mathml/export.cxx @@ -88,7 +88,7 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium) bool bEmbedded = SfxObjectCreateMode::EMBEDDED == pDocShell->GetCreateMode(); // Medium item set - SfxItemSet* pMediumItemSet = rMedium.GetItemSet(); + SfxItemSet& rMediumItemSet = rMedium.GetItemSet(); if (pDocShell == nullptr) { SAL_WARN("starmath", "Failed to get medium item set"); @@ -108,7 +108,7 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium) } // Fetch progress bar - const SfxUnoAnyItem* pItem = pMediumItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + const SfxUnoAnyItem* pItem = rMediumItemSet.GetItem(SID_PROGRESS_STATUSBAR_CONTROL); if (pItem) { // set progress range and start status indicator @@ -152,7 +152,7 @@ bool SmMLExportWrapper::Export(SfxMedium& rMedium) if (bEmbedded) //&& !pStg->IsRoot() ) { const SfxStringItem* pDocHierarchItem - = pMediumItemSet->GetItem(SID_DOC_HIERARCHICALNAME); + = rMediumItemSet.GetItem(SID_DOC_HIERARCHICALNAME); if (pDocHierarchItem != nullptr) { OUString aName = pDocHierarchItem->GetValue(); diff --git a/starmath/source/mathml/import.cxx b/starmath/source/mathml/import.cxx index 4af01642d9dd..ac14bd997bc9 100644 --- a/starmath/source/mathml/import.cxx +++ b/starmath/source/mathml/import.cxx @@ -122,13 +122,9 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium) } // Fetch the item set - SfxItemSet* pSet = rMedium.GetItemSet(); - if (pSet) - { - const SfxUnoAnyItem* pItem = pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem != nullptr) - pItem->GetValue() >>= xStatusIndicator; - } + const SfxUnoAnyItem* pItem = rMedium.GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem != nullptr) + pItem->GetValue() >>= xStatusIndicator; } // Create property list @@ -164,13 +160,10 @@ ErrCode SmMLImportWrapper::Import(SfxMedium& rMedium) if (bEmbedded) // && !rMedium.GetStorage()->IsRoot() ) { OUString aName(u"dummyObjName"); - if (rMedium.GetItemSet()) - { - const SfxStringItem* pDocHierarchItem - = rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); - if (pDocHierarchItem != nullptr) - aName = pDocHierarchItem->GetValue(); - } + const SfxStringItem* pDocHierarchItem + = rMedium.GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); + if (pDocHierarchItem != nullptr) + aName = pDocHierarchItem->GetValue(); if (!aName.isEmpty()) xInfoSet->setPropertyValue("StreamRelPath", Any(aName)); diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx index 2253b0269d27..ed33a16bdbe3 100644 --- a/starmath/source/mathml/mathmlexport.cxx +++ b/starmath/source/mathml/mathmlexport.cxx @@ -110,13 +110,10 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) { OSL_ENSURE(pDocShell->GetMedium() == &rMedium, "different SfxMedium found"); - SfxItemSet* pSet = rMedium.GetItemSet(); - if (pSet) - { - const SfxUnoAnyItem* pItem = pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem) - pItem->GetValue() >>= xStatusIndicator; - } + const SfxUnoAnyItem* pItem + = rMedium.GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem) + pItem->GetValue() >>= xStatusIndicator; } // set progress range and start status indicator @@ -163,13 +160,10 @@ bool SmXMLExportWrapper::Export(SfxMedium& rMedium) if (bEmbedded) //&& !pStg->IsRoot() ) { OUString aName; - if (rMedium.GetItemSet()) - { - const SfxStringItem* pDocHierarchItem - = rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); - if (pDocHierarchItem) - aName = pDocHierarchItem->GetValue(); - } + const SfxStringItem* pDocHierarchItem + = rMedium.GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); + if (pDocHierarchItem) + aName = pDocHierarchItem->GetValue(); if (!aName.isEmpty()) { diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx index 2894f399a833..e83d4e292016 100644 --- a/starmath/source/mathml/mathmlimport.cxx +++ b/starmath/source/mathml/mathmlimport.cxx @@ -112,13 +112,9 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) { OSL_ENSURE(pDocShell->GetMedium() == &rMedium, "different SfxMedium found"); - SfxItemSet* pSet = rMedium.GetItemSet(); - if (pSet) - { - const SfxUnoAnyItem* pItem = pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem) - pItem->GetValue() >>= xStatusIndicator; - } + const SfxUnoAnyItem* pItem = rMedium.GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem) + pItem->GetValue() >>= xStatusIndicator; if (SfxObjectCreateMode::EMBEDDED == pDocShell->GetCreateMode()) bEmbedded = true; @@ -163,13 +159,10 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium& rMedium) if (bEmbedded) // && !rMedium.GetStorage()->IsRoot() ) { OUString aName("dummyObjName"); - if (rMedium.GetItemSet()) - { - const SfxStringItem* pDocHierarchItem - = rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); - if (pDocHierarchItem) - aName = pDocHierarchItem->GetValue(); - } + const SfxStringItem* pDocHierarchItem + = rMedium.GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); + if (pDocHierarchItem) + aName = pDocHierarchItem->GetValue(); if (!aName.isEmpty()) { diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index e693f8e122b1..ffb0e85e2c96 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -103,7 +103,7 @@ void FmFormView::Init() SfxObjectShell* pObjShell = pFormModel->GetObjectShell(); if ( pObjShell && pObjShell->GetMedium() ) { - if ( const SfxUnoAnyItem *pItem = pObjShell->GetMedium()->GetItemSet()->GetItemIfSet( SID_COMPONENTDATA, false ) ) + if ( const SfxUnoAnyItem *pItem = pObjShell->GetMedium()->GetItemSet().GetItemIfSet( SID_COMPONENTDATA, false ) ) { ::comphelper::NamedValueCollection aComponentData( pItem->GetValue() ); bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode ); diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index f4723b0e94cd..ffc24cbda4b8 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -99,7 +99,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL, if (rUserData == FILTER_TEXT_DLG) { - pSrcMed->GetItemSet()->Put( + pSrcMed->GetItemSet().Put( SfxStringItem(SID_FILE_FILTEROPTIONS, "UTF8,LF,Liberation Mono,en-US")); } diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index bce8f371f9ee..12d9e281c2f0 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1199,7 +1199,7 @@ static void lcl_UpdateLinksInSect( const SwBaseLink& rUpdLnk, SwSectionNode& rSe if( xDocSh->GetMedium() && rSection.GetLinkFilePassword().isEmpty() ) { - if( const SfxStringItem* pItem = xDocSh->GetMedium()->GetItemSet()-> + if( const SfxStringItem* pItem = xDocSh->GetMedium()->GetItemSet(). GetItemIfSet( SID_PASSWORD, false ) ) rSection.SetLinkFilePassword( pItem->GetValue() ); } diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 831cffd5ac1d..54dd3df5d695 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1095,7 +1095,7 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, new SfxMedium(xReadStorage, sBaseURL ) : new SfxMedium(sFileName, StreamMode::READ )); if( !sBaseURL.isEmpty() ) - pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) ); + pMed->GetItemSet().Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) ); SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() ); ErrCode nErr = aMatcher.GuessFilter(*pMed, pFilter, SfxFilterFlags::NONE); @@ -1122,9 +1122,9 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, pMed.reset(new SfxMedium(sFileName, StreamMode::READ, pFilter, nullptr)); } if(!sFilterOptions.isEmpty()) - pMed->GetItemSet()->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sFilterOptions ) ); + pMed->GetItemSet().Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sFilterOptions ) ); if(!sBaseURL.isEmpty()) - pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) ); + pMed->GetItemSet().Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) ); } // this sourcecode is not responsible for the lifetime of the shell, SfxObjectShellLock should not be used @@ -1135,10 +1135,10 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, return; SwReaderPtr pRdr; - SfxItemSet* pSet = pMed->GetItemSet(); - pSet->Put(SfxBoolItem(FN_API_CALL, true)); + SfxItemSet& rSet = pMed->GetItemSet(); + rSet.Put(SfxBoolItem(FN_API_CALL, true)); if(!sPassword.isEmpty()) - pSet->Put(SfxStringItem(SID_PASSWORD, sPassword)); + rSet.Put(SfxStringItem(SID_PASSWORD, sPassword)); Reader *pRead = pDocSh->StartConvertFrom( *pMed, pRdr, nullptr, pUnoCursor); if( !pRead ) return; diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index b29251bcbd8b..1fff4268d8d1 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -95,8 +95,8 @@ ErrCode AsciiReader::Read( SwDoc& rDoc, const OUString&, SwPaM &rPam, const OUSt OUString optionsString; aParser.GetUsedAsciiOptions().WriteUserData(optionsString); - if(m_pMedium != nullptr && m_pMedium->GetItemSet() != nullptr) - m_pMedium->GetItemSet()->Put(SfxStringItem(SID_FILE_FILTEROPTIONS, optionsString)); + if(m_pMedium != nullptr) + m_pMedium->GetItemSet().Put(SfxStringItem(SID_FILE_FILTEROPTIONS, optionsString)); } // after Read reset the options m_aOption.ResetASCIIOpts(); diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 59097fa9aa86..327e317a8c9d 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -211,17 +211,13 @@ ErrCode SwASCWriter::WriteStream() void SwASCWriter::SetupFilterOptions(SfxMedium& rMedium) { - const SfxItemSet* pSet = rMedium.GetItemSet(); - if( nullptr != pSet ) + if( const SfxStringItem* pItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) { - if( const SfxStringItem* pItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) - { - SwAsciiOptions aOpt; - OUString sItemOpt; - sItemOpt = pItem->GetValue(); - aOpt.ReadUserData(sItemOpt); - SetAsciiOptions(aOpt); - } + SwAsciiOptions aOpt; + OUString sItemOpt; + sItemOpt = pItem->GetValue(); + aOpt.ReadUserData(sItemOpt); + SetAsciiOptions(aOpt); } } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index ddb37c6f9341..f5685a4dbf63 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -643,7 +643,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 - const SfxBoolItem* pHiddenItem = SfxItemSet::GetItem<SfxBoolItem>(pDocSh->GetMedium()->GetItemSet(), SID_HIDDEN, false); + const SfxBoolItem* pHiddenItem = pDocSh->GetMedium()->GetItemSet().GetItem(SID_HIDDEN, false); m_bRemoveHidden = ( pHiddenItem == nullptr || !pHiddenItem->GetValue() ); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7c4532bf7015..c8fd6c55bf2e 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -531,7 +531,7 @@ SwHTMLParser::~SwHTMLParser() // the temporary view frame is hidden, so the hidden flag might need to be removed if ( m_bRemoveHidden && m_xDoc.is() && m_xDoc->GetDocShell() && m_xDoc->GetDocShell()->GetMedium() ) - m_xDoc->GetDocShell()->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN ); + m_xDoc->GetDocShell()->GetMedium()->GetItemSet().ClearItem( SID_HIDDEN ); } } @@ -5596,11 +5596,7 @@ void HTMLReader::SetupFilterOptions() if (!m_pMedium) return; - const SfxItemSet* pItemSet = m_pMedium->GetItemSet(); - if (!pItemSet) - return; - - auto pItem = pItemSet->GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS); + auto pItem = m_pMedium->GetItemSet().GetItem(SID_FILE_FILTEROPTIONS); if (!pItem) return; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 1c9d68a15fd5..d4d7fea41260 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -185,12 +185,8 @@ std::unique_ptr<SwHTMLNumRuleInfo> SwHTMLWriter::ReleaseNextNumInfo() void SwHTMLWriter::SetupFilterOptions(SfxMedium& rMedium) { - const SfxItemSet* pSet = rMedium.GetItemSet(); - if (pSet == nullptr) - return; - uno::Sequence<beans::PropertyValue> aArgs = rMedium.GetArgs(); - if (const SfxStringItem* pItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) + if (const SfxStringItem* pItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS )) { const OUString sFilterOptions = pItem->GetValue(); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index ba9425ec3c2b..8395ab8938a3 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -117,13 +117,9 @@ OUString SwBasicEscherEx::GetBasePath() const SfxMedium * pMedium = mrWrt.GetWriter().GetMedia(); if (pMedium) { - const SfxItemSet* pPItemSet = pMedium->GetItemSet(); - if( pPItemSet ) - { - const SfxStringItem* pPItem = pPItemSet->GetItem( SID_FILE_NAME ); - if ( pPItem ) - sDocUrl = pPItem->GetValue(); - } + const SfxStringItem* pPItem = pMedium->GetItemSet().GetItem( SID_FILE_NAME ); + if ( pPItem ) + sDocUrl = pPItem->GetValue(); } return sDocUrl.copy(0, sDocUrl.lastIndexOf('/') + 1); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e22351e477df..09855b37f0c1 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3492,7 +3492,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec if ( mpMedium ) { - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(mpMedium->GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = mpMedium->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if ( pEncryptionDataItem && ( pEncryptionDataItem->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) { OSL_ENSURE( false, "Unexpected EncryptionData!" ); @@ -3502,7 +3502,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec if ( !aEncryptionData.hasElements() ) { // try to generate the encryption data based on password - const SfxStringItem* pPasswordItem = SfxItemSet::GetItem<SfxStringItem>(mpMedium->GetItemSet(), SID_PASSWORD, false); + const SfxStringItem* pPasswordItem = mpMedium->GetItemSet().GetItem(SID_PASSWORD, false); if ( pPasswordItem && !pPasswordItem->GetValue().isEmpty() && pPasswordItem->GetValue().getLength() <= 15 ) { // Generate random number with a seed of time as salt. @@ -3521,12 +3521,12 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec rCodec.InitKey( aPassword, pDocId ); aEncryptionData = rCodec.GetEncryptionData(); - mpMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); + mpMedium->GetItemSet().Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); } } if ( aEncryptionData.hasElements() ) - mpMedium->GetItemSet()->ClearItem( SID_PASSWORD ); + mpMedium->GetItemSet().ClearItem( SID_PASSWORD ); } // nonempty encryption data means here that the codec was successfully initialized @@ -3790,7 +3790,7 @@ ErrCode SwWW8Writer::WriteStorage() if (mpMedium) { // Check for specific encryption requests - const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem<SfxUnoAnyItem>(mpMedium->GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionDataItem = mpMedium->GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if (pEncryptionDataItem && (pEncryptionDataItem->GetValue() >>= aEncryptionData)) { ::comphelper::SequenceAsHashMap aHashData(aEncryptionData); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index e2d6b35e7345..a16da71ce055 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5603,10 +5603,7 @@ namespace { OUString aPassw; - const SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem *pPasswordItem; - - if(pSet && (pPasswordItem = pSet->GetItemIfSet(SID_PASSWORD))) + if (const SfxStringItem* pPasswordItem = rMedium.GetItemSet().GetItemIfSet(SID_PASSWORD)) aPassw = pPasswordItem->GetValue(); else { @@ -5637,7 +5634,7 @@ namespace uno::Sequence< beans::NamedValue > InitXorWord95Codec( ::msfilter::MSCodec_XorWord95& rCodec, SfxMedium& rMedium, WW8Fib const * pWwFib ) { uno::Sequence< beans::NamedValue > aEncryptionData; - const SfxUnoAnyItem* pEncryptionData = SfxItemSet::GetItem<SfxUnoAnyItem>(rMedium.GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionData = rMedium.GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) aEncryptionData.realloc( 0 ); @@ -5690,7 +5687,7 @@ namespace uno::Sequence< beans::NamedValue > Init97Codec(msfilter::MSCodec97& rCodec, sal_uInt8 const pDocId[16], SfxMedium& rMedium) { uno::Sequence< beans::NamedValue > aEncryptionData; - const SfxUnoAnyItem* pEncryptionData = SfxItemSet::GetItem<SfxUnoAnyItem>(rMedium.GetItemSet(), SID_ENCRYPTIONDATA, false); + const SfxUnoAnyItem* pEncryptionData = rMedium.GetItemSet().GetItem(SID_ENCRYPTIONDATA, false); if ( pEncryptionData && ( pEncryptionData->GetValue() >>= aEncryptionData ) && !rCodec.InitCodec( aEncryptionData ) ) aEncryptionData.realloc( 0 ); @@ -5872,8 +5869,8 @@ ErrCode SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss) m_pDataStream = pDecryptData; } - pMedium->GetItemSet()->ClearItem( SID_PASSWORD ); - pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); + pMedium->GetItemSet().ClearItem( SID_PASSWORD ); + pMedium->GetItemSet().Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); } } break; @@ -5936,8 +5933,8 @@ ErrCode SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss) m_pDataStream = pDecryptData; } - pMedium->GetItemSet()->ClearItem( SID_PASSWORD ); - pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); + pMedium->GetItemSet().ClearItem( SID_PASSWORD ); + pMedium->GetItemSet().Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) ); } } break; @@ -6483,7 +6480,7 @@ ErrCode WW8Reader::DecryptDRMPackage() // Set the media descriptor data uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(""); - m_pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); + m_pMedium->GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); } catch (const std::exception&) { diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index d6496e779299..4664748292e6 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -617,15 +617,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con if (pDocSh->GetMedium()) { - SfxItemSet* pSet = pDocSh->GetMedium()->GetItemSet(); - if (pSet) + const SfxUnoAnyItem* pItem = + pDocSh->GetMedium()->GetItemSet().GetItem(SID_PROGRESS_STATUSBAR_CONTROL); + if (pItem) { - const SfxUnoAnyItem* pItem = - pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL); - if (pItem) - { - pItem->GetValue() >>= xStatusIndicator; - } + pItem->GetValue() >>= xStatusIndicator; } } @@ -720,10 +716,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con OUString StreamPath; if( SfxObjectCreateMode::EMBEDDED == rDoc.GetDocShell()->GetCreateMode() ) { - if ( pMedDescrMedium && pMedDescrMedium->GetItemSet() ) + if (pMedDescrMedium) { const SfxStringItem* pDocHierarchItem = - pMedDescrMedium->GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME); + pMedDescrMedium->GetItemSet().GetItem(SID_DOC_HIERARCHICALNAME); if ( pDocHierarchItem ) StreamPath = pDocHierarchItem->GetValue(); } diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 1ff2b3520282..a5b0560c1c5a 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -467,7 +467,7 @@ ErrCode SwXMLWriter::WriteStorage() ErrCode SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium ) { - return Write_(aTargetMedium.GetItemSet()); + return Write_(&aTargetMedium.GetItemSet()); } ErrCode SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed, diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 2dab8cda2397..d800233e2856 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -82,8 +82,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, const SfxStringItem* pItem; OUString sAsciiOptions; if( rDocSh.GetMedium() != nullptr && - rDocSh.GetMedium()->GetItemSet() != nullptr && - (pItem = rDocSh.GetMedium()->GetItemSet()->GetItemIfSet( SID_FILE_FILTEROPTIONS ))) + (pItem = rDocSh.GetMedium()->GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ))) { sAsciiOptions = pItem->GetValue(); } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 96c5b7f8f708..14145a1ed35f 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1308,7 +1308,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, v { sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ); sFilterName = pMedium->GetFilter()->GetFilterName(); - if ( const SfxStringItem* pItem = pMedium->GetItemSet()->GetItemIfSet( SID_PASSWORD, false ) ) + if ( const SfxStringItem* pItem = pMedium->GetItemSet().GetItemIfSet( SID_PASSWORD, false ) ) sPassword = pItem->GetValue(); ::lcl_ReadSections(*pMedium, *m_xSubRegionED); } @@ -1770,7 +1770,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil { m_sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ); m_sFilterName = pMedium->GetFilter()->GetFilterName(); - if ( const SfxStringItem* pItem = pMedium->GetItemSet()->GetItemIfSet( SID_PASSWORD, false ) ) + if ( const SfxStringItem* pItem = pMedium->GetItemSet().GetItemIfSet( SID_PASSWORD, false ) ) m_sFilePasswd = pItem->GetValue(); m_xFileNameED->set_text( INetURLObject::decode( m_sFileName, INetURLObject::DecodeMechanism::Unambiguous ) ); diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 5e38ee835078..9d8dfadbdef6 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -880,7 +880,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // update fixed fields if (pDocSh->GetMedium()) { - const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(pDocSh->GetMedium()->GetItemSet(), SID_TEMPLATE, false); + const SfxBoolItem* pTemplateItem = pDocSh->GetMedium()->GetItemSet().GetItem(SID_TEMPLATE, false); if (pTemplateItem && pTemplateItem->GetValue()) { // assume that not calling via SwEditShell::SetFixFields @@ -894,7 +894,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // Update all FIX-Date/Time fields if( pWrtSh ) { - const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(pDocSh->GetMedium()->GetItemSet(), SID_UPDATEDOCMODE, false); + const SfxUInt16Item* pUpdateDocItem = pDocSh->GetMedium()->GetItemSet().GetItem(SID_UPDATEDOCMODE, false); 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 22c9a18c45ae..c3160e0ead9f 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -139,10 +139,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr, SwPaM* pPaM ) { bool bAPICall = false; - const SfxBoolItem* pApiItem; - const SfxItemSet* pMedSet = rMedium.GetItemSet(); - if( pMedSet && - (pApiItem = pMedSet->GetItemIfSet( FN_API_CALL )) ) + if( const SfxBoolItem* pApiItem = rMedium.GetItemSet().GetItemIfSet( FN_API_CALL ) ) bAPICall = pApiItem->GetValue(); std::shared_ptr<const SfxFilter> pFlt = rMedium.GetFilter(); @@ -177,7 +174,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr, return nullptr; // #i30171# set the UpdateDocMode at the SwDocShell - const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); + const SfxUInt16Item* pUpdateDocItem = rMedium.GetItemSet().GetItem(SID_UPDATEDOCMODE, false); m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; if (!pFlt->GetDefaultTemplate().isEmpty()) @@ -187,10 +184,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr, pFlt->GetUserData() == FILTER_TEXT_DLG ) { SwAsciiOptions aOpt; - const SfxItemSet* pSet = rMedium.GetItemSet(); - const SfxStringItem* pItem; - if( pSet && - (pItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS )) ) + if( const SfxStringItem* pItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) aOpt.ReadUserData( pItem->GetValue() ); pRead->GetReaderOpt().SetASCIIOpts( aOpt ); @@ -425,7 +419,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) { // Don't save data source in case a temporary is being saved for preview in MM wizard if (const SfxBoolItem* pNoEmbDS - = SfxItemSet::GetItem(rMedium.GetItemSet(), SID_NO_EMBEDDED_DS, false)) + = rMedium.GetItemSet().GetItem(SID_NO_EMBEDDED_DS, false)) bSaveDS = !pNoEmbDS->GetValue(); } if (bSaveDS) @@ -462,7 +456,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium ) if (!bCopyTo) { if (const SfxBoolItem* pSaveToItem - = SfxItemSet::GetItem(rMedium.GetItemSet(), SID_SAVETO, false)) + = rMedium.GetItemSet().GetItem(SID_SAVETO, false)) bCopyTo = pSaveToItem->GetValue(); } @@ -745,12 +739,8 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) { SwAsciiOptions aOpt; OUString sItemOpt; - const SfxItemSet* pSet = rMedium.GetItemSet(); - if( nullptr != pSet ) - { - if( const SfxStringItem* pItem = pSet->GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) - sItemOpt = pItem->GetValue(); - } + if( const SfxStringItem* pItem = rMedium.GetItemSet().GetItemIfSet( SID_FILE_FILTEROPTIONS ) ) + sItemOpt = pItem->GetValue(); if(!sItemOpt.isEmpty()) aOpt.ReadUserData( sItemOpt ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 0a8e4e6c7900..5bf5b65c3af3 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1733,7 +1733,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh, if( pMed && pMed->GetURLObject() == aTmpObj ) { const SfxPoolItem* pItem; - if( ( SfxItemState::SET == pMed->GetItemSet()->GetItemState( + if( ( SfxItemState::SET == pMed->GetItemSet().GetItemState( SID_VERSION, false, &pItem ) ) ? (nVersion == static_cast<const SfxInt16Item*>(pItem)->GetValue()) : !nVersion ) @@ -1773,10 +1773,10 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh, } if( nVersion ) - xMed->GetItemSet()->Put( SfxInt16Item( SID_VERSION, nVersion )); + xMed->GetItemSet().Put( SfxInt16Item( SID_VERSION, nVersion )); if( !rPasswd.isEmpty() ) - xMed->GetItemSet()->Put( SfxStringItem( SID_PASSWORD, rPasswd )); + xMed->GetItemSet().Put( SfxStringItem( SID_PASSWORD, rPasswd )); if( !pSfxFlt ) aMatcher.DetectFilter( *xMed, pSfxFlt ); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 7407de9ef6f5..0323fe332a43 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -493,7 +493,7 @@ bool SwDocShell::Load( SfxMedium& rMedium ) m_xBasePool = new SwDocStyleSheetPool( *m_xDoc, SfxObjectCreateMode::ORGANIZER == GetCreateMode() ); if(GetCreateMode() != SfxObjectCreateMode::ORGANIZER) { - const SfxUInt16Item* pUpdateDocItem = SfxItemSet::GetItem<SfxUInt16Item>(rMedium.GetItemSet(), SID_UPDATEDOCMODE, false); + const SfxUInt16Item* pUpdateDocItem = rMedium.GetItemSet().GetItem(SID_UPDATEDOCMODE, false); m_nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 5a536cc9ef58..f16fadeaa395 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -820,15 +820,12 @@ static bool lcl_SaveDoc( SfxMedium* pDstMed = new SfxMedium( url, StreamMode::STD_READWRITE ); pDstMed->SetFilter( pStoreToFilter ); - if( pDstMed->GetItemSet() ) - { - if( pStoreToFilterOptions ) - pDstMed->GetItemSet()->Put( SfxStringItem(SID_FILE_FILTEROPTIONS, - *pStoreToFilterOptions)); - if( pSaveToFilterData->hasElements() ) - pDstMed->GetItemSet()->Put( SfxUnoAnyItem(SID_FILTER_DATA, - uno::Any(*pSaveToFilterData))); - } + if( pStoreToFilterOptions ) + pDstMed->GetItemSet().Put( SfxStringItem(SID_FILE_FILTEROPTIONS, + *pStoreToFilterOptions)); + if( pSaveToFilterData->hasElements() ) + pDstMed->GetItemSet().Put( SfxUnoAnyItem(SID_FILTER_DATA, + uno::Any(*pSaveToFilterData))); // convert fields to text if we are exporting to PDF. // this prevents a second merge while updating the fields diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 5e59d75ba043..d1f18b7b08b9 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -549,7 +549,7 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify, LinkParamNone*, void) m_aTimer.Start(); const SfxBoolItem *pItem = - GetObjectShell()->GetMedium()->GetItemSet()-> + GetObjectShell()->GetMedium()->GetItemSet(). GetItemIfSet( SID_HIDDEN, false ); if ( !pItem || !pItem->GetValue() ) { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 603ce43210a0..8af40e5e2447 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3055,8 +3055,7 @@ void SAL_CALL SwXTextDocument::render( // prevent crash described in #i108805 SwDocShell *pRenderDocShell = pDoc->GetDocShell(); - SfxItemSet *pSet = pRenderDocShell->GetMedium()->GetItemSet(); - pSet->Put( SfxBoolItem( SID_HIDDEN, false ) ); + pRenderDocShell->GetMedium()->GetItemSet().Put( SfxBoolItem( SID_HIDDEN, false ) ); } } |