bin/find-can-be-private-symbols.functions.results | 149 ---------------------- include/svx/sdggaitm.hxx | 6 include/svx/sdgmoitm.hxx | 8 - include/svx/svdglue.hxx | 36 ++--- include/svx/svdhdl.hxx | 36 ++--- include/svx/svdlayer.hxx | 18 +- include/svx/svdmark.hxx | 20 +- include/svx/svdmrkv.hxx | 92 ++++++------- include/svx/svdograf.hxx | 70 +++++----- include/svx/svdpool.hxx | 10 - 10 files changed, 148 insertions(+), 297 deletions(-)
New commits: commit 32e10ebb2a1d44b40517a4024f8e984ca071d11a Author: Noel Grandin <[email protected]> AuthorDate: Sun Mar 24 12:29:59 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Mar 24 13:41:01 2024 +0100 reduce symbol visibility in svx Change-Id: I19b7518f0ec1207ba95158f70d286ab115456466 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165224 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 50de2e5acae0..c14e2f0342da 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -3011,171 +3011,22 @@ SdrEscherImport::SeekToShape(SvStream&, SvxMSDffClientData*, unsigned int) const SdrEscherImport::~SdrEscherImport() SdrFormatter::GetStr(long) const SdrFormatter::GetUnitStr(MapUnit) -SdrGluePoint::EscAngleToDir(o3tl::strong_int<int, FractionTag<100> >) -SdrGluePoint::EscDirToAngle(SdrEscapeDirection) -SdrGluePoint::GetAlignAngle() const -SdrGluePoint::Invalidate(vcl::Window&, SdrObject const*) const -SdrGluePoint::IsHit(Point const&, OutputDevice const&, SdrObject const*) const -SdrGluePoint::Mirror(Point const&, Point const&, o3tl::strong_int<int, FractionTag<100> >, SdrObject const*) -SdrGluePoint::Rotate(Point const&, o3tl::strong_int<int, FractionTag<100> >, double, double, SdrObject const*) -SdrGluePoint::SetAbsolutePos(Point const&, SdrObject const&) -SdrGluePoint::SetAlignAngle(o3tl::strong_int<int, FractionTag<100> >) -SdrGluePoint::SetReallyAbsolute(bool, SdrObject const&) -SdrGluePoint::Shear(Point const&, double, bool, SdrObject const*) -SdrGluePointList::HitTest(Point const&, OutputDevice const&, SdrObject const*) const -SdrGluePointList::Invalidate(vcl::Window&, SdrObject const*) const -SdrGluePointList::Mirror(Point const&, Point const&, SdrObject const*) -SdrGluePointList::Mirror(Point const&, Point const&, o3tl::strong_int<int, FractionTag<100> >, SdrObject const*) -SdrGluePointList::Rotate(Point const&, o3tl::strong_int<int, FractionTag<100> >, double, double, SdrObject const*) -SdrGluePointList::SetReallyAbsolute(bool, SdrObject const&) -SdrGluePointList::Shear(Point const&, double, bool, SdrObject const*) SdrGluePointList::operator=(SdrGluePointList const&) SdrGrafBlueItem::Clone(SfxItemPool*) const SdrGrafContrastItem::Clone(SfxItemPool*) const SdrGrafCropItem::Clone(SfxItemPool*) const -SdrGrafGamma100Item::Clone(SfxItemPool*) const -SdrGrafGamma100Item::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrGrafGamma100Item::QueryValue(com::sun::star::uno::Any&, unsigned char) const SdrGrafGreenItem::Clone(SfxItemPool*) const SdrGrafLuminanceItem::Clone(SfxItemPool*) const -SdrGrafModeItem::Clone(SfxItemPool*) const -SdrGrafModeItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrGrafModeItem::GetValueCount() const -SdrGrafModeItem::GetValueTextByPos(unsigned short) -SdrGrafObj::AddToHdlList(SdrHdlList&) const -SdrGrafObj::CreateObjectSpecificProperties() -SdrGrafObj::CreateObjectSpecificViewContact() -SdrGrafObj::DoConvertToPolyObj(bool, bool) const -SdrGrafObj::ForceSwapIn() const -SdrGrafObj::GetGrafPrefMapMode() const -SdrGrafObj::GetGrafPrefSize() const -SdrGrafObj::GetGrafStreamURL() const -SdrGrafObj::GetHdlCount() const -SdrGrafObj::GetMetaFile(GraphicType&) const -SdrGrafObj::GetObjIdentifier() const -SdrGrafObj::GetReplacementGraphicObject() const -SdrGrafObj::ImpDeregisterLink() -SdrGrafObj::ImpRegisterLink() -SdrGrafObj::ImpSetAttrToGrafInfo() -SdrGrafObj::ImpSetLinkedGraphic(Graphic const&) -SdrGrafObj::NbcMirror(Point const&, Point const&) -SdrGrafObj::NbcSetGraphic(Graphic const&) -SdrGrafObj::NewGeoData() const -SdrGrafObj::Notify(SfxBroadcaster&, SfxHint const&) -SdrGrafObj::RestoreGeoData(SdrObjGeoData const&) -SdrGrafObj::SaveGeoData(SdrObjGeoData&) const -SdrGrafObj::SdrGrafObj(SdrModel&, SdrGrafObj const&) -SdrGrafObj::SetGrafAnimationAllowed(bool) -SdrGrafObj::SetGrafStreamURL(rtl::OUString const&) -SdrGrafObj::SetMirrored(bool) -SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec&) const -SdrGrafObj::TakeObjNamePlural() const -SdrGrafObj::TakeObjNameSingul() const -SdrGrafObj::addCropHandles(SdrHdlList&) const -SdrGrafObj::getFullDragClone() const -SdrGrafObj::getInputStream() const -SdrGrafObj::handlePageChange(SdrPage*, SdrPage*) -SdrGrafObj::onGraphicChanged() -SdrGrafObj::~SdrGrafObj() SdrGrafRedItem::Clone(SfxItemPool*) const SdrGrafTransparenceItem::Clone(SfxItemPool*) const -SdrHdl::CreateOverlayObject(basegfx::B2DPoint const&, BitmapColorIndex, BitmapMarkerKind, Point) -SdrHdl::GetNextBigger(BitmapMarkerKind) -SdrHdl::IsHdlHit(Point const&) const -SdrHdl::SdrHdl() -SdrHdl::Set1PixMore(bool) -SdrHdl::SetHdlList(SdrHdlList*) -SdrHdl::SetMoveOutside(bool) -SdrHdl::SetRotationAngle(o3tl::strong_int<int, FractionTag<100> >) -SdrHdl::createGluePointBitmap() -SdrHdlColor::SdrHdlColor(Point const&, Color, Size const&, bool) -SdrHdlColor::~SdrHdlColor() -SdrHdlList::IsHdlListHit(Point const&) const -SdrHdlList::RemoveHdl(unsigned long) -SdrHdlList::SetDistortShear(bool) -SdrHdlList::SetHdlSize(unsigned short) -SdrHdlList::SetMoveOutside(bool) -SdrHdlList::SetRotateShear(bool) -SdrHdlList::Sort() SdrHelpLineList::HitTest(Point const&, unsigned short, OutputDevice const&) const SdrHint::SdrHint(SdrHintKind, SdrObject const&, SdrPage const*) SdrIFrameLink::DataChanged(rtl::OUString const&, com::sun::star::uno::Any const&) SdrIFrameLink::SdrIFrameLink(SdrOle2Obj*) -SdrItemPool::Clone() const -SdrItemPool::GetItemName(unsigned short) -SdrItemPool::GetPresentation(SfxPoolItem const&, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrItemPool::SdrItemPool(SdrItemPool const&) -SdrItemPool::~SdrItemPool() SdrLayer::SdrLayer(o3tl::strong_int<short, SdrLayerIDTag>, rtl::OUString) SdrLayer::operator==(SdrLayer const&) const -SdrLayerAdmin::Broadcast() const -SdrLayerAdmin::ClearLayers() -SdrLayerAdmin::GetLayerPos(SdrLayer const*) const -SdrLayerAdmin::GetUniqueLayerID() const -SdrLayerAdmin::InsertLayer(std::unique_ptr<SdrLayer, std::default_delete<SdrLayer> >, unsigned short) -SdrLayerAdmin::RemoveLayer(unsigned short) -SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin*) -SdrLayerAdmin::SetModel(SdrModel*) -SdrLayerAdmin::operator=(SdrLayerAdmin const&) SdrLayerIDSet::IsEmpty() const SdrLayerIDSet::operator&=(SdrLayerIDSet const&) -SdrMark::ObjectInDestruction(SdrObject const&) -SdrMark::SdrMark(SdrMark const&) -SdrMark::SetMarkedSdrObj(SdrObject*) -SdrMark::operator=(SdrMark const&) -SdrMark::setTime() -SdrMarkList::DeletePageView(SdrPageView const&) -SdrMarkList::InsertPageView(SdrPageView const&) -SdrMarkList::Merge(SdrMarkList const&, bool) -SdrMarkList::ReplaceMark(SdrMark const&, unsigned long) -SdrMarkList::TakeSnapRect(SdrPageView const*, tools::Rectangle&) const -SdrMarkView::AddDragModeHdl(SdrDragMode) -SdrMarkView::BckAction() -SdrMarkView::BrkAction() -SdrMarkView::BrkMarkGluePoints() -SdrMarkView::BrkMarkObj() -SdrMarkView::BrkMarkPoints() -SdrMarkView::CheckSingleSdrObjectHit(Point const&, unsigned short, SdrObjList const*, SdrPageView*, SdrSearchOptions, SdrLayerIDSet const*, SdrObject*&) const -SdrMarkView::CheckSingleSdrObjectHit(Point const&, unsigned short, SdrObjList const*, SdrPageView*, SdrSearchOptions, SdrLayerIDSet const*, SdrObject*&, SdrMarkList const*) const -SdrMarkView::CreateInnerTextRectString() const -SdrMarkView::EndAction() -SdrMarkView::EndMarkGluePoints() -SdrMarkView::ForceRefToMarked() -SdrMarkView::GetMarkedGluePointsRect() const -SdrMarkView::GetMarkedPointsRect() const -SdrMarkView::HasMarkableGluePoints() const -SdrMarkView::HasMarkedGluePoints() const -SdrMarkView::HideSdrPage() -SdrMarkView::ImpGetDescriptionString(TranslateId, ImpGetDescriptionOptions) const -SdrMarkView::ImpIsFrameHandles() const -SdrMarkView::ImpMarkPoint(SdrHdl*, SdrMark*, bool) -SdrMarkView::IsAction() const -SdrMarkView::MarkListHasChanged() -SdrMarkView::MarkNextGluePoint() -SdrMarkView::MarkNextPoint() -SdrMarkView::MarkObj(tools::Rectangle const&, bool) -SdrMarkView::ModelHasChanged() -SdrMarkView::MouseMove(MouseEvent const&, OutputDevice*) -SdrMarkView::MovAction(Point const&) -SdrMarkView::MovMarkGluePoints(Point const&) -SdrMarkView::MovMarkObj(Point const&) -SdrMarkView::Notify(SfxBroadcaster&, SfxHint const&) -SdrMarkView::PickMarkedObj(Point const&, SdrObject*&, SdrPageView*&, SdrSearchOptions) const -SdrMarkView::PickObj(Point const&, short, SdrPageView*&, SdrSearchOptions, SdrObject**, bool*) const -SdrMarkView::SdrMarkView(SdrModel&, OutputDevice*) -SdrMarkView::SetInnerTextAreaForLOKit() const -SdrMarkView::SetMarkHandles(SfxViewShell*) -SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const&, SfxViewShell const*) -SdrMarkView::SetMarkRects() -SdrMarkView::SetMoveOutside(bool) -SdrMarkView::SetRef1(Point const&) -SdrMarkView::SetRef2(Point const&) -SdrMarkView::TakeActionRect(tools::Rectangle&) const -SdrMarkView::dumpGluePointsToJSON(boost::property_tree::basic_ptree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&) -SdrMarkView::getPossibleGridOffsetForPosition(basegfx::B2DVector&, basegfx::B2DPoint const&, SdrPageView const*) const -SdrMarkView::getPossibleGridOffsetForSdrObject(basegfx::B2DVector&, SdrObject const*, SdrPageView const*) const -SdrMarkView::modelHasChangedLOKit() -SdrMarkView::~SdrMarkView() SdrMeasureBelowRefEdgeItem::Clone(SfxItemPool*) const SdrMeasureDecimalPlacesItem::Clone(SfxItemPool*) const SdrMeasureField::Clone() const diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 345082fca6b9..249130d4d49e 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -35,10 +35,10 @@ public: SdrGrafGamma100Item( sal_uInt32 nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} - virtual SdrGrafGamma100Item* Clone( SfxItemPool* pPool = nullptr ) const override; + SAL_DLLPRIVATE virtual SdrGrafGamma100Item* Clone( SfxItemPool* pPool = nullptr ) const override; - 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; }; #endif // INCLUDED_SVX_SDGGAITM_HXX diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index fa205b6db2e7..2ea7a84ca292 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -37,11 +37,11 @@ class SVXCORE_DLLPUBLIC SdrGrafModeItem final : public SdrGrafModeItem_Base public: SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} - virtual SdrGrafModeItem* Clone( SfxItemPool* pPool = nullptr ) const override; - virtual sal_uInt16 GetValueCount() const override; + SAL_DLLPRIVATE virtual SdrGrafModeItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SAL_DLLPRIVATE virtual sal_uInt16 GetValueCount() const override; - static OUString GetValueTextByPos( sal_uInt16 nPos ); - virtual bool GetPresentation( SfxItemPresentation ePres, + 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; diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index 234ecf08cdd0..3fa5ab5a569e 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -126,7 +126,7 @@ public: m_bNoPercent = !bOn; } // temp for transformations on the reference object - void SetReallyAbsolute(bool bOn, const SdrObject& rObj); + SAL_DLLPRIVATE void SetReallyAbsolute(bool bOn, const SdrObject& rObj); // #i38892# bool IsUserDefined() const @@ -165,17 +165,17 @@ public: m_nAlign = SdrAlign(m_nAlign & static_cast<SdrAlign>(0x00FF)) | (nAlg & static_cast<SdrAlign>(0xFF00)); } - bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; - void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; + SAL_DLLPRIVATE bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; + SAL_DLLPRIVATE void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; - void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); - Degree100 GetAlignAngle() const; - void SetAlignAngle(Degree100 nAngle); - static Degree100 EscDirToAngle(SdrEscapeDirection nEsc); - static SdrEscapeDirection EscAngleToDir(Degree100 nAngle); - void Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs, const SdrObject* pObj); - void Mirror(const Point& rRef1, const Point& rRef2, Degree100 nAngle, const SdrObject* pObj); - void Shear (const Point& rRef, double tn, bool bVShear, const SdrObject* pObj); + SAL_DLLPRIVATE void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); + SAL_DLLPRIVATE Degree100 GetAlignAngle() const; + SAL_DLLPRIVATE void SetAlignAngle(Degree100 nAngle); + SAL_DLLPRIVATE static Degree100 EscDirToAngle(SdrEscapeDirection nEsc); + SAL_DLLPRIVATE static SdrEscapeDirection EscAngleToDir(Degree100 nAngle); + SAL_DLLPRIVATE void Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs, const SdrObject* pObj); + SAL_DLLPRIVATE void Mirror(const Point& rRef1, const Point& rRef2, Degree100 nAngle, const SdrObject* pObj); + SAL_DLLPRIVATE void Shear (const Point& rRef, double tn, bool bVShear, const SdrObject* pObj); }; #define SDRGLUEPOINT_NOTFOUND 0xFFFF @@ -211,15 +211,15 @@ public: return m_aList[nPos]; } sal_uInt16 FindGluePoint(sal_uInt16 nId) const; - sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; - void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; + SAL_DLLPRIVATE sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; + SAL_DLLPRIVATE void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; // temp for transformations on the reference object - void SetReallyAbsolute(bool bOn, const SdrObject& rObj); - void Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs, const SdrObject* pObj); - void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); - void Mirror(const Point& rRef1, const Point& rRef2, Degree100 nAngle, const SdrObject* pObj); - void Shear(const Point& rRef, double tn, bool bVShear, const SdrObject* pObj); + SAL_DLLPRIVATE void SetReallyAbsolute(bool bOn, const SdrObject& rObj); + SAL_DLLPRIVATE void Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs, const SdrObject* pObj); + SAL_DLLPRIVATE void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); + SAL_DLLPRIVATE void Mirror(const Point& rRef1, const Point& rRef2, Degree100 nAngle, const SdrObject* pObj); + SAL_DLLPRIVATE void Shear(const Point& rRef, double tn, bool bVShear, const SdrObject* pObj); }; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 4cece6895236..bbe8e531028e 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -165,11 +165,11 @@ private: bool mbMouseOver; // is true if the mouse is over this handle protected: - std::unique_ptr<sdr::overlay::OverlayObject> CreateOverlayObject( + SAL_DLLPRIVATE std::unique_ptr<sdr::overlay::OverlayObject> CreateOverlayObject( const basegfx::B2DPoint& rPos, BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset = Point()); - static BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd); + SAL_DLLPRIVATE static BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd); // Helper to support inserting a new OverlayObject. It will do all // necessary stuff involved with that: @@ -184,13 +184,13 @@ protected: sdr::overlay::OverlayManager& rOverlayManager); public: - SdrHdl(); + SAL_DLLPRIVATE SdrHdl(); explicit SdrHdl(const Point& rPnt, SdrHdlKind eNewKind); virtual ~SdrHdl(); const sdr::overlay::OverlayObjectList& getOverlayObjectList() const { return maOverlayGroup; } - void SetHdlList(SdrHdlList* pList); + SAL_DLLPRIVATE void SetHdlList(SdrHdlList* pList); SdrHdlKind GetKind() const { return m_eKind; } void Touch(); @@ -206,8 +206,8 @@ public: bool IsSelected() const { return m_bSelect; } void SetSelected(bool bJa=true); - void Set1PixMore(bool bJa=true); - void SetRotationAngle(Degree100 n); + SAL_DLLPRIVATE void Set1PixMore(bool bJa=true); + SAL_DLLPRIVATE void SetRotationAngle(Degree100 n); bool IsCornerHdl() const { return m_eKind==SdrHdlKind::UpperLeft || m_eKind==SdrHdlKind::UpperRight || m_eKind==SdrHdlKind::LowerLeft || m_eKind==SdrHdlKind::LowerRight; } bool IsVertexHdl() const { return m_eKind==SdrHdlKind::Upper || m_eKind==SdrHdlKind::Lower || m_eKind==SdrHdlKind::Left || m_eKind==SdrHdlKind::Right; } @@ -228,11 +228,11 @@ public: sal_uInt32 GetSourceHdlNum() const { return m_nSourceHdlNum; } virtual PointerStyle GetPointer() const; - bool IsHdlHit(const Point& rPnt) const; + SAL_DLLPRIVATE bool IsHdlHit(const Point& rPnt) const; virtual bool IsFocusHdl() const; - void SetMoveOutside( bool bMoveOutside ); + SAL_DLLPRIVATE void SetMoveOutside( bool bMoveOutside ); /** is called when the mouse enters the area of this handle. If the handle changes his visualisation during mouse over it must override this method and call Touch(). */ @@ -245,7 +245,7 @@ public: visualisation during mouse over it must override this method and call Touch(). */ virtual void onMouseLeave(); - static BitmapEx createGluePointBitmap(); + SAL_DLLPRIVATE static BitmapEx createGluePointBitmap(); }; @@ -274,8 +274,8 @@ class SVXCORE_DLLPUBLIC SdrHdlColor final : public SdrHdl SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol); public: - explicit SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, bool bLuminance); - virtual ~SdrHdlColor() override; + SAL_DLLPRIVATE explicit SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, bool bLuminance); + SAL_DLLPRIVATE virtual ~SdrHdlColor() override; bool IsUseLuminance() const { return m_bUseLuminance; } @@ -455,30 +455,30 @@ public: // Sorting: 1.Level first reference point handle, then normal handles, next Glue, then User then Plushandles // 2.Level PageView (Pointer) // 3.Level Position (x+y) - void Sort(); + SAL_DLLPRIVATE void Sort(); size_t GetHdlCount() const { return maList.size(); } SdrHdl* GetHdl(size_t nNum) const { return nNum < maList.size() ? maList[nNum].get() : nullptr; } size_t GetHdlNum(const SdrHdl* pHdl) const; - void SetHdlSize(sal_uInt16 nSiz); + SAL_DLLPRIVATE void SetHdlSize(sal_uInt16 nSiz); sal_uInt16 GetHdlSize() const { return m_nHdlSize; } - void SetMoveOutside(bool bOn); + SAL_DLLPRIVATE void SetMoveOutside(bool bOn); bool IsMoveOutside() const { return m_bMoveOutside; } - void SetRotateShear(bool bOn); + SAL_DLLPRIVATE void SetRotateShear(bool bOn); bool IsRotateShear() const { return m_bRotateShear; } - void SetDistortShear(bool bOn); + SAL_DLLPRIVATE void SetDistortShear(bool bOn); bool IsDistortShear() const { return m_bDistortShear; } // AddHdl takes ownership of the handle. It should be on the Heap // as Clear() deletes it. void AddHdl(std::unique_ptr<SdrHdl> pHdl); - std::unique_ptr<SdrHdl> RemoveHdl(size_t nNum); + SAL_DLLPRIVATE std::unique_ptr<SdrHdl> RemoveHdl(size_t nNum); void RemoveAllByKind(SdrHdlKind eKind); // move the ownership of all the SdrHdl to rOther void MoveTo(SdrHdlList& rOther); // Last inserted handles are likely hit (if the handles are above each other) - SdrHdl* IsHdlListHit(const Point& rPnt) const; + SAL_DLLPRIVATE SdrHdl* IsHdlListHit(const Point& rPnt) const; SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 88cfabddb9c0..d2d9f7e7c164 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -112,21 +112,21 @@ friend class SdrPage; // we return 0. // If you want to play safe, check GetLayerCount()<SDRLAYER_MAXCOUNT // first, else all are given away already. - SdrLayerID GetUniqueLayerID() const; - void Broadcast() const; + SAL_DLLPRIVATE SdrLayerID GetUniqueLayerID() const; + SAL_DLLPRIVATE void Broadcast() const; public: - explicit SdrLayerAdmin(SdrLayerAdmin* pNewParent=nullptr); + SAL_DLLPRIVATE explicit SdrLayerAdmin(SdrLayerAdmin* pNewParent=nullptr); SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin); ~SdrLayerAdmin(); - SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin); + SAL_DLLPRIVATE SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin); - void SetModel(SdrModel* pNewModel); + SAL_DLLPRIVATE void SetModel(SdrModel* pNewModel); - void InsertLayer(std::unique_ptr<SdrLayer> pLayer, sal_uInt16 nPos); - std::unique_ptr<SdrLayer> RemoveLayer(sal_uInt16 nPos); + SAL_DLLPRIVATE void InsertLayer(std::unique_ptr<SdrLayer> pLayer, sal_uInt16 nPos); + SAL_DLLPRIVATE std::unique_ptr<SdrLayer> RemoveLayer(sal_uInt16 nPos); // Delete all layers - void ClearLayers(); + SAL_DLLPRIVATE void ClearLayers(); // New layer is created and inserted SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF); @@ -137,7 +137,7 @@ public: SdrLayer* GetLayer(sal_uInt16 i) { return maLayers[i].get(); } const SdrLayer* GetLayer(sal_uInt16 i) const { return maLayers[i].get(); } - sal_uInt16 GetLayerPos(const SdrLayer* pLayer) const; + SAL_DLLPRIVATE sal_uInt16 GetLayerPos(const SdrLayer* pLayer) const; SdrLayer* GetLayer(const OUString& rName); const SdrLayer* GetLayer(const OUString& rName) const; diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 0416026000a6..3d09b0c4c224 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -52,19 +52,19 @@ class SVXCORE_DLLPUBLIC SdrMark final : public sdr::ObjectUser bool mbCon2; // for Connectors sal_uInt16 mnUser; // E.g. for CopyObjects, also copy Edges - void setTime(); + SAL_DLLPRIVATE void setTime(); public: explicit SdrMark(SdrObject* pNewObj = nullptr, SdrPageView* pNewPageView = nullptr); - SdrMark(const SdrMark& rMark); + SAL_DLLPRIVATE SdrMark(const SdrMark& rMark); virtual ~SdrMark(); // Derived from ObjectUser - virtual void ObjectInDestruction(const SdrObject& rObject) override; + SAL_DLLPRIVATE virtual void ObjectInDestruction(const SdrObject& rObject) override; - SdrMark& operator=(const SdrMark& rMark); + SAL_DLLPRIVATE SdrMark& operator=(const SdrMark& rMark); - void SetMarkedSdrObj(SdrObject* pNewObj); + SAL_DLLPRIVATE void SetMarkedSdrObj(SdrObject* pNewObj); SdrObject* GetMarkedSdrObj() const { return mpSelectedSdrObject;} SdrPageView* GetPageView() const @@ -185,10 +185,10 @@ public: size_t FindObject(const SdrObject* pObj) const; void InsertEntry(const SdrMark& rMark, bool bChkSort = true); void DeleteMark(size_t nNum); - void ReplaceMark(const SdrMark& rNewMark, size_t nNum); - void Merge(const SdrMarkList& rSrcList, bool bReverse = false); - bool DeletePageView(const SdrPageView& rPV); - bool InsertPageView(const SdrPageView& rPV); + SAL_DLLPRIVATE void ReplaceMark(const SdrMark& rNewMark, size_t nNum); + SAL_DLLPRIVATE void Merge(const SdrMarkList& rSrcList, bool bReverse = false); + SAL_DLLPRIVATE bool DeletePageView(const SdrPageView& rPV); + SAL_DLLPRIVATE bool InsertPageView(const SdrPageView& rPV); void SetNameDirty() { @@ -212,7 +212,7 @@ public: // pPage=0: Selection of everything! Respect Pages bool TakeBoundRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; - bool TakeSnapRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; + SAL_DLLPRIVATE bool TakeSnapRect(SdrPageView const * pPageView, tools::Rectangle& rRect) const; // All Entries are copied! SdrMarkList& operator=(const SdrMarkList& rLst); diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 6421b51b0dba..edcc0678b676 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -134,13 +134,13 @@ protected: bool mbNegativeX : 1; // Helper to get a possible GridOffset from SdrObject - bool getPossibleGridOffsetForSdrObject( + SAL_DLLPRIVATE bool getPossibleGridOffsetForSdrObject( basegfx::B2DVector& rOffset, const SdrObject* pObj, const SdrPageView* pPV) const; // Helper to get a possible GridOffset from Position - bool getPossibleGridOffsetForPosition( + SAL_DLLPRIVATE bool getPossibleGridOffsetForPosition( basegfx::B2DVector& rOffset, const basegfx::B2DPoint& rPoint, const SdrPageView* pPV) const; @@ -149,59 +149,59 @@ private: SVX_DLLPRIVATE void ImpSetPointsRects() const; void UndirtyMrkPnt() const; - void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const SfxViewShell* pOtherShell); - OString CreateInnerTextRectString() const; - bool dumpGluePointsToJSON(boost::property_tree::ptree& rTree); + SAL_DLLPRIVATE void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const SfxViewShell* pOtherShell); + SAL_DLLPRIVATE OString CreateInnerTextRectString() const; + SAL_DLLPRIVATE bool dumpGluePointsToJSON(boost::property_tree::ptree& rTree); protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - virtual void ModelHasChanged() override; // Is called by the PaintView - virtual void SetMarkHandles(SfxViewShell* pOtherShell); // maHdlList - fill (List of handles) - void modelHasChangedLOKit(); - void SetMarkRects(); // Rects at the PageViews + SAL_DLLPRIVATE virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; + SAL_DLLPRIVATE virtual void ModelHasChanged() override; // Is called by the PaintView + SAL_DLLPRIVATE virtual void SetMarkHandles(SfxViewShell* pOtherShell); // maHdlList - fill (List of handles) + SAL_DLLPRIVATE void modelHasChangedLOKit(); + SAL_DLLPRIVATE void SetMarkRects(); // Rects at the PageViews void CheckMarked(); // Scan MarkList after Del and Lock Layer ... - void AddDragModeHdl(SdrDragMode eMode); - virtual bool MouseMove(const MouseEvent& rMEvt, OutputDevice* pWin) override; + SAL_DLLPRIVATE void AddDragModeHdl(SdrDragMode eMode); + SAL_DLLPRIVATE virtual bool MouseMove(const MouseEvent& rMEvt, OutputDevice* pWin) override; virtual bool RequestHelp(const HelpEvent& rHEvt) override; // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); - void ForceRefToMarked(); + SAL_DLLPRIVATE void ForceRefToMarked(); void ForceUndirtyMrkPnt() const { if (mbMrkPntDirty) UndirtyMrkPnt(); } virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay) const; - SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const; - SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; - bool ImpIsFrameHandles() const; - OUString ImpGetDescriptionString(TranslateId pStrCacheID, ImpGetDescriptionOptions nOpt=ImpGetDescriptionOptions::NONE) const; + SAL_DLLPRIVATE SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const; + SAL_DLLPRIVATE SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList const * pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; + SAL_DLLPRIVATE bool ImpIsFrameHandles() const; + SAL_DLLPRIVATE OUString ImpGetDescriptionString(TranslateId pStrCacheID, ImpGetDescriptionOptions nOpt=ImpGetDescriptionOptions::NONE) const; // Generates a string including degrees symbol, from an angel specification in 1/100deg - bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); + SAL_DLLPRIVATE bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); virtual bool MarkPoints(const tools::Rectangle* pRect, bool bUnmark); bool MarkGluePoints(const tools::Rectangle* pRect, bool bUnmark); - void SetMoveOutside(bool bOn); + SAL_DLLPRIVATE void SetMoveOutside(bool bOn); bool MarkableObjectsExceed( int n ) const; protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrMarkView( + SAL_DLLPRIVATE SdrMarkView( SdrModel& rSdrModel, OutputDevice* pOut); - virtual ~SdrMarkView() override; + SAL_DLLPRIVATE virtual ~SdrMarkView() override; public: - virtual bool IsAction() const override; - virtual void MovAction(const Point& rPnt) override; - virtual void EndAction() override; - virtual void BckAction() override; - virtual void BrkAction() override; - virtual void TakeActionRect(tools::Rectangle& rRect) const override; + SAL_DLLPRIVATE virtual bool IsAction() const override; + SAL_DLLPRIVATE virtual void MovAction(const Point& rPnt) override; + SAL_DLLPRIVATE virtual void EndAction() override; + SAL_DLLPRIVATE virtual void BckAction() override; + SAL_DLLPRIVATE virtual void BrkAction() override; + SAL_DLLPRIVATE virtual void TakeActionRect(tools::Rectangle& rRect) const override; virtual void ClearPageView() override; - virtual void HideSdrPage() override; + SAL_DLLPRIVATE virtual void HideSdrPage() override; bool IsObjMarkable(SdrObject const * pObj, SdrPageView const * pPV) const; // Returns sal_True if objects, points or gluepoints are selected by drawing a frame @@ -210,9 +210,9 @@ public: // Marking objects by drawing of a selection frame void BegMarkObj(const Point& rPnt, bool bUnmark = false); - void MovMarkObj(const Point& rPnt); + SAL_DLLPRIVATE void MovMarkObj(const Point& rPnt); bool EndMarkObj(); - void BrkMarkObj(); + SAL_DLLPRIVATE void BrkMarkObj(); bool IsMarkObj() const { return (nullptr != mpMarkObjOverlay); } // DragModes: SDRDRAG_CREATE,SdrDragMode::Move,SdrDragMode::Resize,SdrDragMode::Rotate,SdrDragMode::Mirror,SdrDragMode::Shear,SdrDragMode::Crook @@ -247,7 +247,7 @@ public: /// whether all x coordinates in use are negated or not void SetNegativeX(bool bOn) { mbNegativeX = bOn; } bool IsNegativeX() const { return mbNegativeX; } - void SetInnerTextAreaForLOKit() const; + SAL_DLLPRIVATE void SetInnerTextAreaForLOKit() const; // migrate selections @@ -293,12 +293,12 @@ public: // SdrSearchOptions::DEEP SdrSearchOptions::ALSOONMASTER SdrSearchOptions::TESTMARKABLE SdrSearchOptions::TESTTEXTEDIT // SdrSearchOptions::MARKED // SdrSearchOptions::WHOLEPAGE - SdrObject* PickObj(const Point& rPnt, short nTol, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect=nullptr) const; + SAL_DLLPRIVATE SdrObject* PickObj(const Point& rPnt, short nTol, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect=nullptr) const; SdrObject* PickObj(const Point& rPnt, short nTol, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false); // Pick: Supported options for nOptions are SdrSearchOptions::PASS2BOUND - bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const; + SAL_DLLPRIVATE bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const; // Selects the most upper of the marked objects (O1) and scans from there // towards bottom direction, selecting the first non-marked object (O2). @@ -353,7 +353,7 @@ public: // and from there it searches the first non-marked point(P2). // In case of success the marking of // P1 is deleted, a mark is set at P2. - void MarkNextPoint(); + SAL_DLLPRIVATE void MarkNextPoint(); // Search for the number of the suitable handle. In case of empty search result, // SAL_MAX_SIZE is returned. @@ -366,15 +366,15 @@ public: bool BegMarkPoints(const Point& rPnt, bool bUnmark = false); void MovMarkPoints(const Point& rPnt); bool EndMarkPoints(); - void BrkMarkPoints(); + SAL_DLLPRIVATE void BrkMarkPoints(); bool IsMarkPoints() const { return (nullptr != mpMarkPointsOverlay); } // Select that additional handles are displayed permanently. void SetPlusHandlesAlwaysVisible(bool bOn); bool IsPlusHandlesAlwaysVisible() const { return mbPlusHdlAlways; } - bool HasMarkableGluePoints() const; - bool HasMarkedGluePoints() const; + SAL_DLLPRIVATE bool HasMarkableGluePoints() const; + SAL_DLLPRIVATE bool HasMarkedGluePoints() const; // A gluepoint is clearly identified by the SdrObject // (to which it belongs) as well as by a sal_uInt16 nId (as each SdrObject may consist of @@ -403,16 +403,16 @@ public: // and from there it searches the first non-marked point(P2). // In case of success the marking of // P1 is deleted, a mark is set at P2. - void MarkNextGluePoint(); + SAL_DLLPRIVATE void MarkNextGluePoint(); // Draw a selection frame for gluepoint marking. // This routine will just be started in case that HasMarkablePoints() returns sal_True. // The GlueEditMode sal_True is disregarded. // bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); bool BegMarkGluePoints(const Point& rPnt, bool bUnmark = false); - void MovMarkGluePoints(const Point& rPnt); - void EndMarkGluePoints(); - void BrkMarkGluePoints(); + SAL_DLLPRIVATE void MovMarkGluePoints(const Point& rPnt); + SAL_DLLPRIVATE void EndMarkGluePoints(); + SAL_DLLPRIVATE void BrkMarkGluePoints(); bool IsMarkGluePoints() const { return (nullptr != mpMarkGluePointsOverlay); } // bRestraintPaint=sal_False causes the handles not to be drawn immediately. @@ -423,15 +423,15 @@ public: const tools::Rectangle& GetMarkedObjRect() const; // SnapRects of Objects, without line width tools::Rectangle GetMarkedObjBoundRect() const; // incl. line width, overlapping rags, ... - const tools::Rectangle& GetMarkedPointsRect() const; // Enclosing rectangle of all marked points - const tools::Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked gluepoints + SAL_DLLPRIVATE const tools::Rectangle& GetMarkedPointsRect() const; // Enclosing rectangle of all marked points + SAL_DLLPRIVATE const tools::Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked gluepoints const tools::Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); } tools::Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); } // Will be always called, if the list of marked objects might be changed. // If you override this method, be sure that you call the // methods of the base class! - virtual void MarkListHasChanged(); + SAL_DLLPRIVATE virtual void MarkListHasChanged(); // Entering (Editing) of a maybe marked object group. If there are several // object groups marked, the most upper group is selected. After that @@ -443,11 +443,11 @@ public: // Rotation center point and start point of the axis of reflection, respectively const Point& GetRef1() const { return maRef1; } - void SetRef1(const Point& rPt); + SAL_DLLPRIVATE void SetRef1(const Point& rPt); // End point of the axis of reflection const Point& GetRef2() const { return maRef2; } - void SetRef2(const Point& rPt); + SAL_DLLPRIVATE void SetRef2(const Point& rPt); /// Get access to the view shell owning this draw view, if any. virtual SfxViewShell* GetSfxViewShell() const; }; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index c920ac1de4ff..ec2c94ab3f45 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -75,10 +75,10 @@ private: friend class SdrExchangeView; // Only for a ForceSwapIn() call. friend class SdrGraphicLink; - 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; - void ImpSetAttrToGrafInfo(); // Copy values from the pool + SAL_DLLPRIVATE void ImpSetAttrToGrafInfo(); // Copy values from the pool GraphicAttr aGrafInfo; OUString aFileName; // If it's a Link, the filename can be found in here @@ -103,19 +103,19 @@ private: css::uno::Reference<css::graphic::XGraphic> mpSignatureLineUnsignedGraphic; std::unique_ptr<css::drawing::BarCode> mpBarCode; - void ImpRegisterLink(); - void ImpDeregisterLink(); - void ImpSetLinkedGraphic( const Graphic& rGraphic ); - void onGraphicChanged(); - GDIMetaFile GetMetaFile(GraphicType &rGraphicType) const; + SAL_DLLPRIVATE void ImpRegisterLink(); + SAL_DLLPRIVATE void ImpDeregisterLink(); + SAL_DLLPRIVATE void ImpSetLinkedGraphic( const Graphic& rGraphic ); + SAL_DLLPRIVATE void onGraphicChanged(); + SAL_DLLPRIVATE GDIMetaFile GetMetaFile(GraphicType &rGraphicType) const; // protected destructor - virtual ~SdrGrafObj() override; + SAL_DLLPRIVATE virtual ~SdrGrafObj() override; public: SdrGrafObj(SdrModel& rSdrModel); // Copy constructor - SdrGrafObj(SdrModel& rSdrModel, SdrGrafObj const & rSource); + SAL_DLLPRIVATE SdrGrafObj(SdrModel& rSdrModel, SdrGrafObj const & rSource); SdrGrafObj( SdrModel& rSdrModel, const Graphic& rGrf); @@ -126,9 +126,9 @@ public: void SetGraphicObject( const GraphicObject& rGrfObj ); const GraphicObject& GetGraphicObject(bool bForceSwapIn = false) const; - const GraphicObject* GetReplacementGraphicObject() const; + SAL_DLLPRIVATE const GraphicObject* GetReplacementGraphicObject() const; - void NbcSetGraphic(const Graphic& rGrf); + SAL_DLLPRIVATE void NbcSetGraphic(const Graphic& rGrf); void SetGraphic(const Graphic& rGrf); const Graphic& GetGraphic() const; @@ -142,15 +142,15 @@ public: bool IsAnimated() const; bool IsEPS() const; - MapMode GetGrafPrefMapMode() const; - Size GetGrafPrefSize() const; + SAL_DLLPRIVATE MapMode GetGrafPrefMapMode() const; + SAL_DLLPRIVATE Size GetGrafPrefSize() const; - void SetGrafStreamURL( const OUString& rGraphicStreamURL ); - OUString const & GetGrafStreamURL() const; + SAL_DLLPRIVATE void SetGrafStreamURL( const OUString& rGraphicStreamURL ); + SAL_DLLPRIVATE OUString const & GetGrafStreamURL() const; Size getOriginalSize() const; private: - void ForceSwapIn() const; + SAL_DLLPRIVATE void ForceSwapIn() const; public: void SetGraphicLink(const OUString& rFileName); @@ -161,52 +161,52 @@ public: void StartAnimation(); - 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; - virtual sal_uInt32 GetHdlCount() const override; - virtual void AddToHdlList(SdrHdlList& rHdlList) const override; + SAL_DLLPRIVATE virtual sal_uInt32 GetHdlCount() const override; + SAL_DLLPRIVATE virtual void AddToHdlList(SdrHdlList& rHdlList) const override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; - 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 void NbcMirror(const Point& rRef1, const Point& rRef2) 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; bool HasGDIMetaFile() const; // react on model/page change - virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override; + SAL_DLLPRIVATE virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override; bool isEmbeddedVectorGraphicData() const; GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const; - 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 void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; bool IsMirrored() const { return bMirrored;} - void SetMirrored( bool _bMirrored ); + SAL_DLLPRIVATE void SetMirrored( bool _bMirrored ); virtual bool shouldKeepAspectRatio() const override { return true; } // Access to GrafAnimationAllowed flag - void SetGrafAnimationAllowed(bool bNew); + SAL_DLLPRIVATE void SetGrafAnimationAllowed(bool bNew); - css::uno::Reference< css::io::XInputStream > getInputStream() const; + SAL_DLLPRIVATE css::uno::Reference< css::io::XInputStream > getInputStream() const; // #i103116# FullDrag support - virtual rtl::Reference<SdrObject> getFullDragClone() const override; + SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> getFullDragClone() const override; // add handles for crop mode when selected - virtual void addCropHandles(SdrHdlList& rTarget) const override; + SAL_DLLPRIVATE virtual void addCropHandles(SdrHdlList& rTarget) const override; // Signature Line void setIsSignatureLine(bool bIsSignatureLine) { mbIsSignatureLine = bIsSignatureLine; } diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index b060e9a20483..4889fbb710a6 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -29,19 +29,19 @@ class SVXCORE_DLLPUBLIC SdrItemPool final : public SfxItemPool { public: SdrItemPool(SfxItemPool* pMaster = nullptr); - SdrItemPool(const SdrItemPool& rPool); + SAL_DLLPRIVATE SdrItemPool(const SdrItemPool& rPool); private: - virtual ~SdrItemPool() override; + SAL_DLLPRIVATE virtual ~SdrItemPool() override; public: - virtual rtl::Reference<SfxItemPool> Clone() const override; - virtual bool GetPresentation(const SfxPoolItem& rItem, + SAL_DLLPRIVATE virtual rtl::Reference<SfxItemPool> Clone() const override; + SAL_DLLPRIVATE virtual bool GetPresentation(const SfxPoolItem& rItem, MapUnit ePresentationMetric, OUString& rText, const IntlWrapper& rIntlWrapper) const override; - static OUString GetItemName(sal_uInt16 nWhich); + SAL_DLLPRIVATE static OUString GetItemName(sal_uInt16 nWhich); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
