bin/find-can-be-private-symbols.functions.results | 87 --------------- include/svx/svdomeas.hxx | 122 +++++++++++----------- include/svx/svdomedia.hxx | 24 ++-- include/svx/sxmtpitm.hxx | 24 ++-- include/svx/sxmuitm.hxx | 12 +- 5 files changed, 91 insertions(+), 178 deletions(-)
New commits: commit e6bef01e23fb88d968c2a3568d1076dda77c2aff Author: Noel Grandin <[email protected]> AuthorDate: Wed Mar 27 21:40:15 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Mar 28 08:41:30 2024 +0100 reduce symbol visibility in svx Change-Id: I7a6795d04f9b21e5b46463dfe5d3dfb3a3cb6c07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165432 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index c14e2f0342da..bc776435eb0e 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -3031,94 +3031,7 @@ SdrMeasureBelowRefEdgeItem::Clone(SfxItemPool*) const SdrMeasureDecimalPlacesItem::Clone(SfxItemPool*) const SdrMeasureField::Clone() const SdrMeasureField::operator==(SvxFieldData const&) const -SdrMeasureObj::AddToHdlList(SdrHdlList&) const -SdrMeasureObj::BckCreate(SdrDragStat&) -SdrMeasureObj::BegCreate(SdrDragStat&) -SdrMeasureObj::BegTextEdit(SdrOutliner&) -SdrMeasureObj::BrkCreate(SdrDragStat&) -SdrMeasureObj::CalcFieldValue(SvxFieldItem const&, int, unsigned short, bool, std::optional<Color>&, std::optional<Color>&, std::optional<FontLineStyle>&, rtl::OUString&) const -SdrMeasureObj::CloneSdrObject(SdrModel&) const -SdrMeasureObj::CreateObjectSpecificProperties() -SdrMeasureObj::CreateObjectSpecificViewContact() -SdrMeasureObj::DoConvertToPolyObj(bool, bool) const -SdrMeasureObj::EndCreate(SdrDragStat&, SdrCreateCmd) -SdrMeasureObj::GetCreatePointer() const -SdrMeasureObj::GetHdlCount() const -SdrMeasureObj::GetObjIdentifier() const -SdrMeasureObj::GetOutlinerParaObject() const -SdrMeasureObj::GetOutlinerViewAnchorMode() const -SdrMeasureObj::GetPointCount() const -SdrMeasureObj::GetRotateAngle() const -SdrMeasureObj::GetSnapPoint(unsigned int) const -SdrMeasureObj::GetSnapPointCount() const -SdrMeasureObj::GetTextSize() const -SdrMeasureObj::ImpCalcGeometrics(ImpMeasureRec const&, ImpMeasurePoly&) const -SdrMeasureObj::ImpCalcXPoly(ImpMeasurePoly const&) -SdrMeasureObj::ImpEvalDrag(ImpMeasureRec&, SdrDragStat const&) const -SdrMeasureObj::ImpTakeAttr(ImpMeasureRec&) const -SdrMeasureObj::IsPolyObj() const -SdrMeasureObj::MovCreate(SdrDragStat&) -SdrMeasureObj::NbcMirror(Point const&, Point const&) -SdrMeasureObj::NbcMove(Size const&) -SdrMeasureObj::NbcResize(Point const&, Fraction const&, Fraction const&) -SdrMeasureObj::NbcRotate(Point const&, o3tl::strong_int<int, FractionTag<100> >, double, double) -SdrMeasureObj::NbcSetOutlinerParaObject(std::optional<OutlinerParaObject>) -SdrMeasureObj::NbcSetPoint(Point const&, unsigned int) -SdrMeasureObj::NbcShear(Point const&, o3tl::strong_int<int, FractionTag<100> >, double, bool) -SdrMeasureObj::NewGeoData() const -SdrMeasureObj::RecalcSnapRect() -SdrMeasureObj::RestoreGeoData(SdrObjGeoData const&) -SdrMeasureObj::SaveGeoData(SdrObjGeoData&) const -SdrMeasureObj::SdrMeasureObj(SdrModel&) -SdrMeasureObj::SdrMeasureObj(SdrModel&, SdrMeasureObj const&) -SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix&, basegfx::B2DPolyPolygon&) const -SdrMeasureObj::TRSetBaseGeometry(basegfx::B2DHomMatrix const&, basegfx::B2DPolyPolygon const&) -SdrMeasureObj::TakeCreatePoly(SdrDragStat const&) const -SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec&) const -SdrMeasureObj::TakeObjNamePlural() const -SdrMeasureObj::TakeObjNameSingul() const -SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind) const -SdrMeasureObj::TakeTextAnchorRect(tools::Rectangle&) const -SdrMeasureObj::TakeTextEditArea(Size*, Size*, tools::Rectangle*, tools::Rectangle*) const -SdrMeasureObj::TakeTextRect(SdrOutliner&, tools::Rectangle&, bool, tools::Rectangle*, bool) const -SdrMeasureObj::TakeXorPoly() const -SdrMeasureObj::UndirtyText() const -SdrMeasureObj::applySpecialDrag(SdrDragStat&) -SdrMeasureObj::beginSpecialDrag(SdrDragStat&) const -SdrMeasureObj::getSpecialDragComment(SdrDragStat const&) const -SdrMeasureObj::hasSpecialDrag() const -SdrMeasureObj::~SdrMeasureObj() -SdrMeasureTextHPosItem::Clone(SfxItemPool*) const -SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrMeasureTextHPosItem::GetValueCount() const -SdrMeasureTextHPosItem::GetValueTextByPos(unsigned short) -SdrMeasureTextHPosItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrMeasureTextHPosItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const SdrMeasureTextRota90Item::Clone(SfxItemPool*) const -SdrMeasureTextVPosItem::Clone(SfxItemPool*) const -SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrMeasureTextVPosItem::GetValueCount() const -SdrMeasureTextVPosItem::GetValueTextByPos(unsigned short) -SdrMeasureTextVPosItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrMeasureTextVPosItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrMeasureUnitItem::Clone(SfxItemPool*) const -SdrMeasureUnitItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrMeasureUnitItem::GetValueCount() const -SdrMeasureUnitItem::GetValueTextByPos(unsigned short) -SdrMeasureUnitItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrMeasureUnitItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrMediaObj::CreateObjectSpecificViewContact() -SdrMediaObj::GetObjIdentifier() const -SdrMediaObj::HasTextEdit() const -SdrMediaObj::SdrMediaObj(SdrModel&) -SdrMediaObj::SdrMediaObj(SdrModel&, SdrMediaObj const&) -SdrMediaObj::SetInputStream(com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&) -SdrMediaObj::TakeObjInfo(SdrObjTransformInfoRec&) const -SdrMediaObj::TakeObjNamePlural() const -SdrMediaObj::TakeObjNameSingul() const -SdrMediaObj::mediaPropertiesChanged(avmedia::MediaItem const&) -SdrMediaObj::setMediaProperties(avmedia::MediaItem const&) -SdrMediaObj::~SdrMediaObj() SdrMetricItem::Clone(SfxItemPool*) const SdrModel::BegUndo(rtl::OUString const&, rtl::OUString const&, SdrRepeatFunc) SdrModel::CopyPages(unsigned short, unsigned short, unsigned short, bool, bool) diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index e41b5bdd02d3..775354020af0 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -49,18 +49,18 @@ private: friend class sdr::properties::MeasureProperties; friend class SdrMeasureField; - virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; - virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; + SAL_DLLPRIVATE virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; + SAL_DLLPRIVATE virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; Point aPt1; Point aPt2; bool bTextDirty; - void ImpTakeAttr(ImpMeasureRec& rRec) const; - OUString TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const; - void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; - static basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol); - void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; + SAL_DLLPRIVATE void ImpTakeAttr(ImpMeasureRec& rRec) const; + SAL_DLLPRIVATE OUString TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const; + SAL_DLLPRIVATE void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; + SAL_DLLPRIVATE static basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol); + SAL_DLLPRIVATE void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; void SetTextDirty() { bTextDirty=true; @@ -71,82 +71,82 @@ private: SetBoundAndSnapRectsDirty(/*bNotMyself*/true); } } - void UndirtyText() const; + SAL_DLLPRIVATE void UndirtyText() const; - virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; - virtual void RestoreGeoData(const SdrObjGeoData& rGeo) override; + SAL_DLLPRIVATE virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override; + SAL_DLLPRIVATE virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; + SAL_DLLPRIVATE virtual void RestoreGeoData(const SdrObjGeoData& rGeo) override; public: - SdrMeasureObj(SdrModel& rSdrModel); + SAL_DLLPRIVATE SdrMeasureObj(SdrModel& rSdrModel); // Copy constructor - SdrMeasureObj(SdrModel& rSdrModel, SdrMeasureObj const & rSource); + SAL_DLLPRIVATE SdrMeasureObj(SdrModel& rSdrModel, SdrMeasureObj const & rSource); SdrMeasureObj( SdrModel& rSdrModel, const Point& rPt1, const Point& rPt2); - virtual ~SdrMeasureObj() override; + SAL_DLLPRIVATE virtual ~SdrMeasureObj() override; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; - virtual SdrObjKind GetObjIdentifier() const override; + SAL_DLLPRIVATE virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; + SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override; virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; - virtual rtl::Reference<SdrObject> CloneSdrObject(SdrModel& rTargetModel) const override; + SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> CloneSdrObject(SdrModel& rTargetModel) const override; - virtual OUString TakeObjNameSingul() const override; - virtual OUString TakeObjNamePlural() const override; + SAL_DLLPRIVATE virtual OUString TakeObjNameSingul() const override; + SAL_DLLPRIVATE virtual OUString TakeObjNamePlural() const override; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; - virtual sal_uInt32 GetHdlCount() const override; - virtual void AddToHdlList(SdrHdlList& rHdlList) const override; + SAL_DLLPRIVATE virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; + SAL_DLLPRIVATE virtual sal_uInt32 GetHdlCount() const override; + SAL_DLLPRIVATE virtual void AddToHdlList(SdrHdlList& rHdlList) const override; // special drag methods - virtual bool hasSpecialDrag() const override; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override; - virtual bool applySpecialDrag(SdrDragStat& rDrag) override; - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override; - - virtual bool BegCreate(SdrDragStat& rStat) override; - virtual bool MovCreate(SdrDragStat& rStat) override; - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; - virtual bool BckCreate(SdrDragStat& rStat) override; - virtual void BrkCreate(SdrDragStat& rStat) override; - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; - virtual PointerStyle GetCreatePointer() const override; - - virtual void NbcMove(const Size& rSiz) override; - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs) override; - virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - virtual void NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear) override; - virtual Degree100 GetRotateAngle() const override; - virtual void RecalcSnapRect() override; - - virtual sal_uInt32 GetSnapPointCount() const override; - virtual Point GetSnapPoint(sal_uInt32 i) const override; - - virtual bool IsPolyObj() const override; - virtual sal_uInt32 GetPointCount() const override; + SAL_DLLPRIVATE virtual bool hasSpecialDrag() const override; + SAL_DLLPRIVATE virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override; + SAL_DLLPRIVATE virtual bool applySpecialDrag(SdrDragStat& rDrag) override; + SAL_DLLPRIVATE virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override; + + SAL_DLLPRIVATE virtual bool BegCreate(SdrDragStat& rStat) override; + SAL_DLLPRIVATE virtual bool MovCreate(SdrDragStat& rStat) override; + SAL_DLLPRIVATE virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; + SAL_DLLPRIVATE virtual bool BckCreate(SdrDragStat& rStat) override; + SAL_DLLPRIVATE virtual void BrkCreate(SdrDragStat& rStat) override; + SAL_DLLPRIVATE virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override; + SAL_DLLPRIVATE virtual PointerStyle GetCreatePointer() const override; + + SAL_DLLPRIVATE virtual void NbcMove(const Size& rSiz) override; + SAL_DLLPRIVATE virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + SAL_DLLPRIVATE virtual void NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs) override; + SAL_DLLPRIVATE virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; + SAL_DLLPRIVATE virtual void NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear) override; + SAL_DLLPRIVATE virtual Degree100 GetRotateAngle() const override; + SAL_DLLPRIVATE virtual void RecalcSnapRect() override; + + SAL_DLLPRIVATE virtual sal_uInt32 GetSnapPointCount() const override; + SAL_DLLPRIVATE virtual Point GetSnapPoint(sal_uInt32 i) const override; + + SAL_DLLPRIVATE virtual bool IsPolyObj() const override; + SAL_DLLPRIVATE virtual sal_uInt32 GetPointCount() const override; virtual Point GetPoint(sal_uInt32 i) const override; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override; + SAL_DLLPRIVATE virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override; - virtual rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const override; + SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const override; - virtual bool BegTextEdit(SdrOutliner& rOutl) override; - virtual const Size& GetTextSize() const override; - virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, + SAL_DLLPRIVATE virtual bool BegTextEdit(SdrOutliner& rOutl) override; + SAL_DLLPRIVATE virtual const Size& GetTextSize() const override; + SAL_DLLPRIVATE virtual void TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool bLineWidth = true ) const override; - virtual void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const override; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; - virtual EEAnchorMode GetOutlinerViewAnchorMode() const override; - virtual void NbcSetOutlinerParaObject(std::optional<OutlinerParaObject> pTextObject) override; - virtual OutlinerParaObject* GetOutlinerParaObject() const override; + SAL_DLLPRIVATE virtual void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const override; + SAL_DLLPRIVATE virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const override; + SAL_DLLPRIVATE virtual EEAnchorMode GetOutlinerViewAnchorMode() const override; + SAL_DLLPRIVATE virtual void NbcSetOutlinerParaObject(std::optional<OutlinerParaObject> pTextObject) override; + SAL_DLLPRIVATE virtual OutlinerParaObject* GetOutlinerParaObject() const override; - virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, + SAL_DLLPRIVATE virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, bool bEdit, std::optional<Color>& rpTxtColor, std::optional<Color>& rpFldColor, std::optional<FontLineStyle>& rpFldLineStyle, OUString& rRet) const override; // #i97878# - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override; - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override; + SAL_DLLPRIVATE virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override; + SAL_DLLPRIVATE virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override; }; // Creating: diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index aead70568511..b1c5959f4b91 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -36,23 +36,23 @@ class SVXCORE_DLLPUBLIC SdrMediaObj final : public SdrRectObj private: // protected destructor - due to final, make private - virtual ~SdrMediaObj() override; + SAL_DLLPRIVATE virtual ~SdrMediaObj() override; public: - SdrMediaObj(SdrModel& rSdrModel); + SAL_DLLPRIVATE SdrMediaObj(SdrModel& rSdrModel); // Copy constructor - SdrMediaObj(SdrModel& rSdrModel, SdrMediaObj const & rSource); + SAL_DLLPRIVATE SdrMediaObj(SdrModel& rSdrModel, SdrMediaObj const & rSource); SdrMediaObj( SdrModel& rSdrModel, const tools::Rectangle& rRect); - virtual bool HasTextEdit() const override; + SAL_DLLPRIVATE virtual bool HasTextEdit() const override; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; - virtual SdrObjKind GetObjIdentifier() const override; + SAL_DLLPRIVATE virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; + SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override; - virtual OUString TakeObjNameSingul() const override; - virtual OUString TakeObjNamePlural() const override; + SAL_DLLPRIVATE virtual OUString TakeObjNameSingul() const override; + SAL_DLLPRIVATE virtual OUString TakeObjNamePlural() const override; virtual rtl::Reference<SdrObject> CloneSdrObject(SdrModel& rTargetModel) const override; @@ -64,20 +64,20 @@ public: /// Returns the URL to the temporary extracted media file. const OUString& getTempURL() const; - void setMediaProperties( const ::avmedia::MediaItem& rState ); + SAL_DLLPRIVATE void setMediaProperties( const ::avmedia::MediaItem& rState ); const ::avmedia::MediaItem& getMediaProperties() const; css::uno::Reference< css::graphic::XGraphic > const & getSnapshot() const; css::uno::Reference< css::io::XInputStream> GetInputStream() const; - void SetInputStream(css::uno::Reference<css::io::XInputStream> const&); + SAL_DLLPRIVATE void SetInputStream(css::uno::Reference<css::io::XInputStream> const&); virtual bool shouldKeepAspectRatio() const override { return true; } private: - void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); - virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; + SAL_DLLPRIVATE void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); + SAL_DLLPRIVATE virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; struct Impl; std::unique_ptr<Impl> m_xImpl; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 60e17d445d61..0a07ea0fb6f6 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -31,14 +31,14 @@ public: : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) { } - virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override; - virtual sal_uInt16 GetValueCount() const override; // { return 4; } + SAL_DLLPRIVATE virtual SdrMeasureTextHPosItem* Clone(SfxItemPool* pPool=nullptr) const override; + SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 4; } - 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; + SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - static const OUString & GetValueTextByPos(sal_uInt16 nPos); - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; + SAL_DLLPRIVATE static const OUString & GetValueTextByPos(sal_uInt16 nPos); + SAL_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem final : public SfxEnumItem<css::drawing::MeasureTextVertPos> { @@ -47,14 +47,14 @@ public: : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) { } - virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override; - virtual sal_uInt16 GetValueCount() const override; // { return 5; } + SAL_DLLPRIVATE virtual SdrMeasureTextVPosItem* Clone(SfxItemPool* pPool=nullptr) const override; + SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 5; } - 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; + SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - static OUString GetValueTextByPos(sal_uInt16 nPos); - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; + SAL_DLLPRIVATE static OUString GetValueTextByPos(sal_uInt16 nPos); + SAL_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index ab0ad8a3cd35..5ebf0a4f6499 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -29,14 +29,14 @@ class SVXCORE_DLLPUBLIC SdrMeasureUnitItem final : public SfxEnumItem<FieldUnit> { public: SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} - virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; - virtual sal_uInt16 GetValueCount() const override; // { return 14; } + SAL_DLLPRIVATE virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; + SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; // { return 14; } - 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; + SAL_DLLPRIVATE virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + SAL_DLLPRIVATE virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - static OUString GetValueTextByPos(sal_uInt16 nPos); - virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; + SAL_DLLPRIVATE static OUString GetValueTextByPos(sal_uInt16 nPos); + SAL_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif
