mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ITEM: Refactor ItemType

Browse Source 
ItemType is useful and faster than RTTI. Until now it was
implemented by a 16-bit member in the base class, plus
(potentially) all constructors having to hand a value
in at item construction type (of type SfxItemType) to
get that member set correctly.

This works, but there is no reliable way to guarantee
coverage, and there have already been cases with missing
SfxItemType - these fallback to '0' and thus all Items
with ItemType() == 0 are assumed equal and might be
static_cast'ed to the wrong classes. Note that I
identified *35* Items that had no correct ItemType
set/implemented actually. It also uses 16-bit per
incarnated Item at runtime.

I thought and realized now a more systematic approach
to do that with a pure virtual function at the Item
itself. That can also be secured by a clang compiler
plugin in the future to keep it working. It uses one
virtual function per derived class, no longer space
in incarnated Items. Also the constructors will get
more simple again.

But the main aspect is security - we cannot afford
Items potentially being held as equal if they are not.

Unfortunately C++ does not offer something like a
'strict pure virtual function' that would force to
be overloaded in every derivation, but the used
methotology and adding a clang test is reasonably
safe.

Have now done the cleanup of previous method.

Change-Id: I04768285f1e9b73d64b0bb87df401944b5d35678
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180017
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
This commit is contained in:
Armin Le Grand (Collabora) 2025-01-09 11:51:33 +01:00 committed by Armin Le Grand
parent 77e536c61a
commit 9304f13db6
385 changed files with 1125 additions and 1179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avmedia/source/framework/mediaitem.cxx
View File

@ -84,7 +84,7 @@ struct MediaItem::Impl
MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask nMaskSet )
: SfxPoolItem( i_nWhich, SfxItemType::MediaItemType )
: SfxPoolItem( i_nWhich )
, m_pImpl( new Impl(nMaskSet) )
{
}

4
basctl/source/basicide/sbxitem.cxx
View File

@ -31,7 +31,7 @@ SbxItem::SbxItem (
OUString aName,
SbxItemType eSbxType
) :
SfxPoolItem(nWhichItem, SfxItemType::SbxItemType),
SfxPoolItem(nWhichItem),
m_aDocument(std::move(aDocument)),
m_aLibName(std::move(aLibName)),
m_aName(std::move(aName)),
@ -46,7 +46,7 @@ SbxItem::SbxItem (
OUString aMethodName,
SbxItemType eSbxType
) :
SfxPoolItem(nWhichItem, SfxItemType::SbxItemType),
SfxPoolItem(nWhichItem),
m_aDocument(std::move(aDocument)),
m_aLibName(std::move(aLibName)),
m_aName(std::move(aName)),

2
cui/source/options/cfgchart.cxx
View File

@ -215,7 +215,7 @@ void SvxChartOptions::SetDefaultColors( const SvxChartColorTable& rDefColors )
SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, SvxChartColorTable aTable ) :
SfxPoolItem( nWhich_, SfxItemType::SvxChartColorTableItemType ),
SfxPoolItem( nWhich_ ),
m_aColorTable(std::move( aTable ))
{
}

1
cui/source/options/cfgchart.hxx
View File

@ -65,6 +65,7 @@ namespace SvxChartOptions
class SvxChartColorTableItem : public SfxPoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxChartColorTableItem)
SvxChartColorTableItem( sal_uInt16 nWhich, SvxChartColorTable );
virtual SvxChartColorTableItem* Clone( SfxItemPool *pPool = nullptr ) const override;

2
cui/source/options/connpoolsettings.cxx
View File

@ -46,7 +46,7 @@ namespace offapp
DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, DriverPoolingSettings _aSettings )
:SfxPoolItem(_nId, SfxItemType::DriverPoolingSettingsItemType)
:SfxPoolItem(_nId )
,m_aSettings(std::move(_aSettings))
{
}

2
cui/source/options/connpoolsettings.hxx
View File

@ -71,7 +71,7 @@ namespace offapp
DriverPoolingSettings m_aSettings;
public:
DECLARE_ITEM_TYPE_FUNCTION(DriverPoolingSettingsItem)
DriverPoolingSettingsItem( sal_uInt16 _nId, DriverPoolingSettings _aSettings );
virtual bool operator==( const SfxPoolItem& ) const override;

2
cui/source/options/dbregistersettings.cxx
View File

@ -26,7 +26,7 @@ namespace svx
{
DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, DatabaseRegistrations&& _rRegistrations )
:SfxPoolItem( _nId, SfxItemType::DatabaseMapItemType )
:SfxPoolItem( _nId )
,m_aRegistrations( std::move(_rRegistrations) )
{
}

2
cui/source/options/dbregistersettings.hxx
View File

@ -64,7 +64,7 @@ namespace svx
DatabaseRegistrations m_aRegistrations;
public:
DECLARE_ITEM_TYPE_FUNCTION(DatabaseMapItem)
DatabaseMapItem( sal_uInt16 _nId, DatabaseRegistrations&& _rRegistrations );
virtual bool operator==( const SfxPoolItem& ) const override;

2
dbaccess/source/ui/dlg/DbAdminImpl.cxx
View File

@ -1079,7 +1079,7 @@ void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSo
// DbuTypeCollectionItem
DbuTypeCollectionItem::DbuTypeCollectionItem(sal_Int16 _nWhich, ::dbaccess::ODsnTypeCollection* _pCollection)
:SfxPoolItem(_nWhich, SfxItemType::DbuTypeCollectionItemType)
:SfxPoolItem(_nWhich )
,m_pCollection(_pCollection)
{
}

1
dbaccess/source/ui/dlg/dsnItem.hxx
View File

@ -35,6 +35,7 @@ namespace dbaui
::dbaccess::ODsnTypeCollection* m_pCollection;
public:
DECLARE_ITEM_TYPE_FUNCTION(DbuTypeCollectionItem)
DbuTypeCollectionItem(sal_Int16 nWhich, ::dbaccess::ODsnTypeCollection* _pCollection);
DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource);

2
dbaccess/source/ui/dlg/optionalboolitem.cxx
View File

@ -24,7 +24,7 @@ namespace dbaui
// OptionalBoolItem
OptionalBoolItem::OptionalBoolItem( sal_uInt16 _nWhich )
:SfxPoolItem( _nWhich, SfxItemType::OptionalBoolItemType )
:SfxPoolItem( _nWhich )
{
}

1
dbaccess/source/ui/dlg/optionalboolitem.hxx
View File

@ -32,6 +32,7 @@ namespace dbaui
::std::optional< bool > m_aValue;
public:
DECLARE_ITEM_TYPE_FUNCTION(OptionalBoolItem)
explicit OptionalBoolItem( sal_uInt16 nWhich );
virtual bool operator==( const SfxPoolItem& _rItem ) const override;

1
dbaccess/source/ui/inc/stringlistitem.hxx
View File

@ -34,6 +34,7 @@ class OStringListItem : public SfxPoolItem
css::uno::Sequence<OUString> m_aList;
public:
DECLARE_ITEM_TYPE_FUNCTION(OStringListItem)
OStringListItem(sal_Int16 nWhich, const css::uno::Sequence<OUString>& _rList);
OStringListItem(const OStringListItem& _rSource);

2
dbaccess/source/ui/misc/stringlistitem.cxx
View File

@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
// OStringListItem
OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence<OUString>& _rList)
: SfxPoolItem(_nWhich, SfxItemType::OStringListItemType)
: SfxPoolItem(_nWhich)
, m_aList(_rList)
{
}

2
editeng/source/items/bulitem.cxx
View File

@ -22,7 +22,7 @@
#include <editeng/bulletitem.hxx>
SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich )
: SfxPoolItem(_nWhich, SfxItemType::SvxBulletItemType)
: SfxPoolItem(_nWhich)
, aFont(OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ))
, nStart(1)
, nStyle(SvxBulletStyle::N123)

2
editeng/source/items/charhiddenitem.cxx
View File

@ -24,7 +24,7 @@
SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId ) :
SfxBoolItem( nId, bHidden, SfxItemType::SvxCharHiddenItemType )
SfxBoolItem( nId, bHidden )
{
}

