Commits

Anonymous committed 418d129

new_itemsets: alway put item at the which-id of the item (cui)

Comments (0)

Files changed (8)

cui/source/dialogs/cuihyperdlg.cxx

 		                       SID_HYPERLINK_SETLINK );
 
 	SvxHyperlinkItem aItem;
-	mpItemSet->Put (aItem, SID_HYPERLINK_GETLINK);
+	mpItemSet->Put (aItem);
 
 	SetInputSet (mpItemSet);
 

cui/source/dialogs/hltpbase.cxx

 		SfxItemSet* pItemSet = new SfxItemSet(SFX_APP()->GetPool(),
 			                                  SID_ATTR_MACROITEM,
 											  SID_ATTR_MACROITEM );
-		pItemSet->Put ( aItem, SID_ATTR_MACROITEM );
+		pItemSet->Put ( aItem );
 
         // --> PB 2006-01-13 #123474#
         /*  disable HyperLinkDlg for input while the MacroAssignDlg is working

cui/source/options/connpooloptions.cxx

 		// the enabled flag
 		if (m_aEnablePooling.GetSavedValue() != m_aEnablePooling.IsChecked())
 		{
-			_rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_aEnablePooling.IsChecked()), SID_SB_POOLING_ENABLED);
+			_rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_aEnablePooling.IsChecked()));
 			bModified = sal_True;
 		}
 
 		// the settings for the single drivers
 		if (m_pDriverList->isModified())
 		{
-			_rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
+			_rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()));
 			bModified = sal_True;
 		}
 

cui/source/options/dbregister.cxx

 	}
 	if ( m_nOldCount != aRegistrations.size() || m_bModified )
 	{
-		rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
+		rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ));
 		bModified = sal_True;
 	}
 

cui/source/options/internationaloptions.cxx

 
 		// handling of DefaultTextDirection stuff
 		_rSet.Put(	SfxBoolItem(	_rSet.GetPool()->GetWhich( SID_ATTR_PARA_LEFT_TO_RIGHT ),
-									m_aRB_TxtDirLeft2Right.IsChecked() ),
-					SID_ATTR_PARA_LEFT_TO_RIGHT );
+									m_aRB_TxtDirLeft2Right.IsChecked() ));
 
 		// handling of SheetView stuff
 //		if( m_bEnable_SheetView_Opt )

cui/source/tabpages/numpages.cxx

 	if( (bPreset || bModified) && pSaveNum)
 	{
 		*pSaveNum = *pActNum;
-		rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+		rSet.Put(SvxNumBulletItem( *pSaveNum ));
 		rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
 	}
 
 	if( (bPreset || bModified) && pActNum)
 	{
 		*pSaveNum = *pActNum;
-		rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+		rSet.Put(SvxNumBulletItem( *pSaveNum ));
 		rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
 	}
 	return bModified;
 	if( (bPreset || bModified) && pActNum)
 	{
 		*pSaveNum = *pActNum;
-		rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+		rSet.Put(SvxNumBulletItem( *pSaveNum ));
 		rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
 	}
 	return bModified;
 	if( (bPreset || bModified) && pActNum)
 	{
 		*pSaveNum = *pActNum;
-		rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+		rSet.Put(SvxNumBulletItem( *pSaveNum ));
 		rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
 	}
 
 	if(bModified && pActNum)
 	{
 		*pSaveNum = *pActNum;
-		rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+		rSet.Put(SvxNumBulletItem( *pSaveNum ));
 		rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, FALSE));
 	}
 	return bModified;
     if(bModified && pActNum)
 	{
 		*pSaveNum = *pActNum;
-		rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+		rSet.Put(SvxNumBulletItem( *pSaveNum ));
 		rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, FALSE));
 	}
 	return bModified;

cui/source/tabpages/tparea.cxx

 	aLbHatchBckgrdColor.Enable( aCbxHatchBckgrd.IsChecked() );
 
 	XFillBackgroundItem aItem( aCbxHatchBckgrd.IsChecked() );
-	rXFSet.Put ( aItem, XATTR_FILLBACKGROUND );
+	rXFSet.Put ( aItem );
 
 	aCtlXRectPreview.SetAttributes( aXFillAttr.GetItemSet() );
 	aCtlXRectPreview.Invalidate();

extensions/source/propctrlr/fontdialog.cxx

             SvxCharReliefItem aFontReliefItem((FontRelief)nFontRelief, CFID_RELIEF);
             SvxEmphasisMarkItem aEmphasisMarkitem((FontEmphasisMark)nFontEmphasisMark, CFID_EMPHASIS);
 
-			_pSet->Put(aFontItem, CFID_FONT);
-			_pSet->Put(aSvxFontHeightItem,CFID_HEIGHT);
-			_pSet->Put(aWeightItem, CFID_WEIGHT);
-			_pSet->Put(aPostureItem, CFID_POSTURE);
-			_pSet->Put(aLanguageItem, CFID_LANGUAGE);
-			_pSet->Put(aUnderlineItem,CFID_UNDERLINE);
-			_pSet->Put(aCrossedOutItem,CFID_STRIKEOUT);
-			_pSet->Put(aWordLineModeItem, CFID_WORDLINEMODE);
-			_pSet->Put(aSvxColorItem, CFID_CHARCOLOR);
-			_pSet->Put(aFontReliefItem, CFID_RELIEF);
-			_pSet->Put(aEmphasisMarkitem, CFID_EMPHASIS);
+			_pSet->Put(aFontItem);
+			_pSet->Put(aSvxFontHeightItem);
+			_pSet->Put(aWeightItem);
+			_pSet->Put(aPostureItem);
+			_pSet->Put(aLanguageItem);
+			_pSet->Put(aUnderlineItem);
+			_pSet->Put(aCrossedOutItem);
+			_pSet->Put(aWordLineModeItem);
+			_pSet->Put(aSvxColorItem);
+			_pSet->Put(aFontReliefItem);
+			_pSet->Put(aEmphasisMarkitem);
 
 			aPropExtractor.invalidateItem(PROPERTY_FONT_NAME, CFID_FONT, *_pSet);
 			aPropExtractor.invalidateItem(PROPERTY_FONT_HEIGHT, CFID_HEIGHT, *_pSet);