summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/inc/svx/svdmrkv.hxx10
-rw-r--r--svx/source/svdraw/svdmrkv.cxx72
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx40
-rw-r--r--unusedcode.easy2
4 files changed, 0 insertions, 124 deletions
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index cadae4688324..dd4166b5804a 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -190,7 +190,6 @@ protected:
sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark);
void SetMoveOutside(sal_Bool bOn);
- sal_Bool IsMoveOutside() const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -249,14 +248,7 @@ public:
void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
- // Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt
- // (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special).
- SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const;
sal_Bool HasMarkableObj() const;
- sal_uIntPtr GetMarkableObjCount() const;
- //HMHvoid ShowMarkHdl(bool bNoRefHdl = false);
- //HMHvoid HideMarkHdl(bool bNoRefHdl = false);
- //HMHBOOL IsMarkHdlShown() const { return bHdlShown; }
////////////////////////////////////////////////////////////////////////////////////////////////////
// migrate selections
@@ -417,9 +409,7 @@ public:
sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
sal_Bool HasMarkableGluePoints() const;
- sal_uIntPtr GetMarkableGluePointCount() const;
sal_Bool HasMarkedGluePoints() const;
- sal_uIntPtr GetMarkedGluePointCount() const;
// Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject
// (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 0469d7015105..2213da979764 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -558,50 +558,6 @@ sal_Bool SdrMarkView::HasMarkableObj() const
return nCount!=0;
}
-sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
-{
- sal_uIntPtr nCount=0;
- SdrPageView* pPV = GetSdrPageView();
-
- if(pPV)
- {
- SdrObjList* pOL=pPV->GetObjList();
- sal_uIntPtr nObjAnz=pOL->GetObjCount();
- for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
- SdrObject* pObj=pOL->GetObj(nObjNum);
- if (IsObjMarkable(pObj,pPV)) {
- nCount++;
- }
- }
- }
- return nCount;
-}
-
-//HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/)
-//HMH{
-//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
-//HMH if (!bHdlShown) {
-//HMH bRefHdlShownOnly=sal_False;
-//HMH bHdlShown=sal_True;
-//HMH }
-//HMH}
-
-//HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/)
-//HMH{
-//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
-//HMH ImpShowMarkHdl(bNoRefHdl);
-//HMH}
-
-
-//HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/)
-//HMH{
-//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
-//HMH if (bHdlShown) {
-//HMH bRefHdlShownOnly=bNoRefHdl;
-//HMH bHdlShown=sal_False;
-//HMH }
-//HMH}
-
void SdrMarkView::hideMarkHandles()
{
if(!mbMarkHandlesHidden)
@@ -1926,29 +1882,6 @@ sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPag
return bFnd;
}
-SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const
-{
- nTol=ImpGetHitTolLogic(nTol,NULL);
- SdrHitKind eRet=SDRHIT_NONE;
- Point aPt(rPnt);
- SdrObject* pObj=NULL;
- SdrPageView* pPV=NULL;
- if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
- Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz
- Rectangle aBR(pObj->GetCurrentBoundRect());
- if (aRct1.IsInside(aBR.TopLeft())) eRet=SDRHIT_BOUNDTL;
- else if (aRct1.IsInside(aBR.TopCenter())) eRet=SDRHIT_BOUNDTC;
- else if (aRct1.IsInside(aBR.TopRight())) eRet=SDRHIT_BOUNDTR;
- else if (aRct1.IsInside(aBR.LeftCenter())) eRet=SDRHIT_BOUNDCL;
- else if (aRct1.IsInside(aBR.RightCenter())) eRet=SDRHIT_BOUNDCR;
- else if (aRct1.IsInside(aBR.BottomLeft())) eRet=SDRHIT_BOUNDBL;
- else if (aRct1.IsInside(aBR.BottomCenter())) eRet=SDRHIT_BOUNDBC;
- else if (aRct1.IsInside(aBR.BottomRight())) eRet=SDRHIT_BOUNDBR;
- else eRet=SDRHIT_OBJECT;
- }
- return eRet;
-}
-
void SdrMarkView::UnmarkAllObj(SdrPageView* pPV)
{
if (GetMarkedObjectCount()!=0) {
@@ -2138,11 +2071,6 @@ void SdrMarkView::SetMoveOutside(sal_Bool bOn)
aHdl.SetMoveOutside(bOn);
}
-sal_Bool SdrMarkView::IsMoveOutside() const
-{
- return aHdl.IsMoveOutside();
-}
-
void SdrMarkView::SetDesignMode( sal_Bool _bOn )
{
if ( bDesignMode != _bOn )
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 3ac2df22674c..c295b5c62758 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -471,33 +471,6 @@ sal_Bool SdrMarkView::HasMarkableGluePoints() const
return bRet;
}
-sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const
-{
- sal_uIntPtr nAnz=0;
- if (IsGluePointEditMode()) {
- ForceUndirtyMrkPnt();
- sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
- for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
- const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
- const SdrObject* pObj=pM->GetMarkedSdrObj();
- const SdrGluePointList* pGPL=pObj->GetGluePointList();
-
- // #i38892#
- if(pGPL && pGPL->GetCount())
- {
- for(sal_uInt16 a(0); a < pGPL->GetCount(); a++)
- {
- if((*pGPL)[a].IsUserDefined())
- {
- nAnz++;
- }
- }
- }
- }
- }
- return nAnz;
-}
-
sal_Bool SdrMarkView::HasMarkedGluePoints() const
{
ForceUndirtyMrkPnt();
@@ -511,19 +484,6 @@ sal_Bool SdrMarkView::HasMarkedGluePoints() const
return bRet;
}
-sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const
-{
- ForceUndirtyMrkPnt();
- sal_uIntPtr nAnz=0;
- sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
- for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
- const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
- const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- if (pPts!=NULL) nAnz+=pPts->GetCount();
- }
- return nAnz;
-}
-
sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
{
if (!IsGluePointEditMode() && !bUnmark) return sal_False;
diff --git a/unusedcode.easy b/unusedcode.easy
index 0f9eeece87a9..4e0463f998f6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -665,8 +665,6 @@ SdrHint::SetRect(Rectangle const&)
SdrLayerAdmin::MoveLayer(SdrLayer*, unsigned short)
SdrMark::GetObjList() const
SdrMark::GetPage() const
-SdrMarkView::IsMoveOutside() const
-SdrMarkView::PickSomething(Point const&, short) const
SdrMarkView::UnmarkGluePoint(SdrHdl const&)
SdrMediaObj::getGraphic() const
SdrMediaObj::hasPreferredSize() const
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 22:36:00 +0000