4
editeng/source/items/flditem.cxx
View File

@ -277,13 +277,13 @@ MetaAction* SvxFieldData::createEndComment()
SvxFieldItem::SvxFieldItem( std::unique_ptr<SvxFieldData> pField, const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxFieldItemType )
SfxPoolItem( nId )
, mpField( std::move(pField) )
{
}
SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxFieldItemType )
SfxPoolItem( nId )
, mpField( rField.Clone() )
{
}

54
editeng/source/items/frmitems.cxx
View File

@ -140,9 +140,9 @@ bool SvxPaperBinItem::GetPresentation
}
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize, SfxItemType eItemType ) :
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
SfxPoolItem( nId, eItemType ),
SfxPoolItem( nId ),
m_aSize( rSize )
{
@ -225,7 +225,7 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxSizeItemType )
SfxPoolItem( nId )
{
}
@ -405,7 +405,7 @@ bool lcl_FillRelativeMeasureAny(const SvxIndentValue& rIndent, uno::Any& rVal)
}
SvxLRSpaceItem::SvxLRSpaceItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxLRSpaceItemType)
: SfxPoolItem(nId)
, m_nGutterMargin(0)
, m_nRightGutterMargin(0),
nPropFirstLineOffset( 100 ),
@ -419,7 +419,7 @@ SvxLRSpaceItem::SvxLRSpaceItem(const sal_uInt16 nId)
SvxLRSpaceItem::SvxLRSpaceItem(SvxIndentValue stLeft, SvxIndentValue stRight,
SvxIndentValue stOffset, const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxLRSpaceItemType)
: SfxPoolItem(nId)
, m_nGutterMargin(0)
, m_nRightGutterMargin(0)
, nPropFirstLineOffset(100)
@ -880,12 +880,12 @@ sal_Int32 SvxLRSpaceItem::ResolveTextLeft(const SvxFontUnitMetrics& rMetrics) co
}
SvxLeftMarginItem::SvxLeftMarginItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxLeftMarginItemType)
: SfxPoolItem(nId)
{
}
SvxLeftMarginItem::SvxLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxLeftMarginItemType)
: SfxPoolItem(nId)
, m_nLeftMargin(nLeft)
{
}
@ -1048,12 +1048,12 @@ boost::property_tree::ptree SvxLeftMarginItem::dumpAsJSON() const
}
SvxTextLeftMarginItem::SvxTextLeftMarginItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxTextLeftMarginItemType)
: SfxPoolItem(nId)
{
}
SvxTextLeftMarginItem::SvxTextLeftMarginItem(SvxIndentValue stLeft, const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxTextLeftMarginItemType)
: SfxPoolItem(nId)
{
SetTextLeft(stLeft);
}
@ -1265,7 +1265,7 @@ boost::property_tree::ptree SvxTextLeftMarginItem::dumpAsJSON() const
}
SvxFirstLineIndentItem::SvxFirstLineIndentItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxFirstLineIndentItemType)
: SfxPoolItem(nId)
{
}
@ -1527,12 +1527,12 @@ boost::property_tree::ptree SvxFirstLineIndentItem::dumpAsJSON() const
}
SvxRightMarginItem::SvxRightMarginItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxRightMarginItemType)
: SfxPoolItem(nId)
{
}
SvxRightMarginItem::SvxRightMarginItem(SvxIndentValue stRight, const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxRightMarginItemType)
: SfxPoolItem(nId)
{
SetRight(stRight);
}
@ -1741,7 +1741,7 @@ boost::property_tree::ptree SvxRightMarginItem::dumpAsJSON() const
}
SvxGutterLeftMarginItem::SvxGutterLeftMarginItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxGutterLeftMarginItemType)
: SfxPoolItem(nId)
{
}
@ -1850,7 +1850,7 @@ boost::property_tree::ptree SvxGutterLeftMarginItem::dumpAsJSON() const
}
SvxGutterRightMarginItem::SvxGutterRightMarginItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxGutterRightMarginItemType)
: SfxPoolItem(nId)
{
}
@ -2179,7 +2179,7 @@ boost::property_tree::ptree SvxLRSpaceItem::dumpAsJSON() const
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
: SfxPoolItem(nId, SfxItemType::SvxULSpaceItemType)
: SfxPoolItem(nId)
, nUpper(0)
, nLower(0)
, bContext(false)
@ -2191,7 +2191,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
const sal_uInt16 nId )
: SfxPoolItem(nId, SfxItemType::SvxULSpaceItemType)
: SfxPoolItem(nId)
, nUpper(nUp)
, nLower(nLow)
, bContext(false)
@ -2565,7 +2565,7 @@ void SvxProtectItem::dumpAsXml(xmlTextWriterPtr pWriter) const
SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
const Color *pColor, const sal_uInt16 nW,
const SvxShadowLocation eLoc ) :
SfxEnumItemInterface( nId, SfxItemType::SvxShadowItemType ),
SfxEnumItemInterface( nId ),
aShadowColor(COL_GRAY),
nWidth ( nW ),
eLocation ( eLoc )
@ -2849,7 +2849,7 @@ SvxBoxItem::SvxBoxItem(const SvxBoxItem& rCopy)
SvxBoxItem::SvxBoxItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxBoxItemType)
: SfxPoolItem(nId)
{
}
@ -3811,7 +3811,7 @@ bool SvxBoxItem::HasBorder( bool bTreatPaddingAsBorder ) const
// class SvxBoxInfoItem --------------------------------------------------
SvxBoxInfoItem::SvxBoxInfoItem(const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxBoxInfoItemType)
: SfxPoolItem(nId)
, mbDistance(false)
, mbMinimumDistance(false)
{
@ -4401,7 +4401,7 @@ void SvxFormatKeepItem::dumpAsXml(xmlTextWriterPtr pWriter) const
}
SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
SfxPoolItem ( nId, SfxItemType::SvxLineItemType )
SfxPoolItem ( nId )
{
}
@ -4539,7 +4539,7 @@ ItemInstanceManager* SvxBrushItem::getItemInstanceManager() const
}
SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich)
: SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
: SfxPoolItem(_nWhich )
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@ -4550,7 +4550,7 @@ SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich)
}
SvxBrushItem::SvxBrushItem(const Color& rColor, sal_uInt16 _nWhich)
: SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
: SfxPoolItem(_nWhich )
, aColor(rColor)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@ -4561,7 +4561,7 @@ SvxBrushItem::SvxBrushItem(const Color& rColor, sal_uInt16 _nWhich)
}
SvxBrushItem::SvxBrushItem(Color const& rColor, model::ComplexColor const& rComplexColor, sal_uInt16 nWhich)
: SfxPoolItem(nWhich, SfxItemType::SvxBrushItemType)
: SfxPoolItem(nWhich)
, aColor(rColor)
, maComplexColor(rComplexColor)
, aFilterColor(COL_TRANSPARENT)
@ -4573,7 +4573,7 @@ SvxBrushItem::SvxBrushItem(Color const& rColor, model::ComplexColor const& rComp
}
SvxBrushItem::SvxBrushItem(const Graphic& rGraphic, SvxGraphicPosition ePos, sal_uInt16 _nWhich)
: SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
: SfxPoolItem(_nWhich)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@ -4586,7 +4586,7 @@ SvxBrushItem::SvxBrushItem(const Graphic& rGraphic, SvxGraphicPosition ePos, sal
}
SvxBrushItem::SvxBrushItem(const GraphicObject& rGraphicObj, SvxGraphicPosition ePos, sal_uInt16 _nWhich)
: SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
: SfxPoolItem(_nWhich)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@ -4600,7 +4600,7 @@ SvxBrushItem::SvxBrushItem(const GraphicObject& rGraphicObj, SvxGraphicPosition
SvxBrushItem::SvxBrushItem(OUString aLink, OUString aFilter,
SvxGraphicPosition ePos, sal_uInt16 _nWhich)
: SfxPoolItem(_nWhich, SfxItemType::SvxBrushItemType)
: SfxPoolItem(_nWhich)
, aColor(COL_TRANSPARENT)
, aFilterColor(COL_TRANSPARENT)
, nShadingValue(ShadingPattern::CLEAR)
@ -5178,7 +5178,7 @@ ItemInstanceManager* SvxFrameDirectionItem::getItemInstanceManager() const
SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
sal_uInt16 _nWhich )
: SfxEnumItem<SvxFrameDirection>( _nWhich, SfxItemType::SvxFrameDirectionItemType, nValue )
: SfxEnumItem<SvxFrameDirection>( _nWhich, nValue )
{
}

