diff options
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/chrdlg/ccoll.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/config/cfgitems.cxx | 16 | ||||
-rw-r--r-- | sw/source/uibase/dialog/swwrtshitem.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/envelp/envimg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/envelp/labimg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/cfgitems.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/uiitems.cxx | 9 |
7 files changed, 19 insertions, 17 deletions
diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx index 547566c427a0..01606dc73f4f 100644 --- a/sw/source/uibase/chrdlg/ccoll.cxx +++ b/sw/source/uibase/chrdlg/ccoll.cxx @@ -118,7 +118,7 @@ const CommandStruct SwCondCollItem::s_aCmds[] = // Item for the transport of the condition table SwCondCollItem::SwCondCollItem() : - SfxPoolItem(FN_COND_COLL) + SfxPoolItem(FN_COND_COLL, SfxItemType::SwCondCollItemType) { } diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index e32c86e14c52..693837d84f10 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -24,7 +24,7 @@ SwDocDisplayItem::SwDocDisplayItem() : - SfxPoolItem(FN_PARAM_DOCDISP) + SfxPoolItem(FN_PARAM_DOCDISP, SfxItemType::SwDocDisplayItemType) { m_bParagraphEnd = m_bTab = @@ -39,7 +39,7 @@ SwDocDisplayItem::SwDocDisplayItem() : // Item for the Settings dialog, page document view SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt ) : - SfxPoolItem( FN_PARAM_DOCDISP ) + SfxPoolItem( FN_PARAM_DOCDISP, SfxItemType::SwDocDisplayItemType ) { m_bParagraphEnd = rVOpt.IsParagraph(true); m_bTab = rVOpt.IsTab(true); @@ -88,7 +88,7 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const } SwElemItem::SwElemItem() : - SfxPoolItem(FN_PARAM_ELEM) + SfxPoolItem(FN_PARAM_ELEM, SfxItemType::SwElemItemType) { m_bVertRuler = m_bVertRulerRight= @@ -107,7 +107,7 @@ SwElemItem::SwElemItem() : } SwElemItem::SwElemItem(const SwViewOption& rVOpt) : - SfxPoolItem( FN_PARAM_ELEM ) + SfxPoolItem( FN_PARAM_ELEM, SfxItemType::SwElemItemType ) { m_bVertRuler = rVOpt.IsViewVRuler(true); m_bVertRulerRight = rVOpt.IsVRulerRight(); @@ -173,13 +173,13 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const // CTOR for empty Item SwAddPrinterItem::SwAddPrinterItem(): - SfxPoolItem(FN_PARAM_ADDPRINTER) + SfxPoolItem(FN_PARAM_ADDPRINTER, SfxItemType::SwAddPrinterItemType) { } // CTOR from SwPrintOptions SwAddPrinterItem::SwAddPrinterItem( const SwPrintData& rPrtData ) : - SfxPoolItem(FN_PARAM_ADDPRINTER) + SfxPoolItem(FN_PARAM_ADDPRINTER, SfxItemType::SwAddPrinterItemType) { SwPrintData::operator=(rPrtData); } @@ -200,14 +200,14 @@ bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const // Item for Settings dialog, ShadowCursorPage SwShadowCursorItem::SwShadowCursorItem() - : SfxPoolItem( FN_PARAM_SHADOWCURSOR ), + : SfxPoolItem( FN_PARAM_SHADOWCURSOR, SfxItemType::SwShadowCursorItemType ), m_eMode( SwFillMode::Tab ) ,m_bOn( false ) { } SwShadowCursorItem::SwShadowCursorItem( const SwViewOption& rVOpt ) - : SfxPoolItem( FN_PARAM_SHADOWCURSOR ), + : SfxPoolItem( FN_PARAM_SHADOWCURSOR, SfxItemType::SwShadowCursorItemType ), m_eMode( rVOpt.GetShdwCursorFillMode() ) ,m_bOn( rVOpt.IsShadowCursor() ) diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx index d64f716b1492..833b9bfb3970 100644 --- a/sw/source/uibase/dialog/swwrtshitem.cxx +++ b/sw/source/uibase/dialog/swwrtshitem.cxx @@ -21,7 +21,8 @@ #include <globals.hrc> SwWrtShellItem::SwWrtShellItem( SwWrtShell* pSh ) - : SfxPoolItem( SID_WRT_SHELL ), m_pWrtSh( pSh ) + : SfxPoolItem( SID_WRT_SHELL, SfxItemType::SwWrtShellItemType ) + , m_pWrtSh( pSh ) { } diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index b36cfdfa51f3..7fb49d88c42a 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -88,7 +88,7 @@ OUString MakeSender() } SwEnvItem::SwEnvItem() : - SfxPoolItem(FN_ENVELOP) + SfxPoolItem(FN_ENVELOP, SfxItemType::SwEnvItemType) { m_bSend = true; m_aSendText = MakeSender(); diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index b87f9bf5fb29..d4f4b5537cf0 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::uno; SwLabItem::SwLabItem() : - SfxPoolItem(FN_LABEL), + SfxPoolItem(FN_LABEL, SfxItemType::SwLabItemType), m_lLeft (0), m_lUpper(0), m_nCols (1), diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 34ffa2d24e12..8f7dc0bd3b72 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwTestItem final : public SfxPoolItem bool m_bTest10:1; public: - SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST) {}; + SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST, SfxItemType::SwTestItemType) {}; virtual SwTestItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index b88751abdddb..7aafbfdfce16 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo const & rInfo) : - SfxPoolItem( FN_PARAM_FTN_INFO ), + SfxPoolItem( FN_PARAM_FTN_INFO, SfxItemType::SwPageFootnoteInfoItemType ), m_aFootnoteInfo(rInfo) { } @@ -191,7 +191,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) } SwPtrItem::SwPtrItem( const sal_uInt16 nId, void* pPtr ) : - SfxPoolItem( nId ), + SfxPoolItem( nId, SfxItemType::SwPtrItemType ), m_pMisc(pPtr) { } @@ -212,7 +212,8 @@ bool SwPtrItem::operator==( const SfxPoolItem& rAttr ) const // SwUINumRuleItem for the NumTabPages of the FormatNumRule/Styleists SwUINumRuleItem::SwUINumRuleItem( const SwNumRule& rRul ) - : SfxPoolItem( FN_PARAM_ACT_NUMBER ), m_pRule( new SwNumRule( rRul ) ) + : SfxPoolItem( FN_PARAM_ACT_NUMBER, SfxItemType::SwUINumRuleItemType ) + , m_pRule( new SwNumRule( rRul ) ) { } @@ -258,7 +259,7 @@ bool SwUINumRuleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } SwPaMItem::SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM ) : - SfxPoolItem( nId ), + SfxPoolItem( nId, SfxItemType::SwPaMItemType ), m_pPaM(pPaM) { } |