diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2024-03-17 19:29:07 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-18 13:24:51 +0100 |
commit | c454dfe6affa295156bfa8dd272a770433649d9f (patch) | |
tree | 17d6c690c008b075b761991564030cd6684c9c2d | |
parent | 26f7313f724921a9c6086e6c2a93fbe1c48635fa (diff) |
reduce symbol visibility in svx
Change-Id: I6d98aab59799365c9a0052f259cd5c8208d995bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164961
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | bin/find-can-be-private-symbols.functions.results | 197 | ||||
-rw-r--r-- | include/svx/sdasitm.hxx | 14 | ||||
-rw-r--r-- | include/svx/svdcrtv.hxx | 28 | ||||
-rw-r--r-- | include/svx/svddrag.hxx | 12 | ||||
-rw-r--r-- | include/svx/svddrgmt.hxx | 24 | ||||
-rw-r--r-- | include/svx/svddrgv.hxx | 26 | ||||
-rw-r--r-- | include/svx/svdedtv.hxx | 80 | ||||
-rw-r--r-- | include/svx/svdetc.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdglev.hxx | 18 | ||||
-rw-r--r-- | include/svx/svdoedge.hxx | 148 | ||||
-rw-r--r-- | include/svx/svdoole2.hxx | 8 | ||||
-rw-r--r-- | include/svx/svdxcgv.hxx | 10 | ||||
-rw-r--r-- | include/svx/sxekitm.hxx | 8 | ||||
-rw-r--r-- | include/svx/sxenditm.hxx | 24 |
14 files changed, 201 insertions, 398 deletions
diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index b9ea662de3ff..31b9cef633aa 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -2988,200 +2988,18 @@ SdrCaptionEscIsRelItem::Clone(SfxItemPool*) const SdrCaptionEscRelItem::Clone(SfxItemPool*) const SdrCaptionFitLineLenItem::Clone(SfxItemPool*) const SdrCaptionLineLenItem::Clone(SfxItemPool*) const -SdrCreateView::BckCreateObj() -SdrCreateView::GetAttributes(SfxItemSet&, bool) const -SdrCreateView::HideConnectMarker() -SdrCreateView::HideCreateObj() -SdrCreateView::ImpBegCreateObj(SdrInventor, SdrObjKind, Point const&, OutputDevice*, short, tools::Rectangle const&, SdrObject*) -SdrCreateView::ImpClearConnectMarker() -SdrCreateView::IsEdgeTool() const -SdrCreateView::IsMeasureTool() const -SdrCreateView::IsTextTool() const -SdrCreateView::MouseMove(MouseEvent const&, OutputDevice*) -SdrCreateView::SdrCreateView(SdrModel&, OutputDevice*) -SdrCreateView::SetConnectMarker(SdrObjConnection const&) -SdrCreateView::ShowCreateObj() -SdrCreateView::~SdrCreateView() SdrCropHdl::CreateB2dIAObject() SdrCropHdl::GetBitmapForHandle(BitmapEx const&, int) -SdrCustomShapeGeometryItem::Clone(SfxItemPool*) const -SdrCustomShapeGeometryItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrCustomShapeGeometryItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrCustomShapeGeometryItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem() -SdrCustomShapeGeometryItem::SetPropSeq(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) -SdrCustomShapeGeometryItem::operator==(SfxPoolItem const&) const SdrDragEntryPolyPolygon::createPrimitive2DSequenceInCurrentState(SdrDragMethod&) SdrDragEntryPolyPolygon::~SdrDragEntryPolyPolygon() -SdrDragMethod::AddConnectorOverlays() -SdrDragMethod::DoAddConnectorOverlays() -SdrDragMethod::GetDragPV() const -SdrDragMethod::ImpGetDescriptionStr(TranslateId) const -SdrDragMethod::clearSdrDragEntries() -SdrDragMethod::createSdrDragEntries_GlueDrag() -SdrDragMethod::createSdrDragEntries_PointDrag() -SdrDragMethod::createSdrDragEntries_PolygonDrag() -SdrDragMethod::createSdrDragEntries_SolidDrag() -SdrDragMethod::destroyOverlayGeometry() -SdrDragMethod::getCurrentRange() const -SdrDragMethod::resetSdrDragEntries() SdrDragMove::BeginSdrDrag() SdrDragMove::EndSdrDrag(bool) SdrDragMove::ImpCheckSnap(Point const&) SdrDragObjOwn::EndSdrDrag(bool) SdrDragResize::EndSdrDrag(bool) -SdrDragStat::Clear() -SdrDragStat::NextPoint() -SdrDragStat::PrevPoint() SdrDragStat::Reset() -SdrDragStat::Reset(Point const&) -SdrDragStat::TakeCreateRect(tools::Rectangle&) const -SdrDragStat::~SdrDragStat() -SdrDragView::BckAction() -SdrDragView::BrkAction() -SdrDragView::EndAction() -SdrDragView::HideDragObj() -SdrDragView::IsAction() const -SdrDragView::IsInsGluePointPossible() const -SdrDragView::IsInsObjPointPossible() const -SdrDragView::IsOrthoDesired() const -SdrDragView::MovAction(Point const&) -SdrDragView::SdrDragView(SdrModel&, OutputDevice*) -SdrDragView::ShowDragObj() -SdrDragView::TakeActionRect(tools::Rectangle&) const -SdrDragView::~SdrDragView() SdrDropMarkerOverlay::ImplCreateOverlays(SdrView const&, basegfx::B2DPolyPolygon const&) -SdrEdgeKindItem::Clone(SfxItemPool*) const -SdrEdgeKindItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const -SdrEdgeKindItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrEdgeKindItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrEdgeNode1HorzDistItem::Clone(SfxItemPool*) const -SdrEdgeNode1HorzDistItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrEdgeNode1HorzDistItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrEdgeNode1VertDistItem::Clone(SfxItemPool*) const -SdrEdgeNode1VertDistItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrEdgeNode1VertDistItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrEdgeNode2HorzDistItem::Clone(SfxItemPool*) const -SdrEdgeNode2HorzDistItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrEdgeNode2HorzDistItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrEdgeNode2VertDistItem::Clone(SfxItemPool*) const -SdrEdgeNode2VertDistItem::PutValue(com::sun::star::uno::Any const&, unsigned char) -SdrEdgeNode2VertDistItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const -SdrEdgeObj::AddToHdlList(SdrHdlList&) const -SdrEdgeObj::BckCreate(SdrDragStat&) -SdrEdgeObj::BegCreate(SdrDragStat&) -SdrEdgeObj::BrkCreate(SdrDragStat&) -SdrEdgeObj::CheckNodeConnection(bool) const -SdrEdgeObj::CreateObjectSpecificProperties() -SdrEdgeObj::CreateObjectSpecificViewContact() -SdrEdgeObj::DisconnectFromNode(bool) -SdrEdgeObj::DoConvertToPolyObj(bool, bool) const -SdrEdgeObj::EndCreate(SdrDragStat&, SdrCreateCmd) -SdrEdgeObj::ForceGluePointList() -SdrEdgeObj::GetCornerGluePoint(unsigned short) const -SdrEdgeObj::GetCreatePointer() const -SdrEdgeObj::GetCurrentBoundRect() const -SdrEdgeObj::GetGluePointList() const -SdrEdgeObj::GetHdlCount() const -SdrEdgeObj::GetObjIdentifier() const -SdrEdgeObj::GetPoint(unsigned int) const -SdrEdgeObj::GetPointCount() const -SdrEdgeObj::GetSnapPoint(unsigned int) const -SdrEdgeObj::GetSnapPointCount() const -SdrEdgeObj::GetSnapRect() const -SdrEdgeObj::GetTailPoint(bool) const -SdrEdgeObj::GetVertexGluePoint(unsigned short) const -SdrEdgeObj::ImpCalcEdgeTrack(Point const&, long, tools::Rectangle const&, tools::Rectangle const&, Point const&, long, tools::Rectangle const&, tools::Rectangle const&, unsigned long*, SdrEdgeInfoRec*) const -SdrEdgeObj::ImpCalcEdgeTrack(XPolygon const&, SdrObjConnection&, SdrObjConnection&, SdrEdgeInfoRec*) const -SdrEdgeObj::ImpCalcEscAngle(SdrObject const*, Point const&) -SdrEdgeObj::ImpCalcObjToCenter(Point const&, long, tools::Rectangle const&, Point const&) -SdrEdgeObj::ImpDirtyEdgeTrack() -SdrEdgeObj::ImpFindConnector(Point const&, SdrPageView const&, SdrObjConnection&, SdrEdgeObj const*, OutputDevice*, SdrDragStat*) -SdrEdgeObj::ImpRecalcEdgeTrack() -SdrEdgeObj::ImpSetAttrToEdgeInfo() -SdrEdgeObj::ImpSetEdgeInfoToAttr() -SdrEdgeObj::ImpSetTailPoint(bool, Point const&) -SdrEdgeObj::ImpUndirtyEdgeTrack() -SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod const&, bool, bool, bool) const -SdrEdgeObj::IsPolyObj() const -SdrEdgeObj::MovCreate(SdrDragStat&) -SdrEdgeObj::NbcMirror(Point const&, Point const&) -SdrEdgeObj::NbcMove(Size const&) -SdrEdgeObj::NbcResize(Point const&, Fraction const&, Fraction const&) -SdrEdgeObj::NbcRotate(Point const&, o3tl::strong_int<int, FractionTag<100> >, double, double) -SdrEdgeObj::NbcSetAnchorPos(Point const&) -SdrEdgeObj::NbcSetPoint(Point const&, unsigned int) -SdrEdgeObj::NbcSetSnapRect(tools::Rectangle const&) -SdrEdgeObj::NbcShear(Point const&, o3tl::strong_int<int, FractionTag<100> >, double, bool) -SdrEdgeObj::NewGeoData() const -SdrEdgeObj::Notify(SfxBroadcaster&, SfxHint const&) -SdrEdgeObj::RecalcSnapRect() -SdrEdgeObj::Reformat() -SdrEdgeObj::RestoreGeoData(SdrObjGeoData const&) -SdrEdgeObj::SaveGeoData(SdrObjGeoData&) const -SdrEdgeObj::SdrEdgeObj(SdrModel&, SdrEdgeObj const&) -SdrEdgeObj::TRGetBaseGeometry(basegfx::B2DHomMatrix&, basegfx::B2DPolyPolygon&) const -SdrEdgeObj::TRSetBaseGeometry(basegfx::B2DHomMatrix const&, basegfx::B2DPolyPolygon const&) -SdrEdgeObj::TakeCreatePoly(SdrDragStat const&) const -SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec&) const -SdrEdgeObj::TakeObjNamePlural() const -SdrEdgeObj::TakeObjNameSingul() const -SdrEdgeObj::TakeUnrotatedSnapRect(tools::Rectangle&) const -SdrEdgeObj::TakeXorPoly() const -SdrEdgeObj::applySpecialDrag(SdrDragStat&) -SdrEdgeObj::beginSpecialDrag(SdrDragStat&) const -SdrEdgeObj::getEdgeTrack() const -SdrEdgeObj::getFullDragClone() const -SdrEdgeObj::getGluePointIndex(bool) -SdrEdgeObj::getSpecialDragComment(SdrDragStat const&) const -SdrEdgeObj::handlePageChange(SdrPage*, SdrPage*) -SdrEdgeObj::hasSpecialDrag() const -SdrEdgeObj::setGluePointIndex(bool, int) SdrEdgeObj::~SdrEdgeObj() -SdrEditView::AddUndoActions(std::vector<std::unique_ptr<SdrUndoAction, std::default_delete<SdrUndoAction> >, std::allocator<std::unique_ptr<SdrUndoAction, std::default_delete<SdrUndoAction> > > >) -SdrEditView::ConvertMarkedToPolyObj() -SdrEditView::CreateConnectorUndo(SdrObject const&) -SdrEditView::CrookMarkedObj(Point const&, Point const&, SdrCrookMode, bool, bool, bool) -SdrEditView::DeleteMarkedList(SdrMarkList const&) -SdrEditView::DistortMarkedObj(tools::Rectangle const&, XPolygon const&, bool, bool) -SdrEditView::GetAttributes(SfxItemSet&, bool) const -SdrEditView::GetMarkedObjRotate() const -SdrEditView::GetMarkedObjShear() const -SdrEditView::GetStyleSheet() const -SdrEditView::ImpBroadcastEdgesOfMarkedNodes() -SdrEditView::ImpCanConvertForCombine(SdrObject const*) -SdrEditView::ImpCanConvertForCombine1(SdrObject const*) -SdrEditView::ImpCanDismantle(SdrObject const*, bool) -SdrEditView::ImpCanDismantle(basegfx::B2DPolyPolygon const&, bool) -SdrEditView::ImpCheckToTopBtmPossible() -SdrEditView::ImpCombineToSinglePolygon(basegfx::B2DPolyPolygon const&) -SdrEditView::ImpConvertOneObj(SdrObject*, bool, bool) -SdrEditView::ImpConvertTo(bool, bool) -SdrEditView::ImpCopyAttributes(SdrObject const*, SdrObject*) const -SdrEditView::ImpCrookObj(SdrObject*, Point const&, Point const&, SdrCrookMode, bool, bool, bool, tools::Rectangle const&) -SdrEditView::ImpDelLayerCheck(SdrObjList const*, o3tl::strong_int<short, SdrLayerIDTag>) const -SdrEditView::ImpDelLayerDelObjs(SdrObjList*, o3tl::strong_int<short, SdrLayerIDTag>) -SdrEditView::ImpDismantleOneObject(SdrObject const*, SdrObjList&, unsigned long&, SdrPageView*, bool) -SdrEditView::ImpDistortObj(SdrObject*, tools::Rectangle const&, XPolygon const&, bool) -SdrEditView::ImpGetPolyPolygon(SdrObject const*) -SdrEditView::ImpGetPolyPolygon1(SdrObject const*) -SdrEditView::IsCropAllowed() const -SdrEditView::MarkListHasChanged() -SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet&) const -SdrEditView::MirrorMarkedObj(Point const&, Point const&, bool) -SdrEditView::ModelHasChanged() -SdrEditView::ResizeMultMarkedObj(Point const&, Fraction const&, Fraction const&, bool, bool) -SdrEditView::SdrEditView(SdrModel&, OutputDevice*) -SdrEditView::SetAttributes(SfxItemSet const&, bool) -SdrEditView::SetNotPersistAttrToMarked(SfxItemSet const&) -SdrEditView::SetStyleSheet(SfxStyleSheet*, bool) -SdrEditView::SetStyleSheetToMarked(SfxStyleSheet*, bool) -SdrEditView::ShearMarkedObj(Point const&, o3tl::strong_int<int, FractionTag<100> >, bool, bool) -SdrEditView::~SdrEditView() -SdrEmbedObjectLink::Closed() -SdrEmbedObjectLink::DataChanged(rtl::OUString const&, com::sun::star::uno::Any const&) -SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj*) -SdrEmbedObjectLink::~SdrEmbedObjectLink() SdrEscherImport::GetColorFromPalette(unsigned short, Color&) const SdrEscherImport::GetFontEnityAtom(unsigned int) const SdrEscherImport::GetSlideLayoutAtom() const @@ -3191,23 +3009,8 @@ SdrEscherImport::RecolorGraphic(SvStream&, unsigned int, Graphic&) SdrEscherImport::SdrEscherImport(PowerPointImportParam&, rtl::OUString const&) SdrEscherImport::SeekToShape(SvStream&, SvxMSDffClientData*, unsigned int) const SdrEscherImport::~SdrEscherImport() -SdrExchangeView::ImpGetPasteLayer(SdrObjList const*, o3tl::strong_int<short, SdrLayerIDTag>&) const -SdrExchangeView::ImpGetPasteObjList(Point&, SdrObjList*&) -SdrExchangeView::ImpLimitToWorkArea(Point&) const -SdrExchangeView::ImpPasteObject(SdrObject*, SdrObjList&, Point const&, Size const&, MapMode const&, SdrInsertFlags) -SdrExchangeView::SdrExchangeView(SdrModel&, OutputDevice*) SdrFormatter::GetStr(long) const SdrFormatter::GetUnitStr(MapUnit) -SdrGlobalData::SdrGlobalData() -SdrGlueEditView::DeleteMarkedGluePoints() -SdrGlueEditView::ImpCopyMarkedGluePoints() -SdrGlueEditView::ImpDoMarkedGluePoints(void (*)(SdrGluePoint&, SdrObject const*, void const*, void const*, void const*, void const*), bool, void const*, void const*, void const*, void const*) -SdrGlueEditView::ImpTransformMarkedGluePoints(void (*)(Point&, void const*, void const*, void const*, void const*), void const*, void const*, void const*, void const*) -SdrGlueEditView::MoveMarkedGluePoints(Size const&, bool) -SdrGlueEditView::ResizeMarkedGluePoints(Point const&, Fraction const&, Fraction const&, bool) -SdrGlueEditView::RotateMarkedGluePoints(Point const&, o3tl::strong_int<int, FractionTag<100> >, bool) -SdrGlueEditView::SdrGlueEditView(SdrModel&, OutputDevice*) -SdrGlueEditView::~SdrGlueEditView() SdrGluePoint::EscAngleToDir(o3tl::strong_int<int, FractionTag<100> >) SdrGluePoint::EscDirToAngle(SdrEscapeDirection) SdrGluePoint::GetAlignAngle() const diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index cb7230afe703..7821bbd2e0a8 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -54,13 +54,13 @@ private: mutable HashState m_aHashState = HashState::Unknown; mutable size_t m_aHash = 0xdeadbeef; - void SetPropSeq( const css::uno::Sequence< css::beans::PropertyValue >& rPropSeq ); + SAL_DLLPRIVATE void SetPropSeq( const css::uno::Sequence< css::beans::PropertyValue >& rPropSeq ); inline void UpdateHash() const; inline void InvalidateHash(); public: - SdrCustomShapeGeometryItem(); + SAL_DLLPRIVATE SdrCustomShapeGeometryItem(); SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& ); virtual ~SdrCustomShapeGeometryItem() override; @@ -69,16 +69,16 @@ private: SdrCustomShapeGeometryItem & operator =(SdrCustomShapeGeometryItem const &) = delete; // due to SfxPoolItem SdrCustomShapeGeometryItem & operator =(SdrCustomShapeGeometryItem &&) = delete; // due to SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const override; + SAL_DLLPRIVATE virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool GetPresentation(SfxItemPresentation ePresentation, + SAL_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override; - virtual SdrCustomShapeGeometryItem* Clone( SfxItemPool* pPool = nullptr ) const override; + SAL_DLLPRIVATE virtual SdrCustomShapeGeometryItem* 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; css::uno::Any* GetPropertyValueByName( const OUString& rPropName ); const css::uno::Any* GetPropertyValueByName( const OUString& rPropName ) const; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 12a291c23328..71cdf1d17134 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -55,23 +55,23 @@ protected: bool mb1stPointAsCenter : 1; bool mbUseIncompatiblePathCreateInterface : 1; - void ImpClearConnectMarker(); + SAL_DLLPRIVATE void ImpClearConnectMarker(); protected: - bool ImpBegCreateObj(SdrInventor nInvent, SdrObjKind nIdent, const Point& rPnt, OutputDevice* pOut, + SAL_DLLPRIVATE bool ImpBegCreateObj(SdrInventor nInvent, SdrObjKind nIdent, const Point& rPnt, OutputDevice* pOut, sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); - void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/); - void HideCreateObj(/*OutputDevice* pOut, bool bFull*/); + SAL_DLLPRIVATE void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/); + SAL_DLLPRIVATE void HideCreateObj(/*OutputDevice* pOut, bool bFull*/); bool CheckEdgeMode(); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrCreateView( + SAL_DLLPRIVATE SdrCreateView( SdrModel& rSdrModel, OutputDevice* pOut); - virtual ~SdrCreateView() override; + SAL_DLLPRIVATE virtual ~SdrCreateView() override; public: virtual bool IsAction() const override; @@ -81,7 +81,7 @@ public: virtual void BrkAction() override; virtual void TakeActionRect(tools::Rectangle& rRect) const override; - virtual bool MouseMove(const MouseEvent& rMEvt, OutputDevice* pWin) override; + SAL_DLLPRIVATE virtual bool MouseMove(const MouseEvent& rMEvt, OutputDevice* pWin) override; void SetMeasureLayer(const OUString& rName) { maMeasureLayer=rName; } @@ -92,13 +92,13 @@ public: void SetGluePointEditMode(bool bOn=true) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } // Determine whether a text tool is activated - bool IsTextTool() const; + SAL_DLLPRIVATE bool IsTextTool() const; // Determine whether an object connector tool activated - bool IsEdgeTool() const; + SAL_DLLPRIVATE bool IsEdgeTool() const; // Determine whether a measurement tool activated - bool IsMeasureTool() const; + SAL_DLLPRIVATE bool IsMeasureTool() const; void SetCurrentObj(SdrObjKind nIdent, SdrInventor nInvent=SdrInventor::Default); void TakeCurrentObj(SdrObjKind& nIdent, SdrInventor& nInvent) const @@ -114,7 +114,7 @@ public: bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); void MovCreateObj(const Point& rPnt); bool EndCreateObj(SdrCreateCmd eCmd); - void BckCreateObj(); // go back one polygon point + SAL_DLLPRIVATE void BckCreateObj(); // go back one polygon point void BrkCreateObj(); bool IsCreateObj() const { return mpCurrentCreate != nullptr; } SdrObject* GetCreateObj() const { return mpCurrentCreate.get(); } @@ -151,12 +151,12 @@ public: // Default = sal_False; bool IsUseIncompatiblePathCreateInterface() const { return mbUseIncompatiblePathCreateInterface; } void SetUseIncompatiblePathCreateInterface(bool bOn) { mbUseIncompatiblePathCreateInterface = bOn; } - void SetConnectMarker(const SdrObjConnection& rCon); - void HideConnectMarker(); + SAL_DLLPRIVATE void SetConnectMarker(const SdrObjConnection& rCon); + SAL_DLLPRIVATE void HideConnectMarker(); // Attributes of the object that is in the process of being created /* new interface src537 */ - void GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; + SAL_DLLPRIVATE void GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index fb01f9599b1b..633eeebc3bb2 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -75,7 +75,7 @@ class SVXCORE_DLLPUBLIC SdrDragStat final SdrDragMethod* m_pDragMethod; std::unique_ptr<SdrDragStatUserData> mpUserData; // Userdata - void Clear(); + SAL_DLLPRIVATE void Clear(); sal_Int32 GetPrevPos() const { return mvPnts.size()-(mvPnts.size()>1 ? 2 : 1); } @@ -91,7 +91,7 @@ class SVXCORE_DLLPUBLIC SdrDragStat final public: SdrDragStat() { Reset(); } - ~SdrDragStat(); + SAL_DLLPRIVATE ~SdrDragStat(); void Reset(); SdrView* GetView() const { return m_pView; } void SetView(SdrView* pV) { m_pView=pV; } @@ -150,10 +150,10 @@ public: bool IsMouseDown() const { return !m_bMouseIsUp; } void SetMouseDown(bool bDown) { m_bMouseIsUp=!bDown; } - void Reset(const Point& rPnt); + SAL_DLLPRIVATE void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(); - void PrevPoint(); + SAL_DLLPRIVATE void NextPoint(); + SAL_DLLPRIVATE void PrevPoint(); bool CheckMinMoved(const Point& rPnt); tools::Long GetDX() const { return GetNow().X()-GetPrev().X(); } tools::Long GetDY() const { return GetNow().Y()-GetPrev().Y(); } @@ -167,7 +167,7 @@ public: void SetActionRect(const tools::Rectangle& rR) { m_aActionRect=rR; } // Also considering 1stPointAsCenter - void TakeCreateRect(tools::Rectangle& rRect) const; + SAL_DLLPRIVATE void TakeCreateRect(tools::Rectangle& rRect) const; auto& GetGlueOptions() { return mGlueOptions; } }; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 19ee67b94ca7..5b01852ea363 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -124,7 +124,7 @@ private: protected: // access for derivated classes to maSdrDragEntries - void clearSdrDragEntries(); + SAL_DLLPRIVATE void clearSdrDragEntries(); void addSdrDragEntry(std::unique_ptr<SdrDragEntry> pNew); virtual void createSdrDragEntries(); virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal); @@ -150,13 +150,13 @@ protected: void setSolidDraggingActive(bool bNew) { mbSolidDraggingActive = bNew; } // internal helpers for creation of standard drag entries - void createSdrDragEntries_SolidDrag(); - void createSdrDragEntries_PolygonDrag(); - void createSdrDragEntries_PointDrag(); - void createSdrDragEntries_GlueDrag(); + SAL_DLLPRIVATE void createSdrDragEntries_SolidDrag(); + SAL_DLLPRIVATE void createSdrDragEntries_PolygonDrag(); + SAL_DLLPRIVATE void createSdrDragEntries_PointDrag(); + SAL_DLLPRIVATE void createSdrDragEntries_GlueDrag(); // old call forwarders to the SdrDragView - OUString ImpGetDescriptionStr(TranslateId pStrCacheID) const; + SAL_DLLPRIVATE OUString ImpGetDescriptionStr(TranslateId pStrCacheID) const; SdrHdl* GetDragHdl() const { return getSdrDragView().mpDragHdl; } SdrHdlKind GetDragHdlKind() const { return getSdrDragView().meDragHdl; } SdrDragStat& DragStat() { return getSdrDragView().maDragStat; } @@ -171,18 +171,18 @@ protected: Point GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().mpMarkedPV); } SdrSnap SnapPos(Point& rPt) const { return getSdrDragView().SnapPos(rPt,getSdrDragView().mpMarkedPV); } inline const tools::Rectangle& GetMarkedRect() const; - SdrPageView* GetDragPV() const; + SAL_DLLPRIVATE SdrPageView* GetDragPV() const; SdrObject* GetDragObj() const; bool IsDraggingPoints() const { return getSdrDragView().IsDraggingPoints(); } bool IsDraggingGluePoints() const { return getSdrDragView().IsDraggingGluePoints(); } - bool DoAddConnectorOverlays(); - drawinglayer::primitive2d::Primitive2DContainer AddConnectorOverlays(); + SAL_DLLPRIVATE bool DoAddConnectorOverlays(); + SAL_DLLPRIVATE drawinglayer::primitive2d::Primitive2DContainer AddConnectorOverlays(); public: - void resetSdrDragEntries(); - basegfx::B2DRange getCurrentRange() const; + SAL_DLLPRIVATE void resetSdrDragEntries(); + SAL_DLLPRIVATE basegfx::B2DRange getCurrentRange() const; // #i58950# also moved constructor implementation to cxx SdrDragMethod(SdrDragView& rNewView); @@ -204,7 +204,7 @@ public: virtual void CreateOverlayGeometry( sdr::overlay::OverlayManager& rOverlayManager, const sdr::contact::ObjectContact& rObjectContact); - void destroyOverlayGeometry(); + SAL_DLLPRIVATE void destroyOverlayGeometry(); virtual basegfx::B2DHomMatrix getCurrentTransformation() const; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 2fb7543e0970..a717cdbf3f0f 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -62,25 +62,25 @@ protected: protected: virtual void SetMarkHandles(SfxViewShell* pOtherShell) override; - void ShowDragObj(); - void HideDragObj(); + SAL_DLLPRIVATE void ShowDragObj(); + SAL_DLLPRIVATE void HideDragObj(); bool ImpBegInsObjPoint(bool bIdxZwang, const Point& rPnt, bool bNewObj, OutputDevice* pOut); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrDragView( + SAL_DLLPRIVATE SdrDragView( SdrModel& rSdrModel, OutputDevice* pOut); - virtual ~SdrDragView() override; + SAL_DLLPRIVATE virtual ~SdrDragView() 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; // special implementation for Writer: // TakeDragObjAnchorPos() returns the position at which an object @@ -120,7 +120,7 @@ public: bool IsInsertGluePoint() const { return mbInsGluePoint; } // Interactive insertion of a new point. nIdx=0 => in front of the first point - bool IsInsObjPointPossible() const; + SAL_DLLPRIVATE bool IsInsObjPointPossible() const; bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, rPnt, bNewObj, nullptr); } void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); } bool EndInsObjPoint(SdrCreateCmd eCmd); @@ -131,7 +131,7 @@ public: void SetInsObjPointMode(bool bOn) { mbInsObjPointMode = bOn; } bool IsInsObjPointMode() const { return mbInsObjPointMode; } - bool IsInsGluePointPossible() const; + SAL_DLLPRIVATE bool IsInsGluePointPossible() const; bool BegInsGluePoint(const Point& rPnt); bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && mbInsGluePoint; } @@ -186,7 +186,7 @@ public: void SetMarkedHitMovesAlways(bool bOn) { mbMarkedHitMovesAlways = bOn; } bool IsMarkedHitMovesAlways() const { return mbMarkedHitMovesAlways; } - bool IsOrthoDesired() const; + SAL_DLLPRIVATE bool IsOrthoDesired() const; // center as reference on Resize // Default=FALSE. diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 1cf9be6fdb9a..56fcfacaaaeb 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -117,44 +117,44 @@ private: SVX_DLLPRIVATE void ImpResetPossibilityFlags(); protected: - void ImpBroadcastEdgesOfMarkedNodes(); + SAL_DLLPRIVATE void ImpBroadcastEdgesOfMarkedNodes(); // convert the objects marked in poly resp. bezier - void ImpConvertTo(bool bPath, bool bLineToArea); + SAL_DLLPRIVATE void ImpConvertTo(bool bPath, bool bLineToArea); // converts an object, when positive it removes the old one from its List // and inserts the new one instead. including Undo. // Nor MarkEntry nor ModelChgBroadcast is created. - rtl::Reference<SdrObject> ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea); + SAL_DLLPRIVATE rtl::Reference<SdrObject> ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea); // set both flags: bToTopPossible and bToBtmPossible. // bToTopPossibleDirty and bToBtmPossibleDirty are reset at the same time - void ImpCheckToTopBtmPossible(); + SAL_DLLPRIVATE void ImpCheckToTopBtmPossible(); // for CombineMarkedObjects and DismantleMarkedObjects - void ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const; + SAL_DLLPRIVATE void ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const; // for CombineMarkedObjects - static bool ImpCanConvertForCombine1(const SdrObject* pObj); - static bool ImpCanConvertForCombine(const SdrObject* pObj); - static basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj); - static basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj); - static basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon); + SAL_DLLPRIVATE static bool ImpCanConvertForCombine1(const SdrObject* pObj); + SAL_DLLPRIVATE static bool ImpCanConvertForCombine(const SdrObject* pObj); + SAL_DLLPRIVATE static basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj); + SAL_DLLPRIVATE static basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj); + SAL_DLLPRIVATE static basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon); // for DismantleMarkedObjects - static bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines); - static bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines); - void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, size_t& rPos, SdrPageView* pPV, bool bMakeLines); - static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, + SAL_DLLPRIVATE static bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines); + SAL_DLLPRIVATE static bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines); + SAL_DLLPRIVATE void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, size_t& rPos, SdrPageView* pPV, bool bMakeLines); + SAL_DLLPRIVATE static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bRotate, const tools::Rectangle& rMarkRect); - static void ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); - bool ImpDelLayerCheck(SdrObjList const * pOL, SdrLayerID nDelID) const; - void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); + SAL_DLLPRIVATE static void ImpDistortObj(SdrObject* pO, const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion); + SAL_DLLPRIVATE bool ImpDelLayerCheck(SdrObjList const * pOL, SdrLayerID nDelID) const; + SAL_DLLPRIVATE void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); // Removes all objects of the MarkList from their ObjLists including Undo. // The entries in rMark remain. // @return a list of objects that must be deleted after the outermost EndUndo - std::vector<rtl::Reference<SdrObject>> DeleteMarkedList(SdrMarkList const& rMark); // DeleteMarked -> DeleteMarkedList + SAL_DLLPRIVATE std::vector<rtl::Reference<SdrObject>> DeleteMarkedList(SdrMarkList const& rMark); // DeleteMarked -> DeleteMarkedList // Check possibilities of all marked objects virtual void CheckPossibilities(); @@ -162,11 +162,11 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrEditView( + SAL_DLLPRIVATE SdrEditView( SdrModel& rSdrModel, OutputDevice* pOut); - virtual ~SdrEditView() override; + SAL_DLLPRIVATE virtual ~SdrEditView() override; public: // each call of an undo-capable method from its view, generates an undo action. @@ -213,8 +213,8 @@ public: void EndTextEditAllViews() const; void EndTextEditCurrentView(bool bDontDeleteReally = false); - std::vector< std::unique_ptr<SdrUndoAction> > CreateConnectorUndo( const SdrObject& rO ); - void AddUndoActions( std::vector< std::unique_ptr<SdrUndoAction> > ); + SAL_DLLPRIVATE std::vector< std::unique_ptr<SdrUndoAction> > CreateConnectorUndo( const SdrObject& rO ); + SAL_DLLPRIVATE void AddUndoActions( std::vector< std::unique_ptr<SdrUndoAction> > ); // Layermanagement with Undo. void InsertNewLayer(const OUString& rName, sal_uInt16 nPos); @@ -235,16 +235,16 @@ public: void SetMarkedObjRect(const tools::Rectangle& rRect); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); - void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bWdh, const bool bHgt); - Degree100 GetMarkedObjRotate() const; + SAL_DLLPRIVATE void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bWdh, const bool bHgt); + SAL_DLLPRIVATE Degree100 GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, Degree100 nAngle, bool bCopy=false); - void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); + SAL_DLLPRIVATE void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); void MirrorMarkedObjHorizontal(); void MirrorMarkedObjVertical(); - Degree100 GetMarkedObjShear() const; - void ShearMarkedObj(const Point& rRef, Degree100 nAngle, bool bVShear=false, bool bCopy=false); - void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bCopy=false); - void DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); + SAL_DLLPRIVATE Degree100 GetMarkedObjShear() const; + SAL_DLLPRIVATE void ShearMarkedObj(const Point& rRef, Degree100 nAngle, bool bVShear=false, bool bCopy=false); + SAL_DLLPRIVATE void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bCopy=false); + SAL_DLLPRIVATE void DistortMarkedObj(const tools::Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion, bool bCopy=false); // copy marked objects and mark them instead of the old ones void CopyMarkedObj(); @@ -264,7 +264,7 @@ public: bool IsShearAllowed() const; bool IsEdgeRadiusAllowed() const; bool IsCrookAllowed(bool bNoContortion=false) const; - bool IsCropAllowed() const; + SAL_DLLPRIVATE bool IsCropAllowed() const; bool IsDistortAllowed(bool bNoContortion=false) const; // Consolidate the text from multiple, selected TextObjects, @@ -319,8 +319,8 @@ public: // EndUndo(); void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark=true); - void SetNotPersistAttrToMarked(const SfxItemSet& rAttr); - void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const; + SAL_DLLPRIVATE void SetNotPersistAttrToMarked(const SfxItemSet& rAttr); + SAL_DLLPRIVATE void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const; void MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const; SfxItemSet GetAttrFromMarked(bool bOnlyHardAttr) const; void SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll); @@ -341,14 +341,14 @@ public: SfxStyleSheet* GetStyleSheetFromMarked() const; // at the moment without undo :( - void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); + SAL_DLLPRIVATE void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); /* new interface src537 */ - void GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; + SAL_DLLPRIVATE void GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; - void SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; - void SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); + SAL_DLLPRIVATE void SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SAL_DLLPRIVATE SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; + SAL_DLLPRIVATE void SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); // Group all marked objects to a single group. // Subsequently mark the new group . If the group spawns multiple @@ -374,7 +374,7 @@ public: bool IsConvertToPolyObjPossible() const { ForcePossibilities(); return m_bCanConvToPoly; } bool IsConvertToContourPossible() const { ForcePossibilities(); return m_bCanConvToContour; } void ConvertMarkedToPathObj(bool bLineToArea); - void ConvertMarkedToPolyObj(); + SAL_DLLPRIVATE void ConvertMarkedToPolyObj(); // Align all marked objects vertically. Normally the SnapRect of an object is used. void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert); @@ -432,8 +432,8 @@ public: bool IsImportMtfPossible() const { ForcePossibilities(); return m_bImportMtfPossible; } // override SdrMarkView, for internal use - virtual void MarkListHasChanged() override; - virtual void ModelHasChanged() override; + SAL_DLLPRIVATE virtual void MarkListHasChanged() override; + SAL_DLLPRIVATE virtual void ModelHasChanged() override; }; #endif // INCLUDED_SVX_SVDEDTV_HXX diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 69cdb6ea663c..f0c28ae2f8fc 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -185,7 +185,7 @@ public: aUserMakeObjHdl; OLEObjCache aOLEObjCache; - SdrGlobalData(); + SAL_DLLPRIVATE SdrGlobalData(); const SvtSysLocale& GetSysLocale() { return maSysLocale; } // follows always locale settings const LocaleDataWrapper& GetLocaleData(); // follows always SysLocale diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index 5a7d3a2ebd38..1356033d25d0 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -32,19 +32,19 @@ class SdrGluePoint; class SVXCORE_DLLPUBLIC SdrGlueEditView : public SdrPolyEditView { // copy marked GluePoints and mark instead of the old ones - void ImpCopyMarkedGluePoints(); + SAL_DLLPRIVATE SAL_DLLPRIVATE void ImpCopyMarkedGluePoints(); typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*); typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*); - void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr); - void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr); + SAL_DLLPRIVATE void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr); + SAL_DLLPRIVATE SAL_DLLPRIVATE void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2=nullptr, const void* p3=nullptr, const void* p4=nullptr); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrGlueEditView( + SAL_DLLPRIVATE SdrGlueEditView( SdrModel& rSdrModel, OutputDevice* pOut); - virtual ~SdrGlueEditView() override; + SAL_DLLPRIVATE virtual ~SdrGlueEditView() override; public: // the parameter nThisEsc is used to hand over the direction, @@ -73,11 +73,11 @@ public: void SetMarkedGluePointsAlign(bool bVert, SdrAlign nAlign); // delete all marked GluePoints - void DeleteMarkedGluePoints(); + SAL_DLLPRIVATE void DeleteMarkedGluePoints(); - void MoveMarkedGluePoints (const Size& rSiz, bool bCopy); - void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy); - void RotateMarkedGluePoints(const Point& rRef, Degree100 nAngle, bool bCopy); + SAL_DLLPRIVATE void MoveMarkedGluePoints (const Size& rSiz, bool bCopy); + SAL_DLLPRIVATE void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy); + SAL_DLLPRIVATE void RotateMarkedGluePoints(const Point& rRef, Degree100 nAngle, bool bCopy); }; #endif // INCLUDED_SVX_SVDGLEV_HXX diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 9c987e259ea3..3b0cf917a100 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -141,8 +141,8 @@ private: friend class SdrCreateView; friend class ImpEdgeHdl; - 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; SdrObjConnection m_aCon1; // Connection status of the beginning of the line SdrObjConnection m_aCon2; // Connection status of the end of the line @@ -175,128 +175,128 @@ public: bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; } private: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; + SAL_DLLPRIVATE virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; - static XPolygon ImpCalcObjToCenter(const Point& rStPt, tools::Long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); - void ImpRecalcEdgeTrack(); // recalculation of the connection track - XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; - XPolygon ImpCalcEdgeTrack(const Point& rPt1, tools::Long nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1, + SAL_DLLPRIVATE static XPolygon ImpCalcObjToCenter(const Point& rStPt, tools::Long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); + SAL_DLLPRIVATE void ImpRecalcEdgeTrack(); // recalculation of the connection track + SAL_DLLPRIVATE XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; + SAL_DLLPRIVATE XPolygon ImpCalcEdgeTrack(const Point& rPt1, tools::Long nAngle1, const tools::Rectangle& rBoundRect1, const tools::Rectangle& rBewareRect1, const Point& rPt2, tools::Long nAngle2, const tools::Rectangle& rBoundRect2, const tools::Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; - static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr, SdrDragStat* pDragStat = nullptr); - static SdrEscapeDirection ImpCalcEscAngle(SdrObject const * pObj, const Point& aPt2); - void ImpSetTailPoint(bool bTail1, const Point& rPt); - void ImpUndirtyEdgeTrack(); // potential recalculation of the connection track - void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time - void ImpSetAttrToEdgeInfo(); // copying values from the pool to aEdgeInfo - void ImpSetEdgeInfoToAttr(); // copying values from the aEdgeInfo to the pool + SAL_DLLPRIVATE static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=nullptr, SdrDragStat* pDragStat = nullptr); + SAL_DLLPRIVATE static SdrEscapeDirection ImpCalcEscAngle(SdrObject const * pObj, const Point& aPt2); + SAL_DLLPRIVATE void ImpSetTailPoint(bool bTail1, const Point& rPt); + SAL_DLLPRIVATE void ImpUndirtyEdgeTrack(); // potential recalculation of the connection track + SAL_DLLPRIVATE void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time + SAL_DLLPRIVATE void ImpSetAttrToEdgeInfo(); // copying values from the pool to aEdgeInfo + SAL_DLLPRIVATE void ImpSetEdgeInfoToAttr(); // copying values from the aEdgeInfo to the pool // protected destructor - virtual ~SdrEdgeObj() override; + SAL_DLLPRIVATE virtual ~SdrEdgeObj() override; public: SdrEdgeObj(SdrModel& rSdrModel); // Copy constructor - SdrEdgeObj(SdrModel& rSdrModel, SdrEdgeObj const & rSource); + SAL_DLLPRIVATE SdrEdgeObj(SdrModel& rSdrModel, SdrEdgeObj const & rSource); // react on model/page change - virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override; + SAL_DLLPRIVATE virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override; SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &m_aCon1 : &m_aCon2); } - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; - virtual SdrObjKind GetObjIdentifier() const override; - virtual const tools::Rectangle& GetCurrentBoundRect() const override; - virtual const tools::Rectangle& GetSnapRect() const override; - virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; - virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override; - virtual const SdrGluePointList* GetGluePointList() const override; - virtual SdrGluePointList* ForceGluePointList() override; + SAL_DLLPRIVATE virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; + SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override; + SAL_DLLPRIVATE virtual const tools::Rectangle& GetCurrentBoundRect() const override; + SAL_DLLPRIVATE virtual const tools::Rectangle& GetSnapRect() const override; + SAL_DLLPRIVATE virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override; + SAL_DLLPRIVATE virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const override; + SAL_DLLPRIVATE virtual const SdrGluePointList* GetGluePointList() const override; + SAL_DLLPRIVATE virtual SdrGluePointList* ForceGluePointList() override; // * for all of the below: bTail1=true: beginning of the line, // otherwise end of the line // * pObj=NULL: disconnect connector void SetEdgeTrackDirty() { m_bEdgeTrackDirty=true; } void ConnectToNode(bool bTail1, SdrObject* pObj) override; - void DisconnectFromNode(bool bTail1) override; + SAL_DLLPRIVATE void DisconnectFromNode(bool bTail1) override; SdrObject* GetConnectedNode(bool bTail1) const override; const SdrObjConnection& GetConnection(bool bTail1) const { return *(bTail1 ? &m_aCon1 : &m_aCon2); } - bool CheckNodeConnection(bool bTail1) const; + SAL_DLLPRIVATE bool CheckNodeConnection(bool bTail1) const; - virtual void RecalcSnapRect() override; - virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; + SAL_DLLPRIVATE virtual void RecalcSnapRect() override; + SAL_DLLPRIVATE virtual void TakeUnrotatedSnapRect(tools::Rectangle& rRect) const override; 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; void SetEdgeTrackPath( const basegfx::B2DPolyPolygon& rPoly ); basegfx::B2DPolyPolygon GetEdgeTrackPath() const; - 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; + 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; // FullDrag support - virtual rtl::Reference<SdrObject> getFullDragClone() const override; + SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> getFullDragClone() const override; - virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; - virtual void NbcMove(const Size& aSize) override; - virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) override; + SAL_DLLPRIVATE virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override; + SAL_DLLPRIVATE virtual void NbcMove(const Size& aSize) override; + SAL_DLLPRIVATE virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) override; // #i54102# added rotate, mirror and shear support - 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; + 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; // #102344# Added missing implementation - virtual void NbcSetAnchorPos(const Point& rPnt) 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 rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const 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; - virtual Point GetPoint(sal_uInt32 i) const override; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) 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 NbcSetAnchorPos(const Point& rPnt) 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 rtl::Reference<SdrObject> DoConvertToPolyObj(bool bBezier, bool bAddText) const 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; + SAL_DLLPRIVATE virtual Point GetPoint(sal_uInt32 i) const override; + SAL_DLLPRIVATE virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) 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; /** updates edges that are connected to the edges of this object as if the connected objects send a repaint broadcast #103122# */ - void Reformat(); + SAL_DLLPRIVATE void Reformat(); // helper methods for the StarOffice api - Point GetTailPoint( bool bTail ) const; + SAL_DLLPRIVATE Point GetTailPoint( bool bTail ) const; void SetTailPoint( bool bTail, const Point& rPt ); - void setGluePointIndex( bool bTail, sal_Int32 nId = -1 ); - sal_Int32 getGluePointIndex( bool bTail ); + SAL_DLLPRIVATE void setGluePointIndex( bool bTail, sal_Int32 nId = -1 ); + SAL_DLLPRIVATE sal_Int32 getGluePointIndex( bool bTail ); - 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; // for geometry access - ::basegfx::B2DPolygon getEdgeTrack() const; + SAL_DLLPRIVATE ::basegfx::B2DPolygon getEdgeTrack() const; // helper method for SdrDragMethod::AddConnectorOverlays. Adds an overlay polygon for // this connector to rResult. - basegfx::B2DPolygon ImplAddConnectorOverlay(const SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const; + SAL_DLLPRIVATE basegfx::B2DPolygon ImplAddConnectorOverlay(const SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const; }; // The following item parameters of the SdrItemPool are used to diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 444c12348226..43ea27fd3752 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -190,11 +190,11 @@ class SVXCORE_DLLPUBLIC SdrEmbedObjectLink final : public sfx2::SvBaseLink SdrOle2Obj* pObj; public: - explicit SdrEmbedObjectLink(SdrOle2Obj* pObj); - virtual ~SdrEmbedObjectLink() override; + SAL_DLLPRIVATE explicit SdrEmbedObjectLink(SdrOle2Obj* pObj); + SAL_DLLPRIVATE virtual ~SdrEmbedObjectLink() override; - virtual void Closed() override; - virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( + SAL_DLLPRIVATE virtual void Closed() override; + SAL_DLLPRIVATE virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const css::uno::Any & rValue ) override; void Connect() { GetRealObject(); } diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index 2d7f04455913..02dbf0634a75 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -30,16 +30,16 @@ class SVXCORE_DLLPUBLIC SdrExchangeView : public SdrObjEditView protected: - void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst); - void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, SdrInsertFlags nOptions); - bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; + SAL_DLLPRIVATE void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst); + SAL_DLLPRIVATE void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, SdrInsertFlags nOptions); + SAL_DLLPRIVATE bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; // Returns true if rPt has changed - bool ImpLimitToWorkArea(Point& rPt) const; + SAL_DLLPRIVATE bool ImpLimitToWorkArea(Point& rPt) const; protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView - SdrExchangeView( + SAL_DLLPRIVATE SdrExchangeView( SdrModel& rSdrModel, OutputDevice* pOut); diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index fd54d38bbbe2..4d6b05bf9d6b 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -31,12 +31,12 @@ enum class SdrEdgeKind class SVXCORE_DLLPUBLIC SdrEdgeKindItem final : public SfxEnumItem<SdrEdgeKind> { public: SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} - virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; + SAL_DLLPRIVATE 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; - 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 virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; #endif diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index de7accd9b2b6..ed72c9224428 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -26,33 +26,33 @@ class SVXCORE_DLLPUBLIC SdrEdgeNode1HorzDistItem final : public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} - 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; - virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const 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; + SAL_DLLPRIVATE virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVXCORE_DLLPUBLIC SdrEdgeNode1VertDistItem final : public SdrMetricItem { public: SdrEdgeNode1VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} - 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; - virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const 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; + SAL_DLLPRIVATE virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVXCORE_DLLPUBLIC SdrEdgeNode2HorzDistItem final : public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} - 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; - virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const 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; + SAL_DLLPRIVATE virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVXCORE_DLLPUBLIC SdrEdgeNode2VertDistItem final : public SdrMetricItem { public: SdrEdgeNode2VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} - 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; - virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const 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; + SAL_DLLPRIVATE virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SdrEdgeNode1GlueDistItem final : public SdrMetricItem { |