10
editeng/source/items/justifyitem.cxx
View File

@ -36,13 +36,13 @@ using namespace ::com::sun::star;
SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxHorJustifyItemType, SvxCellHorJustify::Standard )
SfxEnumItem( nId, SvxCellHorJustify::Standard )
{
}
SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxHorJustifyItemType, eJustify )
SfxEnumItem( nId, eJustify )
{
}
@ -173,13 +173,13 @@ sal_uInt16 SvxHorJustifyItem::GetValueCount() const
SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxVerJustifyItemType, SvxCellVerJustify::Standard )
SfxEnumItem( nId, SvxCellVerJustify::Standard )
{
}
SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxVerJustifyItemType, eJustify )
SfxEnumItem( nId, eJustify )
{
}
@ -298,7 +298,7 @@ sal_uInt16 SvxVerJustifyItem::GetValueCount() const
SvxJustifyMethodItem::SvxJustifyMethodItem( const SvxCellJustifyMethod eJustify,
const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxJustifyMethodItemType, eJustify )
SfxEnumItem( nId, eJustify )
{
}

8
editeng/source/items/numitem.cxx
View File

@ -1083,25 +1083,25 @@ void SvxNumRule::UnLinkGraphics()
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule) :
SfxPoolItem(SID_ATTR_NUMBERING_RULE, SfxItemType::SvxNumBulletItemType),
SfxPoolItem(SID_ATTR_NUMBERING_RULE),
maNumRule(rRule)
{
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule && rRule) :
SfxPoolItem(SID_ATTR_NUMBERING_RULE, SfxItemType::SvxNumBulletItemType),
SfxPoolItem(SID_ATTR_NUMBERING_RULE),
maNumRule(std::move(rRule))
{
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule const & rRule, sal_uInt16 _nWhich ) :
SfxPoolItem(_nWhich, SfxItemType::SvxNumBulletItemType),
SfxPoolItem(_nWhich),
maNumRule(rRule)
{
}
SvxNumBulletItem::SvxNumBulletItem(SvxNumRule && rRule, sal_uInt16 _nWhich ) :
SfxPoolItem(_nWhich, SfxItemType::SvxNumBulletItemType),
SfxPoolItem(_nWhich),
maNumRule(std::move(rRule))
{
}

2
editeng/source/items/optitems.cxx
View File

@ -26,7 +26,7 @@
SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SfxRegionItemType )
SfxPoolItem( nId )
{
nMinLead = nMinTrail = 0;
}

24
editeng/source/items/paraitem.cxx
View File

