summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/grfcrop.hxx5
-rw-r--r--include/svx/hlnkitem.hxx3
-rw-r--r--include/svx/optgrid.hxx3
-rw-r--r--include/svx/sdangitm.hxx3
-rw-r--r--include/svx/sdgmoitm.hxx2
-rw-r--r--include/svx/sdtaditm.hxx3
-rw-r--r--include/svx/sdtaitm.hxx9
-rw-r--r--include/svx/sdtakitm.hxx3
-rw-r--r--include/svx/sdtfsitm.hxx2
-rw-r--r--include/svx/sdynitm.hxx3
-rw-r--r--include/svx/sxcecitm.hxx5
-rw-r--r--include/svx/sxctitm.hxx3
-rw-r--r--include/svx/sxekitm.hxx3
-rw-r--r--include/svx/sxmtpitm.hxx4
-rw-r--r--include/svx/sxmuitm.hxx3
15 files changed, 34 insertions, 20 deletions
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index de0cfef5b976..3eed97fbab47 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -30,10 +30,11 @@ class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
{
sal_Int32 nLeft, nRight, nTop, nBottom;
public:
- SvxGrfCrop( TypedWhichId<SvxGrfCrop> );
+ SvxGrfCrop( TypedWhichId<SvxGrfCrop>, SfxItemType eType = SfxItemType::SvxGrfCropType );
SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight,
sal_Int32 nTop, sal_Int32 nBottom,
- TypedWhichId<SvxGrfCrop> );
+ TypedWhichId<SvxGrfCrop>,
+ SfxItemType eItemType = SfxItemType::SvxGrfCropType );
virtual ~SvxGrfCrop() override;
SvxGrfCrop(SvxGrfCrop const &) = default;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index 03eb8424561c..95a42c273c59 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -62,7 +62,8 @@ public:
static SfxPoolItem* CreateDefault();
SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> _nWhich = SID_HYPERLINK_GETLINK ):
- SfxPoolItem(_nWhich) { eType = HLINK_DEFAULT; nMacroEvents=HyperDialogEvent::NONE; };
+ SfxPoolItem(_nWhich, SfxItemType::SvxHyperlinkItemType)
+ { eType = HLINK_DEFAULT; nMacroEvents=HyperDialogEvent::NONE; };
SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem );
SvxHyperlinkItem( TypedWhichId<SvxHyperlinkItem> nWhich, OUString aName, OUString aURL,
OUString aTarget, OUString aIntName,
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 7cdcdf8399f3..6876d0c25b30 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -69,7 +69,8 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
friend class SvxGridTabPage;
public:
- SvxGridItem( TypedWhichId<SvxGridItem> _nWhich) : SfxPoolItem(_nWhich){};
+ SvxGridItem( TypedWhichId<SvxGridItem> _nWhich)
+ : SfxPoolItem(_nWhich, SfxItemType::SvxGridItemType){};
virtual SvxGridItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index ee4af385a171..2d778010c6cd 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -27,7 +27,8 @@
class SVXCORE_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
public:
- SdrAngleItem(TypedWhichId<SdrAngleItem> nId, Degree100 nAngle): SfxInt32Item(nId,nAngle.get()) {}
+ SdrAngleItem(TypedWhichId<SdrAngleItem> nId, Degree100 nAngle, SfxItemType eItemType = SfxItemType::SdrAngleItemType)
+ : SfxInt32Item(nId,nAngle.get(), eItemType) {}
virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual bool GetPresentation(SfxItemPresentation ePres,
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index fa205b6db2e7..9e6b66844def 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -29,7 +29,7 @@
class SAL_DLLPUBLIC_RTTI SdrGrafModeItem_Base: public SfxEnumItem<GraphicDrawMode> {
protected:
SdrGrafModeItem_Base(GraphicDrawMode eMode):
- SfxEnumItem(SDRATTR_GRAFMODE, eMode) {}
+ SfxEnumItem(SDRATTR_GRAFMODE, SfxItemType::SdrGrafModeItem_Base, eMode) {}
};
class SVXCORE_DLLPUBLIC SdrGrafModeItem final : public SdrGrafModeItem_Base
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 79ae6bc011be..6225352e2738 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -33,7 +33,8 @@ enum class SdrTextAniDirection
class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem final : public SfxEnumItem<SdrTextAniDirection> {
public:
- SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {}
+ SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left)
+ : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, SfxItemType::SdrTextAniDirectionItemType, eDir) {}
virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override;
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 716f703ec4eb..4838c85c4a53 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -34,8 +34,10 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally
class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem final : public SfxEnumItem<SdrTextVertAdjust> {
public:
- SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {}
- SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, TypedWhichId<SdrTextVertAdjustItem> nWhich): SfxEnumItem(nWhich, eAdj) {}
+ SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP):
+ SfxEnumItem(SDRATTR_TEXT_VERTADJUST, SfxItemType::SdrTextVertAdjustType, eAdj) {}
+ SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, TypedWhichId<SdrTextVertAdjustItem> nWhich)
+ : SfxEnumItem(nWhich, SfxItemType::SdrTextVertAdjustType, eAdj) {}
virtual SdrTextVertAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 5; }
@@ -58,7 +60,8 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted
class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem final : public SfxEnumItem<SdrTextHorzAdjust> {
public:
- SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {}
+ SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK):
+ SfxEnumItem(SDRATTR_TEXT_HORZADJUST, SfxItemType::SdrTextHorzAdjustType, eAdj) {}
virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override;
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 0d86e517bb84..38ec15a2b851 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -78,7 +78,8 @@ enum class SdrTextAniKind {
class SVXCORE_DLLPUBLIC SdrTextAniKindItem final : public SfxEnumItem<SdrTextAniKind> {
public:
- SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {}
+ SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE)
+ : SfxEnumItem(SDRATTR_TEXT_ANIKIND, SfxItemType::SdrTextAniKindItemType, eKind) {}
virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 5; }
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index ccdcb7c4dbe9..bce12dca9c1c 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -36,7 +36,7 @@ class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem final
public:
static SfxPoolItem* CreateDefault();
SdrTextFitToSizeTypeItem(css::drawing::TextFitToSizeType const eFit = css::drawing::TextFitToSizeType_NONE)
- : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, eFit)
+ : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE, SfxItemType::SdrTextFitToSizeTypeItemType, eFit)
{
}
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index 970956a42cee..08884c3404d2 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -29,7 +29,8 @@
//-------------------------------------------------- ----------
class SVXCORE_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
public:
- SdrYesNoItem(TypedWhichId<SdrYesNoItem> nId, bool bOn): SfxBoolItem(nId,bOn) {}
+ SdrYesNoItem(TypedWhichId<SdrYesNoItem> nId, bool bOn, SfxItemType eItemType = SfxItemType::SdrYesNoItemType)
+ : SfxBoolItem(nId, bOn, eItemType) {}
virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual OUString GetValueTextByVal(bool bVal) const override;
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index 6619c04be050..e358b7b3035c 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -32,10 +32,11 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit };
class SVXCORE_DLLPUBLIC SdrCaptionEscDirItem final : public SfxEnumItem<SdrCaptionEscDir> {
public:
- SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {}
+ SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal)
+ : SfxEnumItem(SDRATTR_CAPTIONESCDIR, SfxItemType::SdrCaptionEscDirItemType, eDir) {}
+
virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 3; }
-
static OUString GetValueTextByPos(sal_uInt16 nPos);
virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override;
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index 3d46f54cb0bd..f3ca502c32e3 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -29,7 +29,8 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 };
class SVXCORE_DLLPUBLIC SdrCaptionTypeItem final : public SfxEnumItem<SdrCaptionType> {
public:
- SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {}
+ SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3)
+ : SfxEnumItem(SDRATTR_CAPTIONTYPE, SfxItemType::SdrCaptionTypeItemType, eStyle) {}
virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 4; }
static OUString GetValueTextByPos(sal_uInt16 nPos);
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index fd54d38bbbe2..538a20bc4f03 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -30,7 +30,8 @@ enum class SdrEdgeKind
class SVXCORE_DLLPUBLIC SdrEdgeKindItem final : public SfxEnumItem<SdrEdgeKind> {
public:
- SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {}
+ SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines)
+ : SfxEnumItem(SDRATTR_EDGEKIND, SfxItemType::SdrEdgeKindItemType, eStyle) {}
virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 5; }
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index 60e17d445d61..8d698c625c8d 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -28,7 +28,7 @@
class SVXCORE_DLLPUBLIC SdrMeasureTextHPosItem final : public SfxEnumItem<css::drawing::MeasureTextHorzPos> {
public:
SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO)
- : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos)
+ : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, SfxItemType::SdrMeasureTextHPosItemType, ePos)
{
}
virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override;
@@ -44,7 +44,7 @@ public:
class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem final : public SfxEnumItem<css::drawing::MeasureTextVertPos> {
public:
SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO)
- : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos)
+ : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, SfxItemType::SdrMeasureTextVPosItemType, ePos)
{
}
virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override;
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index ab0ad8a3cd35..827cb320f771 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -28,7 +28,8 @@
// (based on the facts of the MapUnit of the model). This unity is displayed if necessary.
class SVXCORE_DLLPUBLIC SdrMeasureUnitItem final : public SfxEnumItem<FieldUnit> {
public:
- SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {}
+ SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE)
+ : SfxEnumItem(SDRATTR_MEASUREUNIT, SfxItemType::SdrMeasureUnitItemType, eUnit) {}
virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override;
virtual sal_uInt16 GetValueCount() const override; // { return 14; }