tdf#34465 remove calls to SfxItemSet::Put(const SfxPoolItem&, sal_uInt16)

and put an assert in SfxPoolItem::SetWhich() so nothing new
creeps in.

Change-Id: I6497650fa61ffb2b6941ffff2d471c8f117be1df
Reviewed-on: https://gerrit.libreoffice.org/24324
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

3 files changed, 11 insertions, 10 deletions

diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 3adfe2828d3c..6d38b347e55a 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -652,7 +652,7 @@ void IMapWindow::DoMacroAssign()
         SvxMacroItem    aMacroItem(SID_ATTR_MACROITEM);
         IMapObject*     pIMapObj = GetIMapObj( pSdrObj );
         aMacroItem.SetMacroTable( pIMapObj->GetMacroTable() );
-        aSet.Put( aMacroItem, SID_ATTR_MACROITEM );
+        aSet.Put( aMacroItem );
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         std::unique_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, mxDocumentFrame, SID_EVENTCONFIG ));
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 1ecba10f7180..7107b9d16d31 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -85,7 +85,8 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
     std::unique_ptr<NameOrIndex> pNewItem(createItem());
     pNewItem->SetName( aName );
     pNewItem->PutValue( aElement, mnMemberId );
-    maItemSetVector.back()->Put( *pNewItem, mnWhich );
+    pNewItem->SetWhich(mnWhich);
+    maItemSetVector.back()->Put( *pNewItem );
 }
 
 // XNameContainer
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index dc2eb3c808a8..5ed42a790cc2 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -151,17 +151,17 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const
     SfxItemSet* pInSet = new SfxItemSet( *mpModelPool, XATTR_LINESTART, XATTR_LINEEND );
     maItemSetVector.push_back( pInSet );
 
-    XLineEndItem aEndMarker;
+    XLineEndItem aEndMarker(XATTR_LINEEND);
     aEndMarker.SetName( aName );
     aEndMarker.PutValue( aElement, 0 );
 
-    pInSet->Put( aEndMarker, XATTR_LINEEND );
+    pInSet->Put( aEndMarker );
 
-    XLineStartItem aStartMarker;
+    XLineStartItem aStartMarker(XATTR_LINESTART);
     aStartMarker.SetName( aName );
     aStartMarker.PutValue( aElement, 0 );
 
-    pInSet->Put( aStartMarker, XATTR_LINESTART );
+    pInSet->Put( aStartMarker );
 }
 
 // XNameContainer
@@ -228,18 +228,18 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
         const NameOrIndex *pItem = static_cast<const NameOrIndex *>(&((*aIter)->Get( XATTR_LINEEND ) ));
         if( pItem->GetName() == aName )
         {
-            XLineEndItem aEndMarker;
+            XLineEndItem aEndMarker(XATTR_LINEEND);
             aEndMarker.SetName( aName );
             if( !aEndMarker.PutValue( aElement, 0 ) )
                 throw lang::IllegalArgumentException();
 
-            (*aIter)->Put( aEndMarker, XATTR_LINEEND );
+            (*aIter)->Put( aEndMarker );
 
-            XLineStartItem aStartMarker;
+            XLineStartItem aStartMarker(XATTR_LINESTART);
             aStartMarker.SetName( aName );
             aStartMarker.PutValue( aElement, 0 );
 
-            (*aIter)->Put( aStartMarker, XATTR_LINESTART );
+            (*aIter)->Put( aStartMarker );
             return;
         }
         ++aIter;