@ -79,7 +79,7 @@ enum class SvxSpecialLineSpace
}
SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId )
: SfxEnumItemInterface( nId, SfxItemType::SvxLineSpacingItemType )
: SfxEnumItemInterface( nId )
{
nPropLineSpace = 100;
nInterLineSpace = 0;
@ -360,7 +360,7 @@ ItemInstanceManager* SvxAdjustItem::getItemInstanceManager() const
}
SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId )
: SfxEnumItemInterface( nId, SfxItemType::SvxAdjustItemType ),
: SfxEnumItemInterface( nId ),
bOneBlock( false ), bLastCenter( false ), bLastBlock( false )
{
SetAdjust( eAdjst );
@ -495,7 +495,7 @@ void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal )
// class SvxWidowsItem ---------------------------------------------------
SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
SfxByteItem( nId, nL, SfxItemType::SvxWidowsItemType )
SfxByteItem( nId, nL )
{
}
@ -539,7 +539,7 @@ bool SvxWidowsItem::GetPresentation
// class SvxOrphansItem --------------------------------------------------
SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
SfxByteItem( nId, nL, SfxItemType::SvxOrphansItemType )
SfxByteItem( nId, nL )
{
}
@ -583,7 +583,7 @@ bool SvxOrphansItem::GetPresentation
// class SvxHyphenZoneItem -----------------------------------------------
SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxHyphenZoneItemType ),
SfxPoolItem( nId ),
bHyphen(bHyph),
bKeep(false),
bNoCapsHyphenation(false),
@ -859,7 +859,7 @@ void SvxTabStop::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxTabStopItem --------------------------------------------------
SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich, SfxItemType::SvxTabStopItemType )
SfxPoolItem( _nWhich )
{
const sal_uInt16 nTabs = SVX_TAB_DEFCOUNT, nDist = SVX_TAB_DEFDIST;
const SvxTabAdjust eAdjst= SvxTabAdjust::Default;
@ -876,7 +876,7 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs,
const sal_uInt16 nDist,
const SvxTabAdjust eAdjst,
sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich, SfxItemType::SvxTabStopItemType )
SfxPoolItem( _nWhich )
{
for ( sal_uInt16 i = 0; i < nTabs; ++i )
{
@ -1266,7 +1266,7 @@ bool SvxPageModelItem::GetPresentation
SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn, SfxItemType::SvxScriptSpaceItemType )
: SfxBoolItem( nId, bOn )
{
}
@ -1289,7 +1289,7 @@ bool SvxScriptSpaceItem::GetPresentation(
SvxHangingPunctuationItem::SvxHangingPunctuationItem(
bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn, SfxItemType::SvxHangingPunctuationItemType )
: SfxBoolItem( nId, bOn )
{
}
@ -1312,7 +1312,7 @@ bool SvxHangingPunctuationItem::GetPresentation(
SvxForbiddenRuleItem::SvxForbiddenRuleItem(
bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn, SfxItemType::SvxForbiddenRuleItemType )
: SfxBoolItem( nId, bOn )
{
}
@ -1338,7 +1338,7 @@ bool SvxForbiddenRuleItem::GetPresentation(
SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue,
TypedWhichId<SvxParaVertAlignItem> nW )
: SfxUInt16Item( nW, static_cast<sal_uInt16>(nValue), SfxItemType::SvxParaVertAlignItemType )
: SfxUInt16Item( nW, static_cast<sal_uInt16>(nValue) )
{
}
@ -1386,7 +1386,7 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal,
}
SvxParaGridItem::SvxParaGridItem( bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn, SfxItemType::SvxParaGridItemType )
: SfxBoolItem( nId, bOn )
{
}

69
editeng/source/items/textitem.cxx
View File

@ -112,7 +112,7 @@ SfxPoolItem* SvxCharReliefItem::CreateDefault() {return new SvxCharReliefItem(Fo
SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxFontListItemType ),
SfxPoolItem( nId ),
pFontList( pFontLst )
{
if ( pFontList )
@ -179,7 +179,7 @@ size_t SvxFontItem::hashCode() const
SvxFontItem::SvxFontItem(
const sal_uInt16 nId)
: SfxPoolItem( nId, SfxItemType::SvxFontItemType )
: SfxPoolItem( nId )
, aFamilyName()
, aStyleName()
, eFamily(FAMILY_SWISS)
@ -195,7 +195,7 @@ SvxFontItem::SvxFontItem(
const FontPitch eFontPitch,
const rtl_TextEncoding eFontTextEncoding,
const sal_uInt16 nId)
: SfxPoolItem( nId, SfxItemType::SvxFontItemType )
: SfxPoolItem( nId )
, aFamilyName(std::move(aName))
, aStyleName(std::move(aStName))
, eFamily(eFam)
@ -408,7 +408,7 @@ ItemInstanceManager* SvxPostureItem::getItemInstanceManager() const
}
SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxPostureItemType, ePosture )
SfxEnumItem( nId, ePosture )
{
}
@ -530,7 +530,7 @@ ItemInstanceManager* SvxWeightItem::getItemInstanceManager() const
}
SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxWeightItemType, eWght )
SfxEnumItem( nId, eWght )
{
}
@ -672,7 +672,7 @@ size_t SvxFontHeightItem::hashCode() const
SvxFontHeightItem::SvxFontHeightItem( const sal_uInt32 nSz,
const sal_uInt16 nPrp,
const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxFontHeightItemType )
SfxPoolItem( nId )
{
SetHeight( nSz,nPrp ); // calculate in percentage
}
@ -1007,8 +1007,8 @@ void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxTextLineItem ------------------------------------------------
SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId, SfxItemType eItemType )
: SfxEnumItem(nId, eItemType, eSt)
SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SfxEnumItem(nId, eSt)
, maColor(COL_TRANSPARENT)
{
}
@ -1166,7 +1166,7 @@ ItemInstanceManager* SvxUnderlineItem::getItemInstanceManager() const
}
SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId, SfxItemType::SvxUnderlineItemType )
: SvxTextLineItem( eSt, nId )
{
}
@ -1213,7 +1213,7 @@ ItemInstanceManager* SvxOverlineItem::getItemInstanceManager() const
}
SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId, SfxItemType::SvxOverlineItemType )
: SvxTextLineItem( eSt, nId )
{
}
@ -1260,7 +1260,7 @@ ItemInstanceManager* SvxCrossedOutItem::getItemInstanceManager() const
}
SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 nId )
: SfxEnumItem( nId, SfxItemType::SvxCrossedOutItemType, eSt )
: SfxEnumItem( nId, eSt )
{
}
@ -1361,7 +1361,7 @@ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// class SvxShadowedItem -------------------------------------------------
SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) :
SfxBoolItem( nId, bShadowed, SfxItemType::SvxShadowedItemType )
SfxBoolItem( nId, bShadowed )
{
}
@ -1389,7 +1389,7 @@ bool SvxShadowedItem::GetPresentation
// class SvxAutoKernItem -------------------------------------------------
SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) :
SfxBoolItem( nId, bAutoKern, SfxItemType::SvxAutoKernItemType )
SfxBoolItem( nId, bAutoKern )
{
}
@ -1418,7 +1418,7 @@ bool SvxAutoKernItem::GetPresentation
SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode,
const sal_uInt16 nId ) :
SfxBoolItem( nId, bWordLineMode, SfxItemType::SvxWordLineItemType )
SfxBoolItem( nId, bWordLineMode )
{
}
@ -1446,7 +1446,7 @@ bool SvxWordLineModeItem::GetPresentation
// class SvxContourItem --------------------------------------------------
SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) :
SfxBoolItem( nId, bContoured, SfxItemType::SvxContourItemType )
SfxBoolItem( nId, bContoured )
{
}
@ -1473,19 +1473,19 @@ bool SvxContourItem::GetPresentation
// class SvxColorItem ----------------------------------------------------
SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
SfxPoolItem(nId, SfxItemType::SvxColorItemType),
SfxPoolItem(nId),
mColor( COL_BLACK )
{
}
SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
SfxPoolItem( nId, SfxItemType::SvxColorItemType ),
SfxPoolItem( nId ),
mColor( rCol )
{
}
SvxColorItem::SvxColorItem(Color const& rColor, model::ComplexColor const& rComplexColor, const sal_uInt16 nId)
: SfxPoolItem(nId, SfxItemType::SvxColorItemType)
: SfxPoolItem(nId)
, mColor(rColor)
, maComplexColor(rComplexColor)
{
@ -1744,7 +1744,7 @@ void SvxColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const
// class SvxKerningItem --------------------------------------------------
SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
SfxInt16Item( nId, nKern, SfxItemType::SvxKerningItemType )
SfxInt16Item( nId, nKern )
{
}
@ -1823,7 +1823,7 @@ bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
// class SvxCaseMapItem --------------------------------------------------
SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
SfxEnumItem( nId, SfxItemType::SvxCaseMapItemType, eMap )
SfxEnumItem( nId, eMap )
{
}
@ -1903,7 +1903,7 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
// class SvxEscapementItem -----------------------------------------------
SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ),
SfxEnumItemInterface( nId ),
nEsc ( 0 ),
nProp ( 100 )
@ -1913,7 +1913,7 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
const sal_uInt16 nId ) :
SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ),
SfxEnumItemInterface( nId ),
nProp( 100 )
{
SetEscapement( eEscape );
@ -1925,7 +1925,7 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
SvxEscapementItem::SvxEscapementItem( const short _nEsc,
const sal_uInt8 _nProp,
const sal_uInt16 nId ) :
SfxEnumItemInterface( nId, SfxItemType::SvxEscapementItemType ),
SfxEnumItemInterface( nId ),
nEsc ( _nEsc ),
nProp ( _nProp )
{
@ -2071,7 +2071,7 @@ ItemInstanceManager* SvxLanguageItem::getItemInstanceManager() const
}
SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId )
: SvxLanguageItem_Base( nId , SfxItemType::SvxLanguageItemType, eLang )
: SvxLanguageItem_Base( nId , eLang )
{
}
@ -2150,7 +2150,7 @@ bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// class SvxNoHyphenItem -------------------------------------------------
SvxNoHyphenItem::SvxNoHyphenItem( const bool bNoHyphen, const sal_uInt16 nId ) :
SfxBoolItem( nId, bNoHyphen, SfxItemType::SvxNoHyphenItemType )
SfxBoolItem( nId, bNoHyphen )
{
}
@ -2185,7 +2185,7 @@ bool SvxNoHyphenItem::GetPresentation
SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) :
SfxBoolItem( nId, bBlink, SfxItemType::SvxBlinkItemType )
SfxBoolItem( nId, bBlink )
{
}
@ -2220,7 +2220,7 @@ ItemInstanceManager* SvxEmphasisMarkItem::getItemInstanceManager() const
SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
TypedWhichId<SvxEmphasisMarkItem> nId )
: SfxUInt16Item( nId, static_cast<sal_uInt16>(nValue), SfxItemType::SvxEmphasisMarkItemType )
: SfxUInt16Item( nId, static_cast<sal_uInt16>(nValue) )
{
}
@ -2324,7 +2324,7 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SvxTwoLinesItem::SvxTwoLinesItem( bool bFlag, sal_Unicode nStartBracket,
sal_Unicode nEndBracket, sal_uInt16 nW )
: SfxPoolItem( nW, SfxItemType::SvxTwoLinesItemType ),
: SfxPoolItem( nW ),
cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag )
{
}
@ -2431,8 +2431,8 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
|* class SvxTextRotateItem
*************************************************************************/
SvxTextRotateItem::SvxTextRotateItem(Degree10 nValue, TypedWhichId<SvxTextRotateItem> nW, SfxItemType eItemType)
: SfxUInt16Item(nW, nValue.get(), eItemType)
SvxTextRotateItem::SvxTextRotateItem(Degree10 nValue, TypedWhichId<SvxTextRotateItem> nW)
: SfxUInt16Item(nW, nValue.get())
{
}
@ -2511,7 +2511,7 @@ void SvxTextRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const
SvxCharRotateItem::SvxCharRotateItem( Degree10 nValue,
bool bFitIntoLine,
TypedWhichId<SvxCharRotateItem> nW )
: SvxTextRotateItem(nValue, nW, SfxItemType::SvxCharRotateItemType),
: SvxTextRotateItem(nValue, nW),
bFitToLine( bFitIntoLine )
{
}
@ -2601,7 +2601,7 @@ void SvxCharRotateItem::dumpAsXml(xmlTextWriterPtr pWriter) const
SvxCharScaleWidthItem::SvxCharScaleWidthItem( sal_uInt16 nValue,
TypedWhichId<SvxCharScaleWidthItem> nW )
: SfxUInt16Item( nW, nValue, SfxItemType::SvxCharScaleWidthItemType )
: SfxUInt16Item( nW, nValue )
{
}
@ -2661,7 +2661,7 @@ ItemInstanceManager* SvxCharReliefItem::getItemInstanceManager() const
SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue,
const sal_uInt16 nId )
: SfxEnumItem( nId, SfxItemType::SvxCharReliefItemType, eValue )
: SfxEnumItem( nId, eValue )
{
}
@ -2750,8 +2750,7 @@ bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal,
SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
: SfxSetItem( nSlotId, SfxItemSet( rPool,
svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT> ),
SfxItemType::SvxScriptSetItemType )
svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT> ) )
{
sal_uInt16 nLatin, nAsian, nComplex;
GetWhichIds( nLatin, nAsian, nComplex );

2
editeng/source/items/writingmodeitem.cxx
View File

@ -26,7 +26,7 @@ using namespace ::com::sun::star::text;
SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, TypedWhichId<SvxWritingModeItem> _nWhich )
: SfxUInt16Item( _nWhich, static_cast<sal_uInt16>(eValue), SfxItemType::SvxWritingModeItemType )
: SfxUInt16Item( _nWhich, static_cast<sal_uInt16>(eValue) )
{
}

