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>

4 files changed, 23 insertions, 53 deletions

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();