summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/fmtfordr.hxx4
-rw-r--r--sw/inc/fmtftntx.hxx6
-rw-r--r--sw/inc/fmtsrnd.hxx8
-rw-r--r--sw/inc/grfatr.hxx10
4 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 5a09efbee57b..eec6343dbd1f 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -33,7 +33,7 @@ enum SwFillOrder
SW_FILL_ORDER_END
};
-class SwFormatFillOrder: public SfxEnumItem
+class SwFormatFillOrder: public SfxEnumItem<SwFillOrder>
{
public:
SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN );
@@ -41,7 +41,7 @@ public:
/// "Pure virtual methods" of SfxPoolItem.
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
- virtual sal_uInt16 GetValueCount() const override;
+ virtual sal_uInt16 GetValueCount() const override;
};
inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy )
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index dfd48139ee1a..c46441a297fd 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -34,7 +34,7 @@ enum SwFootnoteEndPosEnum
FTNEND_ATTXTEND_END
};
-class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem
+class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem<SwFootnoteEndPosEnum>
{
OUString sPrefix;
OUString sSuffix;
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem
protected:
SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
- : SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 )
+ : SfxEnumItem( nWhichL, ePos ), nOffset( 0 )
{}
SwFormatFootnoteEndAtTextEnd( const SwFormatFootnoteEndAtTextEnd& rAttr )
: SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ),
@@ -52,7 +52,7 @@ protected:
{}
public:
- virtual sal_uInt16 GetValueCount() const override;
+ virtual sal_uInt16 GetValueCount() const override;
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 02bf0e0c7299..74e429d4c9d5 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -28,7 +28,7 @@
class IntlWrapper;
// SwFormatSurround: How document content under the frame shall behave.
-class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem
+class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem<css::text::WrapTextMode>
{
bool bAnchorOnly :1;
bool bContour :1;
@@ -41,7 +41,7 @@ public:
// "Pure virtual Methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
- virtual sal_uInt16 GetValueCount() const override;
+ virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
@@ -50,11 +50,11 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- css::text::WrapTextMode GetSurround()const { return css::text::WrapTextMode( GetValue() ); }
+ css::text::WrapTextMode GetSurround() const { return GetValue(); }
bool IsAnchorOnly() const { return bAnchorOnly; }
bool IsContour() const { return bContour; }
bool IsOutside() const { return bOutside; }
- void SetSurround ( css::text::WrapTextMode eNew ){ SfxEnumItem::SetValue( sal_uInt16( eNew ) ); }
+ void SetSurround ( css::text::WrapTextMode eNew ) { SetValue( eNew ); }
void SetAnchorOnly( bool bNew ) { bAnchorOnly = bNew; }
void SetContour( bool bNew ) { bContour = bNew; }
void SetOutside( bool bNew ) { bOutside = bNew; }
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index de586e9c7a60..9c9b625c7590 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -38,13 +38,13 @@ RES_MIRROR_GRAPH_BEGIN,
RES_MIRROR_GRAPH_END
};
-class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem
+class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem<MirrorGraph>
{
bool bGrfToggle; // Flip graphics on even pages.
public:
SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT )
- : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< sal_uInt16 >(eMiro) ), bGrfToggle( false )
+ : SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), bGrfToggle( false )
{}
SwMirrorGrf( const SwMirrorGrf &rMirrorGrf )
: SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()),
@@ -55,7 +55,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const override;
+ virtual sal_uInt16 GetValueCount() const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
@@ -260,7 +260,7 @@ public:
sal_uInt8 nMemberId ) override;
};
-class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem
+class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem<sal_uInt16>
{
public:
SwDrawModeGrf( sal_uInt16 nMode = 0 )
@@ -271,7 +271,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
// pure virtual methods of SfxEnumItem
- virtual sal_uInt16 GetValueCount() const override;
+ virtual sal_uInt16 GetValueCount() const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
generated by cgit (git 2.34.1) at 2025-02-02 02:05:00 +0000
Id: I8814616024345206a69b7e33ade42c74656e9213 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127730 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, PieSegment2DNoel Grandin Change-Id: I18bd576fdc3a679013f999d769089dce35e09994 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127729 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, Svx3DLatheObjectNoel Grandin Change-Id: I3c007cc5b70e6a7b854438b9b2558229f5a5c73f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127728 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, Svx3DSceneObjectNoel Grandin Change-Id: Ic1cdc8a4efbb91bfabe84c32b703cb4868cd31a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127727 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, Svx3DExtrudeObjectNoel Grandin Change-Id: I8b9dc0568cabf5c5e3f35c2330803f96c7623e6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127726 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, SvxShapePolyPolygonNoel Grandin Change-Id: Ica53484d44e6992278b8d188ffb536e238aeb195 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127725 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, SvxShapeRectNoel Grandin Change-Id: Ibd537ed709be237e00715057c162dd9197759373 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127722 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2021-12-30use concrete types in chart2, SvxGroupShape and SvxShapePolyPolygonNoel Grandin Change-Id: I2b86c39610f31260fe8fb5abdbb94e853ec31cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127700 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2020-09-04tdf#124176 Use #pragma once in chart2George Bateman This commit was carried out mostly by a Python script, source of which is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97. Change-Id: Ifee23b494264f895e5612952d0875cac064e4132 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100181 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> 2020-07-22chart2: clean-up redundant ShapeFactory::createText()Tünde Tóth It's needless since commit 9eb614f8d2d9cc983c51bcdde211ee0c59c3a96c (tdf#134659 chart2: use centered label alignment at text break). Change-Id: I8607cf1c85e13152bab2543a7970a77f9c72db6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98946 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> 2020-06-29tdf#134235 Chart OOXML import: fix long chart titleTünde Tóth Workaround to handle long (sub)titles which resulted broken charts. See commit 96a29c12a9d8734c9d2a812f38fc6654b5df9c48 (tdf#101322 Chart OOXML Export: fix missing subtitle). Change-Id: I22bb4699bdda8dea5f31c715cc1f439085a0718f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97092 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> 2020-05-08compact namespace in canvas..cuiNoel Grandin Change-Id: I7bd0c2a55b936896fcfe7e1a374871008a18618f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93706 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2019-01-18convert some enums to scopedNoel Grandin Change-Id: Ib381bb24abb4bf09c87d9fa372374ce133cb7848 Reviewed-on: https://gerrit.libreoffice.org/66566 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2018-11-16loplugin:staticmethods improvementNoel Grandin Change-Id: I8889ce8a7d2309b54454cfe4c6421282e1c6e755 Reviewed-on: https://gerrit.libreoffice.org/63434 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2018-09-06clang-tidy performance-unnecessary-value-paramNoel Grandin Change-Id: I69247498e13331f6ef84afeb242479f8fb1178a8 Reviewed-on: https://gerrit.libreoffice.org/60068 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2018-08-11loplugin:mergeclasses AbstractShapeFactory into ShapeFactoryNoel Grandin Change-Id: I9cc607bcc84a14ffdbe22bdbe1a038f5b22b719a Reviewed-on: https://gerrit.libreoffice.org/58871 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2018-07-17remove the GL based 3D chartsMarkus Mohrhard Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9 Reviewed-on: https://gerrit.libreoffice.org/57533 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> 2018-01-29tdf#114821 import complex data labels in bar chartSzymon Kłos * import static text & fields: VALUE, SERIESNAME, COLUMNNAME * text is formatted * DataPointCustomLabelField with field type (DataPointCustomLabelFieldType) was introduced. * text can have many portions & multiple lines * unit tests for import data labels with formatting Not implemented: CELLREF field support which needs importing some additional data from extLst Shows custom text as a label for data points. Change-Id: Iba8fd508eb16356b05586b93d7b8da32240d2b91 Reviewed-on: https://gerrit.libreoffice.org/48243 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> 2016-08-05loplugin:countusersofdefaultparams in canvas,chart2Noel Grandin Change-Id: Id66a706171b73affeb508812744028d9f30133af Reviewed-on: https://gerrit.libreoffice.org/27868 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> 2016-07-07loplugin:passstuffbyref also for {css::uno,rtl}::ReferenceStephan Bergmann Change-Id: I5c973d41381f2bfd39e7a8cf48fd5807852bdc72 2016-04-24C++11: disable ctors instead of not implementing them (chart2)Jochen Nitschke replace the old declare and don't implement pattern with C++11 delete keyword Change-Id: I10b14cece4ecaddc5f96ee098b5fa36a8782a0fc Reviewed-on: https://gerrit.libreoffice.org/24340 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> 2016-03-14com::sun::star->css in chart2Noel Grandin Change-Id: I04320d32d6d5c54e461cfabef58645f8b772bc69 2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann Change-Id: I71de514405bb9bcc746c1ab9633e7fe659888943