2
editeng/source/items/xmlcnitm.cxx
View File

@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml;
SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich, SfxItemType::SvXMLAttrContainerItemType )
SfxPoolItem( _nWhich )
{
}

1
include/avmedia/mediaitem.hxx
View File

@ -72,6 +72,7 @@ class AVMEDIA_DLLPUBLIC MediaItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(MediaItem)
explicit MediaItem( sal_uInt16 i_nWhich = 0,
AVMediaSetMask nMaskSet = AVMediaSetMask::NONE );
MediaItem( const MediaItem& rMediaItem );

1
include/basctl/sbxitem.hxx
View File

@ -45,6 +45,7 @@ class BASCTL_DLLPUBLIC SbxItem : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SbxItem)
SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, SbxItemType);
SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, OUString aMethodName, SbxItemType eSbxType);

1
include/editeng/adjustitem.hxx
View File

@ -50,6 +50,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxAdjustItem)
SvxAdjustItem( const SvxAdjust eAdjst /*= SvxAdjust::Left*/,
const sal_uInt16 nId );

2
include/editeng/autokernitem.hxx
View File

@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxAutoKernItem final : public SfxBoolItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxAutoKernItem)
SvxAutoKernItem( const bool bAutoKern /*= false*/,
const sal_uInt16 nId );

1
include/editeng/blinkitem.hxx
View File

@ -33,6 +33,7 @@
class EDITENG_DLLPUBLIC SvxBlinkItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxBlinkItem)
SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem

2
include/editeng/boxitem.hxx
View File

@ -76,6 +76,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxBoxItem)
explicit SvxBoxItem( const sal_uInt16 nId );
SvxBoxItem( const SvxBoxItem &rCpy );
virtual ~SvxBoxItem() override;
@ -227,6 +228,7 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxBoxInfoItem)
explicit SvxBoxInfoItem( const sal_uInt16 nId );
SvxBoxInfoItem( const SvxBoxInfoItem &rCpy );
virtual ~SvxBoxInfoItem() override;

1
include/editeng/brushitem.hxx
View File

@ -60,6 +60,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxBrushItem)
explicit SvxBrushItem( sal_uInt16 nWhich );
SvxBrushItem(Color const& rColor, sal_uInt16 nWhich);
SvxBrushItem(Color const& rColor, model::ComplexColor const& rComplexColor, sal_uInt16 nWhich);

1
include/editeng/bulletitem.hxx
View File

@ -57,6 +57,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem final : public SfxPoolItem
sal_Unicode cSymbol;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxBulletItem)
explicit SvxBulletItem( sal_uInt16 nWhich );
SvxBulletItem( const SvxBulletItem& );
virtual ~SvxBulletItem() override;

1
include/editeng/charhiddenitem.hxx
View File

@ -32,6 +32,7 @@
class EDITENG_DLLPUBLIC SvxCharHiddenItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxCharHiddenItem)
SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId );
virtual SvxCharHiddenItem* Clone( SfxItemPool *pPool = nullptr ) const override;

1
include/editeng/charreliefitem.hxx
View File

@ -39,6 +39,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxCharReliefItem)
SvxCharReliefItem( FontRelief eValue /*= FontRelief::NONE*/,
const sal_uInt16 nId );

5
include/editeng/charrotateitem.hxx
View File

@ -35,7 +35,8 @@
class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item
{
public:
SvxTextRotateItem(Degree10 nValue, TypedWhichId<SvxTextRotateItem> nId, SfxItemType eItemType = SfxItemType::SvxTextRotateItemType);
DECLARE_ITEM_TYPE_FUNCTION(SvxTextRotateItem)
SvxTextRotateItem(Degree10 nValue, TypedWhichId<SvxTextRotateItem> nId);
virtual SvxTextRotateItem* Clone(SfxItemPool *pPool = nullptr) const override;
@ -78,7 +79,7 @@ class EDITENG_DLLPUBLIC SvxCharRotateItem final : public SvxTextRotateItem
bool bFitToLine;
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxCharRotateItem)
SvxCharRotateItem( Degree10 nValue /*= 0*/,
bool bFitIntoLine /*= false*/,
TypedWhichId<SvxCharRotateItem> nId );

2
include/editeng/charscaleitem.hxx
View File

@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxCharScaleWidthItem final : public SfxUInt16Item
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxCharScaleWidthItem)
SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/,
TypedWhichId<SvxCharScaleWidthItem> nId );

1
include/editeng/cmapitem.hxx
View File

@ -35,6 +35,7 @@ class EDITENG_DLLPUBLIC SvxCaseMapItem final : public SfxEnumItem<SvxCaseMap>
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxCaseMapItem)
SvxCaseMapItem( const SvxCaseMap eMap /*= SvxCaseMap::NotMapped*/,
const sal_uInt16 nId );

1
include/editeng/colritem.hxx
View File

@ -37,6 +37,7 @@ private:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxColorItem)
explicit SvxColorItem(const sal_uInt16 nId);
SvxColorItem(const Color& aColor, const sal_uInt16 nId);
SvxColorItem(const Color& aColor, model::ComplexColor const& rComplexColor, const sal_uInt16 nId);

2
include/editeng/contouritem.hxx
View File

@ -32,7 +32,7 @@ class EDITENG_DLLPUBLIC SvxContourItem final : public SfxBoolItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxContourItem)
SvxContourItem( const bool bContoured /*= false*/,
const sal_uInt16 nId );

1
include/editeng/crossedoutitem.hxx
View File

@ -37,6 +37,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxCrossedOutItem)
SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/,
const sal_uInt16 nId );

2
include/editeng/emphasismarkitem.hxx
View File

@ -37,7 +37,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxEmphasisMarkItem)
SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= FontEmphasisMark::NONE*/,
TypedWhichId<SvxEmphasisMarkItem> nId );

1
include/editeng/escapementitem.hxx
View File

@ -44,6 +44,7 @@ class EDITENG_DLLPUBLIC SvxEscapementItem final : public SfxEnumItemInterface
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxEscapementItem)
explicit SvxEscapementItem( const sal_uInt16 nId );
SvxEscapementItem( const SvxEscapement eEscape,
const sal_uInt16 nId );

1
include/editeng/fhgtitem.hxx
View File

@ -50,6 +50,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxFontHeightItem)
SvxFontHeightItem( const sal_uInt32 nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/,
const sal_uInt16 nId );

1
include/editeng/flditem.hxx
View File

@ -70,6 +70,7 @@ class EDITENG_DLLPUBLIC SvxFieldItem final : public SfxPoolItem
{
std::unique_ptr<SvxFieldData> mpField;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxFieldItem)
SvxFieldItem( std::unique_ptr<SvxFieldData> pField, const sal_uInt16 nId );
SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId );
SvxFieldItem( const SvxFieldItem& rItem );

1
include/editeng/flstitem.hxx
View File

@ -42,6 +42,7 @@ private:
css::uno::Sequence< OUString > aFontNameSeq;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxFontListItem)
SvxFontListItem( const FontList* pFontLst,
const sal_uInt16 nId );

1
include/editeng/fontitem.hxx
View File

