You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/05/17 16:53:19 UTC
[openoffice] branch AOO41X updated: Merge pull request #177 from apache/Pilot-Pirx-glue
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 5876ddcaa7 Merge pull request #177 from apache/Pilot-Pirx-glue
5876ddcaa7 is described below
commit 5876ddcaa727000da06189fba3a2f4ebb924ef74
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Mon May 1 21:09:26 2023 +0200
Merge pull request #177 from apache/Pilot-Pirx-glue
Remove unused(?) code and its declaration
---
main/svx/inc/svx/svdglue.hxx | 1 -
main/svx/source/svdraw/svdglue.cxx | 39 --------------------------------------
2 files changed, 40 deletions(-)
diff --git a/main/svx/inc/svx/svdglue.hxx b/main/svx/inc/svx/svdglue.hxx
index dda2f52209..a2dedec747 100644
--- a/main/svx/inc/svx/svdglue.hxx
+++ b/main/svx/inc/svx/svdglue.hxx
@@ -95,7 +95,6 @@ public:
void SetHorzAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; }
void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
- void Draw(OutputDevice& rOut, const SdrObject* pObj) const;
FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
void Invalidate(Window& rWin, const SdrObject* pObj) const;
Point GetAbsolutePos(const SdrObject& rObj) const;
diff --git a/main/svx/source/svdraw/svdglue.cxx b/main/svx/source/svdraw/svdglue.cxx
index d2765a38af..bafa04468f 100644
--- a/main/svx/source/svdraw/svdglue.cxx
+++ b/main/svx/source/svdraw/svdglue.cxx
@@ -247,45 +247,6 @@ void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, FASTBOOL
if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-// Unused code?!
-void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const
-{
- Color aBackPenColor(COL_WHITE);
- Color aForePenColor(COL_LIGHTBLUE);
-
- bool bMapMerk=rOut.IsMapModeEnabled();
- Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
- aPt=rOut.LogicToPixel(aPt);
- rOut.EnableMapMode(sal_False);
- long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
-
- rOut.SetLineColor( aBackPenColor );
- rOut.DrawLine(Point(x-2,y-3),Point(x+3,y+2));
- rOut.DrawLine(Point(x-3,y-2),Point(x+2,y+3));
- rOut.DrawLine(Point(x-3,y+2),Point(x+2,y-3));
- rOut.DrawLine(Point(x-2,y+3),Point(x+3,y-2));
-
- if (bNoPercent)
- {
- switch (GetHorzAlign())
- {
- case SDRHORZALIGN_LEFT : rOut.DrawLine(Point(x-3,y-1),Point(x-3,y+1)); break;
- case SDRHORZALIGN_RIGHT : rOut.DrawLine(Point(x+3,y-1),Point(x+3,y+1)); break;
- }
-
- switch (GetVertAlign())
- {
- case SDRVERTALIGN_TOP : rOut.DrawLine(Point(x-1,y-3),Point(x+1,y-3)); break;
- case SDRVERTALIGN_BOTTOM: rOut.DrawLine(Point(x-1,y+3),Point(x+1,y+3)); break;
- }
- }
-
- rOut.SetLineColor( aForePenColor );
- rOut.DrawLine(Point(x-2,y-2),Point(x+2,y+2));
- rOut.DrawLine(Point(x-2,y+2),Point(x+2,y-2));
- rOut.EnableMapMode(bMapMerk);
-}
-
void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const
{
bool bMapMerk=rWin.IsMapModeEnabled();