ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

use more TypedWhichId

Browse Source 
Change-Id: Icc1cbd2717034c87bdaea1b62253b001243c6652
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152290
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-05-26 11:18:07 +02:00
parent d1b0dbcbd7
commit 2d6dff8d98
10 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/source/tabpages/page.cxx
+2 -2
View File
@@ -723,14 +723,14 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
}
// paper tray
nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN );
TypedWhichId<SvxPaperBinItem> nPaperWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN );
sal_Int32 nPos = m_xPaperTrayBox->get_active();
sal_uInt16 nBin = m_xPaperTrayBox->get_id(nPos).toInt32();
pOld = GetOldItem( *rSet, SID_ATTR_PAGE_PAPERBIN );
if ( !pOld || static_cast<const SvxPaperBinItem*>(pOld)->GetValue() != nBin )
{
rSet->Put( SvxPaperBinItem( nWhich, static_cast<sal_uInt8>(nBin) ) );
rSet->Put( SvxPaperBinItem( nPaperWhich, static_cast<sal_uInt8>(nBin) ) );
bModified = true;
}
cui/source/tabpages/paragrph.cxx
+4 -4
View File
@@ -1779,14 +1779,14 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
}
// widows and orphans
_nWhich = GetWhich( SID_ATTR_PARA_WIDOWS );
TypedWhichId<SvxWidowsItem> nWidowsWhich = GetWhich( SID_ATTR_PARA_WIDOWS );
eState = m_xWidowBox->get_state();
if ( m_xWidowBox->get_state_changed_from_saved() ||
m_xWidowRowNo->get_value_changed_from_saved() )
{
SvxWidowsItem rItem( eState == TRISTATE_TRUE ?
static_cast<sal_uInt8>(m_xWidowRowNo->get_value()) : 0, _nWhich );
static_cast<sal_uInt8>(m_xWidowRowNo->get_value()) : 0, nWidowsWhich );
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_WIDOWS );
if ( m_xWidowBox->get_state_changed_from_saved() || !pOld || !( *static_cast<const SvxWidowsItem*>(pOld) == rItem ) )
@@ -1796,14 +1796,14 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
}
}
_nWhich = GetWhich( SID_ATTR_PARA_ORPHANS );
TypedWhichId<SvxOrphansItem> nOrphansWhich = GetWhich( SID_ATTR_PARA_ORPHANS );
eState = m_xOrphanBox->get_state();
if ( m_xOrphanBox->get_state_changed_from_saved() ||
m_xOrphanRowNo->get_value_changed_from_saved() )
{
SvxOrphansItem rItem( eState == TRISTATE_TRUE ?
static_cast<sal_uInt8>(m_xOrphanRowNo->get_value()) : 0, _nWhich );
static_cast<sal_uInt8>(m_xOrphanRowNo->get_value()) : 0, nOrphansWhich );
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_ORPHANS );
if ( m_xOrphanBox->get_state_changed_from_saved() ||
editeng/source/rtf/rtfitem.cxx
+2 -2
View File
@@ -560,7 +560,7 @@ SET_FONTALIGNMENT:
break;
case RTF_EXPND:
if (const sal_uInt16 wid = aPlainMap[SID_ATTR_CHAR_KERNING])
if (TypedWhichId<SvxKerningItem> wid = aPlainMap[SID_ATTR_CHAR_KERNING])
{
if( -1 == nTokenValue )
nTokenValue = 0;
@@ -586,7 +586,7 @@ SET_FONTALIGNMENT:
break;
case RTF_EXPNDTW:
if (const sal_uInt16 wid = aPlainMap[SID_ATTR_CHAR_KERNING])
if (TypedWhichId<SvxKerningItem> wid = aPlainMap[SID_ATTR_CHAR_KERNING])
{
if( -1 == nTokenValue )
nTokenValue = 0;
include/editeng/editids.hrc
+4 -2
View File
@@ -50,6 +50,7 @@ class SvxKerningItem;
class SvxLanguageItem;
class SvxLineSpacingItem;
class SvxLRSpaceItem;
class SvxOrphansItem;
class SvxOverlineItem;
class SvxPageModelItem;
class SvxParaVertAlignItem;
@@ -62,6 +63,7 @@ class SvxTwoLinesItem;
class SvxUnderlineItem;
class SvxULSpaceItem;
class SvxWeightItem;
class SvxWidowsItem;
class SvxWordLineModeItem;
/*
@@ -107,8 +109,8 @@ class SvxWordLineModeItem;
#define SID_ATTR_PARA_PAGEBREAK ( SID_SVX_START + 37 )
#define SID_ATTR_PARA_HYPHENZONE TypedWhichId<SvxHyphenZoneItem>( SID_SVX_START + 38 )
#define SID_ATTR_PARA_SPLIT TypedWhichId<SvxFormatSplitItem>( SID_SVX_START + 39 )
#define SID_ATTR_PARA_ORPHANS ( SID_SVX_START + 40 )
#define SID_ATTR_PARA_WIDOWS ( SID_SVX_START + 41 )
#define SID_ATTR_PARA_ORPHANS TypedWhichId<SvxOrphansItem>( SID_SVX_START + 40 )
#define SID_ATTR_PARA_WIDOWS TypedWhichId<SvxWidowsItem>( SID_SVX_START + 41 )
#define SID_ATTR_PARA_ULSPACE ( SID_SVX_START + 42 )
#define SID_ATTR_PARA_LRSPACE ( SID_SVX_START + 43 )
#define SID_ATTR_PARA_LEFTSPACE ( SID_SVX_START + 44 )
include/sfx2/sfxsids.hrc
+5 -4
View File
@@ -28,9 +28,10 @@ class SfxBoolItem;
class SfxDocumentInfoItem;
class SfxEventNamesItem;
class SfxFlagItem;
class SfxHyphenRegionItem;
class SfxImageItem;
class SfxInt16Item;
class SfxInt32Item;
class SfxHyphenRegionItem;
class SfxMacroInfoItem;
class SfxScriptOrganizerItem;
class SfxStringItem;
@@ -142,7 +143,7 @@ class SvxZoomItem;
#define SID_CLOSEDOC_SAVE (SID_SFX_START + 1)
#define SID_CLOSEDOC_FILENAME (SID_SFX_START + 2)
#define SID_PRINTDOC (SID_SFX_START + 504)
#define SID_PRINT_COPIES (SID_SFX_START + 3)
#define SID_PRINT_COPIES TypedWhichId<SfxInt16Item>(SID_SFX_START + 3)
#define SID_PRINT_PAGES TypedWhichId<SfxStringItem>(SID_SFX_START +1589)
#define SID_PRINT_COLLATE (SID_SFX_START +1590)
#define SID_PRINT_SORT (SID_SFX_START +1591)
@@ -228,7 +229,7 @@ class SvxZoomItem;
#define SID_ATTR_TARGETLANG_STR (SID_SFX_START + 1664)
// FREE
#define SID_OUTPUTSTREAM TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1666)
#define SID_IMAGE_ORIENTATION (SID_SFX_START + 1667)
#define SID_IMAGE_ORIENTATION TypedWhichId<SfxImageItem>(SID_SFX_START + 1667)
#define SID_STOP_RECORDING (SID_SFX_START + 1671)
#define SID_INTERACTIONHANDLER TypedWhichId<SfxUnoAnyItem>(SID_SFX_START + 1675)
@@ -400,7 +401,7 @@ class SvxZoomItem;
#define SID_HYPERLINK_DIALOG TypedWhichId<SfxBoolItem>(SID_SFX_START + 678)
#define SID_DEFAULTFILEPATH (SID_SFX_START + 571)
#define SID_OBJECT (SID_SFX_START + 575)
#define SID_OBJECT TypedWhichId<SfxInt16Item>(SID_SFX_START + 575)
// Doc-Properties
#define SID_DOCFULLNAME TypedWhichId<SfxStringItem>(SID_SFX_START + 581)
include/svx/svxids.hrc
+6 -5
View File
@@ -28,6 +28,7 @@ class OfaPtrItem;
class OfaXColorListItem;
class SdrAngleItem;
class SfxBoolItem;
class SfxInt16Item;
class SfxInt32Item;
class SfxInt64Item;
class SfxIntegerListItem;
@@ -710,11 +711,11 @@ class XFillGradientItem;
#define SID_PARAM_NUM_PRESET TypedWhichId<SfxBoolItem>( SID_SVX_START + 856 )
#define SID_PARAM_CUR_NUM_LEVEL TypedWhichId<SfxUInt16Item>( SID_SVX_START + 859 )
#define SID_CREATE_SW_DRAWVIEW ( SID_SVX_START + 860 )
#define SID_ATTR_GRAF_LUMINANCE ( SID_SVX_START + 863 )
#define SID_ATTR_GRAF_CONTRAST ( SID_SVX_START + 864 )
#define SID_ATTR_GRAF_RED ( SID_SVX_START + 865 )
#define SID_ATTR_GRAF_GREEN ( SID_SVX_START + 866 )
#define SID_ATTR_GRAF_BLUE ( SID_SVX_START + 867 )
#define SID_ATTR_GRAF_LUMINANCE TypedWhichId<SfxInt16Item>( SID_SVX_START + 863 )
#define SID_ATTR_GRAF_CONTRAST TypedWhichId<SfxInt16Item>( SID_SVX_START + 864 )
#define SID_ATTR_GRAF_RED TypedWhichId<SfxInt16Item>( SID_SVX_START + 865 )
#define SID_ATTR_GRAF_GREEN TypedWhichId<SfxInt16Item>( SID_SVX_START + 866 )
#define SID_ATTR_GRAF_BLUE TypedWhichId<SfxInt16Item>( SID_SVX_START + 867 )
#define SID_ATTR_GRAF_GAMMA ( SID_SVX_START + 868 )
#define SID_ATTR_GRAF_TRANSPARENCE TypedWhichId<SfxUInt16Item>( SID_SVX_START + 869 )
#define SID_ATTR_GRAF_INVERT ( SID_SVX_START + 870 )
sc/inc/sc.hrc
+2 -2
View File
@@ -522,7 +522,7 @@ static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc slots ids trampling inf
#define SID_RANGE_ROW TypedWhichId<SfxInt32Item>(SID_NEW_SLOTS+20)
#define SID_RANGE_COL TypedWhichId<SfxInt16Item>(SID_NEW_SLOTS+21)
#define SID_RANGE_TABLE (SID_NEW_SLOTS+22)
#define SID_RANGE_TABLE TypedWhichId<SfxInt16Item>(SID_NEW_SLOTS+22)
// empty, was SID_RANGE_VALUE
#define SID_RANGE_FORMULA TypedWhichId<SfxStringItem>(SID_NEW_SLOTS+24)
#define SID_RANGE_TEXTVALUE TypedWhichId<SfxStringItem>(SID_NEW_SLOTS+26)
@@ -636,7 +636,7 @@ static_assert(SID_PREVIEW_END < SID_KEYFUNC_START, "calc slots ids trampling inf
// Sidebar -------------------------------------------------------------
#define SID_PROPERTY_PANEL_CELLTEXT_DLG (SC_SIDEBAR_PROPERTY_BEGIN+0)
#define SID_NUMBER_TYPE_FORMAT (SC_SIDEBAR_PROPERTY_BEGIN+1)
#define SID_NUMBER_TYPE_FORMAT TypedWhichId<SfxInt16Item>(SC_SIDEBAR_PROPERTY_BEGIN+1)
// resources
starmath/inc/starmath.hrc
+2 -1
View File
@@ -22,6 +22,7 @@
#include <svl/solar.hrc>
class SfxBoolItem;
class SfxInt16Item;
class SfxUInt16Item;
#define SID_NEXTERR (SID_SMA_START + 1)
@@ -43,7 +44,7 @@ class SfxUInt16Item;
#define SID_IMPORT_FORMULA (SID_SMA_START + 58)
#define SID_IMPORT_MATHML_CLIPBOARD (SID_SMA_START + 59)
#define SID_TEXT TypedWhichId<SfxStringItem>(SID_SMA_START + 100)
#define SID_GRAPHIC_SM (SID_SMA_START + 101)
#define SID_GRAPHIC_SM TypedWhichId<SfxInt16Item>(SID_SMA_START + 101)
/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
#define SID_INSERTSPECIAL TypedWhichId<SfxStringItem>(SID_SMA_START + 104)
/** Command for inserting a math construction */
sw/inc/cmdid.h
+3 -3
View File
@@ -896,15 +896,15 @@ class SwUINumRuleItem;
#define FN_UNO_DESCRIPTION TypedWhichId<SfxStringItem>(FN_FRAME + 20)
#define FN_UNO_TOOLTIP (FN_FRAME + 21)
#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 0)
#define SID_ATTR_PAGE_COLUMN TypedWhichId<SfxInt16Item>(FN_SIDEBAR + 0)
#define SID_ATTR_PAGE_HEADER (FN_SIDEBAR + 3)
#define SID_ATTR_PAGE_HEADER_LRMARGIN TypedWhichId<SvxLongLRSpaceItem>(FN_SIDEBAR + 4)
#define SID_ATTR_PAGE_HEADER_SPACING TypedWhichId<SvxLongULSpaceItem>(FN_SIDEBAR + 5)
#define SID_ATTR_PAGE_HEADER_LAYOUT (FN_SIDEBAR + 6)
#define SID_ATTR_PAGE_HEADER_LAYOUT TypedWhichId<SfxInt16Item>(FN_SIDEBAR + 6)
#define SID_ATTR_PAGE_FOOTER (FN_SIDEBAR + 7)
#define SID_ATTR_PAGE_FOOTER_LRMARGIN TypedWhichId<SvxLongLRSpaceItem>(FN_SIDEBAR + 8)
#define SID_ATTR_PAGE_FOOTER_SPACING TypedWhichId<SvxLongULSpaceItem>(FN_SIDEBAR + 9)
#define SID_ATTR_PAGE_FOOTER_LAYOUT (FN_SIDEBAR + 10)
#define SID_ATTR_PAGE_FOOTER_LAYOUT TypedWhichId<SfxInt16Item>(FN_SIDEBAR + 10)
#define SID_ATTR_PAGE_MARGIN (FN_SIDEBAR + 11)
//Member IDs for Fill / SetVariable of items
sw/source/uibase/uiview/viewtab.cxx
+2 -2
View File
@@ -1222,7 +1222,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
{
if ( pReqArgs && rDesc.GetMaster().GetHeader().IsActive())
{
const SfxInt16Item& aLayoutItem = static_cast<const SfxInt16Item&>(pReqArgs->Get(SID_ATTR_PAGE_HEADER_LAYOUT));
const SfxInt16Item& aLayoutItem = pReqArgs->Get(SID_ATTR_PAGE_HEADER_LAYOUT);
sal_uInt16 nLayout = aLayoutItem.GetValue();
SwPageDesc aDesc(rDesc);
aDesc.ChgHeaderShare((nLayout>>1) == 0);
@@ -1275,7 +1275,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
{
if ( pReqArgs && rDesc.GetMaster().GetFooter().IsActive())
{
const SfxInt16Item& aLayoutItem = static_cast<const SfxInt16Item&>(pReqArgs->Get(SID_ATTR_PAGE_FOOTER_LAYOUT));
const SfxInt16Item& aLayoutItem = pReqArgs->Get(SID_ATTR_PAGE_FOOTER_LAYOUT);
sal_uInt16 nLayout = aLayoutItem.GetValue();
SwPageDesc aDesc(rDesc);
aDesc.ChgFooterShare((nLayout>>1) == 0);