@ -40,6 +40,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxFontItem)
explicit SvxFontItem(const sal_uInt16 nId);
SvxFontItem(const FontFamily eFam, OUString aFamilyName,
OUString aStyleName,

1
include/editeng/forbiddenruleitem.hxx
View File

@ -32,6 +32,7 @@
class EDITENG_DLLPUBLIC SvxForbiddenRuleItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxForbiddenRuleItem)
SvxForbiddenRuleItem( bool bOn /*= false*/,
const sal_uInt16 nId );

3
include/editeng/formatbreakitem.hxx
View File

@ -38,6 +38,7 @@ class EDITENG_DLLPUBLIC SvxFormatBreakItem final : public SfxEnumItem<SvxBreak>
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxFormatBreakItem)
inline SvxFormatBreakItem( const SvxBreak eBrk /*= SvxBreak::NONE*/,
const sal_uInt16 nWhich );
SvxFormatBreakItem(SvxFormatBreakItem const &) = default; // SfxPoolItem copy function dichotomy
@ -62,7 +63,7 @@ public:
inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
const sal_uInt16 _nWhich ) :
SfxEnumItem( _nWhich, SfxItemType::SvxFormatBreakItemType, eBreak )
SfxEnumItem( _nWhich, eBreak )
{}

1
include/editeng/frmdiritem.hxx
View File

@ -34,6 +34,7 @@ protected:
virtual ItemInstanceManager* getItemInstanceManager() const override;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxFrameDirectionItem)
SvxFrameDirectionItem( SvxFrameDirection nValue, sal_uInt16 nWhich );
virtual ~SvxFrameDirectionItem() override;

1
include/editeng/hngpnctitem.hxx
View File

@ -32,6 +32,7 @@
class EDITENG_DLLPUBLIC SvxHangingPunctuationItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxHangingPunctuationItem)
SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId );
virtual SvxHangingPunctuationItem* Clone( SfxItemPool *pPool = nullptr ) const override;

1
include/editeng/hyphenzoneitem.hxx
View File

@ -47,6 +47,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxHyphenZoneItem)
SvxHyphenZoneItem( const bool bHyph /*= false*/,
const sal_uInt16 nId );

3
include/editeng/justifyitem.hxx
View File

@ -30,6 +30,7 @@ class EDITENG_DLLPUBLIC SvxHorJustifyItem final : public SfxEnumItem<SvxCellHorJ
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxHorJustifyItem)
explicit SvxHorJustifyItem( const sal_uInt16 nId );
SvxHorJustifyItem(
@ -57,6 +58,7 @@ class EDITENG_DLLPUBLIC SvxVerJustifyItem final : public SfxEnumItem<SvxCellVerJ
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxVerJustifyItem)
explicit SvxVerJustifyItem( const sal_uInt16 nId );
SvxVerJustifyItem(
@ -82,6 +84,7 @@ public:
class EDITENG_DLLPUBLIC SvxJustifyMethodItem final : public SfxEnumItem<SvxCellJustifyMethod>
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxJustifyMethodItem)
SvxJustifyMethodItem(
const SvxCellJustifyMethod eMethod,
const sal_uInt16 nId );

2
include/editeng/keepitem.hxx
View File

@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxFormatKeepItem final : public SfxBoolItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxFormatKeepItem)
inline SvxFormatKeepItem( const bool bKeep /*= false*/,
const sal_uInt16 _nWhich );
SvxFormatKeepItem(SvxFormatKeepItem const &) = default; // SfxPoolItem copy function dichotomy

2
include/editeng/kernitem.hxx
View File

@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxKerningItem final : public SfxInt16Item
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxKerningItem)
SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem

7
include/editeng/langitem.hxx
View File

@ -33,8 +33,9 @@
// MSVC hack:
class SAL_DLLPUBLIC_RTTI SvxLanguageItem_Base: public SfxEnumItem<LanguageType> {
protected:
explicit SvxLanguageItem_Base(sal_uInt16 nWhich, SfxItemType eItemType, LanguageType nValue):
SfxEnumItem(nWhich, eItemType, nValue)
DECLARE_ITEM_TYPE_FUNCTION(SvxLanguageItem_Base)
explicit SvxLanguageItem_Base(sal_uInt16 nWhich, LanguageType nValue):
SfxEnumItem(nWhich, nValue)
{}
};
@ -45,7 +46,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxLanguageItem)
SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/,
const sal_uInt16 nId );

1
include/editeng/lineitem.hxx
View File

@ -41,6 +41,7 @@ class EDITENG_DLLPUBLIC SvxLineItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxLineItem)
explicit SvxLineItem( const sal_uInt16 nId );
SvxLineItem( const SvxLineItem& rCpy );
virtual ~SvxLineItem() override;

7
include/editeng/lrspitem.hxx
View File

@ -108,6 +108,7 @@ public:
sal_uInt16 GetPropLeft() const { return m_nPropLeftMargin; }
DECLARE_ITEM_TYPE_FUNCTION(SvxLeftMarginItem)
explicit SvxLeftMarginItem(const sal_uInt16 nId);
SvxLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId);
SvxLeftMarginItem(SvxLeftMarginItem const &) = default; // SfxPoolItem copy function dichotomy
@ -153,6 +154,7 @@ public:
sal_Int32 ResolveTextLeft(const SvxFontUnitMetrics& rMetrics) const;
SvxIndentValue GetTextLeft() const;
DECLARE_ITEM_TYPE_FUNCTION(SvxTextLeftMarginItem)
explicit SvxTextLeftMarginItem(const sal_uInt16 nId);
SvxTextLeftMarginItem(SvxIndentValue stLeft, const sal_uInt16 nId);
SvxTextLeftMarginItem(SvxTextLeftMarginItem const &) = default; // SfxPoolItem copy function dichotomy
@ -199,6 +201,7 @@ public:
SvxIndentValue GetTextFirstLineOffset() const;
sal_Int32 ResolveTextFirstLineOffset(const SvxFontUnitMetrics& rMetrics) const;
DECLARE_ITEM_TYPE_FUNCTION(SvxFirstLineIndentItem)
explicit SvxFirstLineIndentItem(const sal_uInt16 nId);
SvxFirstLineIndentItem(SvxIndentValue stValue, const sal_uInt16 nId);
SvxFirstLineIndentItem(SvxFirstLineIndentItem const &) = default; // SfxPoolItem copy function dichotomy
@ -243,6 +246,7 @@ public:
sal_uInt16 GetPropRight() const;
DECLARE_ITEM_TYPE_FUNCTION(SvxRightMarginItem)
explicit SvxRightMarginItem(const sal_uInt16 nId);
SvxRightMarginItem(SvxIndentValue stRight, const sal_uInt16 nId);
SvxRightMarginItem(SvxRightMarginItem const &) = default; // SfxPoolItem copy function dichotomy
@ -279,6 +283,7 @@ public:
void SetGutterMargin(const tools::Long nGutterMargin) { m_nGutterMargin = nGutterMargin; }
tools::Long GetGutterMargin() const { return m_nGutterMargin; }
DECLARE_ITEM_TYPE_FUNCTION(SvxGutterLeftMarginItem)
explicit SvxGutterLeftMarginItem(const sal_uInt16 nId);
SvxGutterLeftMarginItem(SvxGutterLeftMarginItem const &) = default; // SfxPoolItem copy function dichotomy
@ -311,6 +316,7 @@ private:
public:
tools::Long GetRightGutterMargin() const { return m_nRightGutterMargin; }
DECLARE_ITEM_TYPE_FUNCTION(SvxGutterRightMarginItem)
explicit SvxGutterRightMarginItem(const sal_uInt16 nId);
SvxGutterRightMarginItem(SvxGutterRightMarginItem const &) = default; // SfxPoolItem copy function dichotomy
@ -354,6 +360,7 @@ public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxLRSpaceItem)
explicit SvxLRSpaceItem( const sal_uInt16 nId );
SvxLRSpaceItem(SvxIndentValue stLeft, SvxIndentValue stRight, SvxIndentValue stValue,
const sal_uInt16 nId);

1
include/editeng/lspcitem.hxx
View File

@ -47,6 +47,7 @@ public:
// writer? => Rather have a crooked vales as the default, but the
// programmer sees that there's something special happening.
DECLARE_ITEM_TYPE_FUNCTION(SvxLineSpacingItem)
SvxLineSpacingItem( sal_uInt16 nLineHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem

1
include/editeng/nhypitem.hxx
View File

@ -26,6 +26,7 @@
class EDITENG_DLLPUBLIC SvxNoHyphenItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxNoHyphenItem)
SvxNoHyphenItem( const bool bNoHyphen, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem

1
include/editeng/numitem.hxx
View File

@ -317,6 +317,7 @@ class EDITENG_DLLPUBLIC SvxNumBulletItem final : public SfxPoolItem
{
SvxNumRule maNumRule;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxNumBulletItem)
explicit SvxNumBulletItem(SvxNumRule const & rRule);
explicit SvxNumBulletItem(SvxNumRule && rRule);
SvxNumBulletItem(SvxNumRule const & rRule, sal_uInt16 nWhich );

3
include/editeng/opaqitem.hxx
View File

@ -33,6 +33,7 @@
class EDITENG_DLLPUBLIC SvxOpaqueItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxOpaqueItem)
explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true );
// "pure virtual Methods" from SfxPoolItem
@ -45,7 +46,7 @@ public:
};
inline SvxOpaqueItem::SvxOpaqueItem( const sal_uInt16 nId, const bool bOpa )
: SfxBoolItem( nId, bOpa, SfxItemType::SvxOpaqueItemType )
: SfxBoolItem( nId, bOpa )
{}
#endif

2
include/editeng/optitems.hxx
View File

@ -31,7 +31,7 @@ class EDITENG_DLLPUBLIC SfxHyphenRegionItem final : public SfxPoolItem
sal_uInt8 nMinTrail;
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxHyphenRegionItem)
SfxHyphenRegionItem( const sal_uInt16 nId );
virtual bool operator==( const SfxPoolItem& ) const override;

2
include/editeng/orphitem.hxx
View File

@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxOrphansItem final : public SfxByteItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxOrphansItem)
SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem

2
include/editeng/paravertalignitem.hxx
View File

@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxParaVertAlignItem final : public SfxUInt16Item
public:
enum class Align { Automatic, Baseline, Top, Center, Bottom };
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxParaVertAlignItem)
SvxParaVertAlignItem( Align nValue /*= 0*/, TypedWhichId<SvxParaVertAlignItem> nId );
virtual SvxParaVertAlignItem* Clone( SfxItemPool *pPool = nullptr ) const override;

4
include/editeng/pbinitem.hxx
View File

@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxPaperBinItem final : public SfxByteItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxPaperBinItem)
explicit inline SvxPaperBinItem( const sal_uInt16 nId ,
const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS );
@ -50,7 +50,7 @@ public:
};
inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )
: SfxByteItem( nId, nT, SfxItemType::SvxPaperBinItemType )
: SfxByteItem( nId, nT )
{}
#endif

1
include/editeng/pgrditem.hxx
View File

@ -33,6 +33,7 @@
class EDITENG_DLLPUBLIC SvxParaGridItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxParaGridItem)
SvxParaGridItem( const bool bSnapToGrid /*= true*/,
const sal_uInt16 nId );

2
include/editeng/pmdlitem.hxx
View File

@ -36,7 +36,7 @@ private:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxPageModelItem)
explicit inline SvxPageModelItem( TypedWhichId<SvxPageModelItem> nWh );
inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/,
TypedWhichId<SvxPageModelItem> nWh );

1
include/editeng/postitem.hxx
View File

@ -38,6 +38,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxPostureItem)
SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/,
const sal_uInt16 nId );

3
include/editeng/prntitem.hxx
View File

@ -35,6 +35,7 @@
class EDITENG_DLLPUBLIC SvxPrintItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxPrintItem)
explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true );
// "pure virtual Methods" from SfxPoolItem
@ -47,7 +48,7 @@ public:
};
inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt )
: SfxBoolItem( nId, bPrt, SfxItemType::SvxPrintItemType )
: SfxBoolItem( nId, bPrt )
{}
#endif

3
include/editeng/protitem.hxx
View File

@ -39,6 +39,7 @@ class EDITENG_DLLPUBLIC SvxProtectItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxProtectItem)
explicit inline SvxProtectItem( const sal_uInt16 nId );
SvxProtectItem(SvxProtectItem const &) = default; // SfxPoolItem copy function dichotomy
@ -66,7 +67,7 @@ public:
};
inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
: SfxPoolItem( nId, SfxItemType::SvxProtectItemType )
: SfxPoolItem( nId )
{
bCntnt = bSize = bPos = false;
}

3
include/editeng/rsiditem.hxx
View File

@ -19,7 +19,8 @@
class EDITENG_DLLPUBLIC SvxRsidItem final : public SfxUInt32Item
{
public:
SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid, SfxItemType::SvxRsidItemType ) {}
DECLARE_ITEM_TYPE_FUNCTION(SvxRsidItem)
SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {}
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,

1
include/editeng/scriptspaceitem.hxx
View File

@ -33,6 +33,7 @@
class EDITENG_DLLPUBLIC SvxScriptSpaceItem final : public SfxBoolItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxScriptSpaceItem)
SvxScriptSpaceItem( bool bOn /*= false*/,
const sal_uInt16 nId );

1
include/editeng/scripttypeitem.hxx
View File

@ -26,6 +26,7 @@
class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxScriptSetItem)
SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool );
virtual SvxScriptSetItem* Clone( SfxItemPool *pPool = nullptr ) const override;

1
include/editeng/shaditem.hxx
View File

@ -43,6 +43,7 @@ class EDITENG_DLLPUBLIC SvxShadowItem final : public SfxEnumItemInterface
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxShadowItem)
explicit SvxShadowItem( const sal_uInt16 nId ,
const Color *pColor = nullptr, const sal_uInt16 nWidth = 100 /*5pt*/,
const SvxShadowLocation eLoc = SvxShadowLocation::NONE );

2
include/editeng/shdditem.hxx
View File

@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxShadowedItem final : public SfxBoolItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxShadowedItem)
SvxShadowedItem( const bool bShadowed /*= false*/,
const sal_uInt16 nId );

3
include/editeng/sizeitem.hxx
View File

@ -38,8 +38,9 @@ class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxSizeItem)
explicit SvxSizeItem( const sal_uInt16 nId );
SvxSizeItem( const sal_uInt16 nId, const Size& rSize, SfxItemType eItemType = SfxItemType::SvxSizeItemType);
SvxSizeItem( const sal_uInt16 nId, const Size& rSize);
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;

2
include/editeng/spltitem.hxx
View File

@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxFormatSplitItem final : public SfxBoolItem
public:
static SfxPoolItem* CreateDefault();
virtual ~SvxFormatSplitItem() override;
DECLARE_ITEM_TYPE_FUNCTION(SvxFormatSplitItem)
inline SvxFormatSplitItem( const bool bSplit /*= true*/,
const sal_uInt16 nWh );

1
include/editeng/tstpitem.hxx
View File

@ -97,6 +97,7 @@ class EDITENG_DLLPUBLIC SvxTabStopItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxTabStopItem)
explicit SvxTabStopItem( sal_uInt16 nWhich );
SvxTabStopItem( const sal_uInt16 nTabs,
const sal_uInt16 nDist,

1
include/editeng/twolinesitem.hxx
View File

@ -28,6 +28,7 @@ class EDITENG_DLLPUBLIC SvxTwoLinesItem final : public SfxPoolItem
sal_Unicode cStartBracket, cEndBracket;
bool bOn;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxTwoLinesItem)
SvxTwoLinesItem( bool bOn /*= true*/,
sal_Unicode nStartBracket /*= 0*/,
sal_Unicode nEndBracket /*= 0*/,

6
include/editeng/udlnitem.hxx
View File

@ -34,9 +34,9 @@ class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem<FontLineStyle>
model::ComplexColor maComplexColor;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxTextLineItem)
SvxTextLineItem( const FontLineStyle eSt,
const sal_uInt16 nId,
SfxItemType eItemType = SfxItemType::SvxTextLineItemType);
const sal_uInt16 nId);
// "pure virtual Methods" from SfxPoolItem
virtual bool GetPresentation( SfxItemPresentation ePres,
@ -94,6 +94,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxUnderlineItem)
SvxUnderlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
@ -113,6 +114,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxOverlineItem)
SvxOverlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );

1
include/editeng/ulspitem.hxx
View File

@ -39,6 +39,7 @@ class EDITENG_DLLPUBLIC SvxULSpaceItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxULSpaceItem)
explicit SvxULSpaceItem( const sal_uInt16 nId );
SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
const sal_uInt16 nId );

1
include/editeng/wghtitem.hxx
View File

@ -38,6 +38,7 @@ protected:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxWeightItem)
SvxWeightItem( const FontWeight eWght /*= WEIGHT_NORMAL*/,
const sal_uInt16 nId );

2
include/editeng/widwitem.hxx
View File

@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxWidowsItem final : public SfxByteItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxWidowsItem)
SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem

1
include/editeng/writingmodeitem.hxx
View File

@ -28,6 +28,7 @@
class EDITENG_DLLPUBLIC SvxWritingModeItem final : public SfxUInt16Item
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxWritingModeItem)
SvxWritingModeItem( css::text::WritingMode eValue /*= css::text::WritingMode_LR_TB*/,
TypedWhichId<SvxWritingModeItem> nWhich /*= SDRATTR_TEXTDIRECTION*/ );
virtual ~SvxWritingModeItem() override;

2
include/editeng/wrlmitem.hxx
View File

@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxWordLineModeItem final : public SfxBoolItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxWordLineModeItem)
SvxWordLineModeItem( const bool bWordLineMode /*= false*/,
const sal_uInt16 nId );

2
include/editeng/xmlcnitm.hxx
View File

@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvXMLAttrContainerItem final : public SfxPoolItem
SvXMLAttrContainerData maContainerData;
public:
DECLARE_ITEM_TYPE_FUNCTION(SvXMLAttrContainerItem)
SvXMLAttrContainerItem( sal_uInt16 nWhich = 0 );
SvXMLAttrContainerItem( const SvXMLAttrContainerItem& );
virtual ~SvXMLAttrContainerItem() override;

3
include/sfx2/app.hxx
View File

@ -83,8 +83,9 @@ class SFX2_DLLPUBLIC SfxLinkItem final : public SfxPoolItem
void operator =(SfxLinkItem const &) = delete;
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxLinkItem)
SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem const *, void>& rValue )
: SfxPoolItem( nWhichId, SfxItemType::SfxLinkItemType )
: SfxPoolItem( nWhichId )
{ aLink = rValue; }
virtual ~SfxLinkItem() override;

1
include/sfx2/dinfdlg.hxx
View File

@ -91,6 +91,7 @@ private:
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxDocumentInfoItem)
SfxDocumentInfoItem();
SfxDocumentInfoItem( const OUString &rFileName,
const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps,

4
include/sfx2/evntconf.hxx
View File

@ -69,9 +69,9 @@ class SFX2_DLLPUBLIC SfxEventNamesItem final : public SfxPoolItem
SfxEventNamesList aEventsList;
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxEventNamesItem)
SfxEventNamesItem ( const sal_uInt16 nId )
: SfxPoolItem( nId, SfxItemType::SfxEventNamesItemType ) {}
: SfxPoolItem( nId ) {}
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,

4
include/sfx2/frame.hxx
View File

@ -152,7 +152,7 @@ class SFX2_DLLPUBLIC SfxFrameItem final : public SfxPoolItem
SfxFrameWeakRef wFrame;
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxFrameItem)
SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame const *p );
SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p );
@ -170,6 +170,7 @@ class SFX2_DLLPUBLIC SfxUnoAnyItem final : public SfxPoolItem
css::uno::Any aValue;
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxUnoAnyItem)
SfxUnoAnyItem( sal_uInt16 nWhich, const css::uno::Any& rAny );
const css::uno::Any& GetValue() const
{ return aValue; }
@ -186,6 +187,7 @@ class SFX2_DLLPUBLIC SfxUnoFrameItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxUnoFrameItem)
SfxUnoFrameItem();
SfxUnoFrameItem( sal_uInt16 nWhich, css::uno::Reference< css::frame::XFrame > i_xFrame );
const css::uno::Reference< css::frame::XFrame >&

1
include/sfx2/minfitem.hxx
View File

@ -40,6 +40,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxMacroInfoItem)
SfxMacroInfoItem( sal_uInt16 nWhich,
const BasicManager* pMgr,
OUString aLibName,

1
include/sfx2/objitem.hxx
View File

@ -31,6 +31,7 @@ class SFX2_DLLPUBLIC SfxObjectItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxObjectItem)
SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr );
virtual bool operator==( const SfxPoolItem& ) const override;

5
include/sfx2/objsh.hxx
View File

@ -943,13 +943,14 @@ class SFX2_DLLPUBLIC SfxObjectShellItem final : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxObjectShellItem)
SfxObjectShellItem() :
SfxPoolItem( 0, SfxItemType::SfxObjectShellItemType ),
SfxPoolItem( 0 ),
pObjSh( nullptr )
{}
SfxObjectShellItem( sal_uInt16 nWhichId,
SfxObjectShell *pObjShell ):
SfxPoolItem( nWhichId, SfxItemType::SfxObjectShellItemType ),
SfxPoolItem( nWhichId ),
pObjSh( pObjShell )
{}

1
include/sfx2/tabdlg.hxx
View File

@ -49,6 +49,7 @@ namespace com::sun::star::frame { class XFrame; }
class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxTabDialogItem)
SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool);
virtual SfxTabDialogItem* Clone(SfxItemPool* pToPool = nullptr) const override;

1
include/sfx2/tplpitem.hxx
View File

@ -31,6 +31,7 @@ class SFX2_DLLPUBLIC SfxTemplateItem final : public SfxFlagItem
OUString aStyleIdentifier;
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxTemplateItem)
SfxTemplateItem();
SfxTemplateItem( sal_uInt16 nWhich,
OUString aStyle,

3
include/sfx2/viewfrm.hxx
View File

@ -267,8 +267,9 @@ class SFX2_DLLPUBLIC SfxViewFrameItem final : public SfxPoolItem
SfxViewFrame* pFrame;
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxViewFrameItem)
SfxViewFrameItem( SfxViewFrame *pViewFrame ):
SfxPoolItem( 0, SfxItemType::SfxViewFrameItemType ),
SfxPoolItem( 0 ),
pFrame( pViewFrame)
{}

1
include/sfx2/watermarkitem.hxx
View File

@ -17,6 +17,7 @@ class SFX2_DLLPUBLIC SfxWatermarkItem final : public SfxPoolItem
{
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SfxWatermarkItem)
SfxWatermarkItem();
virtual SfxWatermarkItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;

2
include/sfx2/zoomitem.hxx
View File

@ -59,7 +59,7 @@ class SFX2_DLLPUBLIC SvxZoomItem final : public SfxUInt16Item
public:
static SfxPoolItem* CreateDefault();
DECLARE_ITEM_TYPE_FUNCTION(SvxZoomItem)
SvxZoomItem( SvxZoomType eZoomType = SvxZoomType::PERCENT,
sal_uInt16 nVal = 0, TypedWhichId<SvxZoomItem> nWhich = SID_ATTR_ZOOM );

3
include/svl/cenumitm.hxx
View File

@ -26,11 +26,12 @@
class SVL_DLLPUBLIC SfxEnumItemInterface: public SfxPoolItem
{
protected:
explicit SfxEnumItemInterface(sal_uInt16 which, SfxItemType eItemType): SfxPoolItem(which, eItemType) {}
explicit SfxEnumItemInterface(sal_uInt16 which): SfxPoolItem(which) {}
SfxEnumItemInterface(const SfxEnumItemInterface &) = default;
public:
DECLARE_ITEM_TYPE_FUNCTION(SfxEnumItemInterface)
virtual bool operator ==(const SfxPoolItem & rItem) const override;

Some files were not shown because too many files have changed in this diff Show More