summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/engine3d/obj3d.cxx6
-rw-r--r--svx/source/engine3d/scene3d.cxx6
-rw-r--r--svx/source/inc/svdobjplusdata.hxx2
-rw-r--r--svx/source/svdraw/svdcrtv.cxx2
-rw-r--r--svx/source/svdraw/svddrgmt.cxx2
-rw-r--r--svx/source/svdraw/svddrgv.cxx4
-rw-r--r--svx/source/svdraw/svdglue.cxx4
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx4
-rw-r--r--svx/source/svdraw/svdobj.cxx12
-rw-r--r--svx/source/svdraw/svdoedge.cxx12
-rw-r--r--svx/source/svdraw/svdview.cxx4
-rw-r--r--svx/source/unodraw/gluepts.cxx12
14 files changed, 37 insertions, 37 deletions
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 83fd8c031311..4fa24809ae30 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -430,8 +430,8 @@ void E3dObject::RestoreGeoData(const SdrObjGeoData& rGeo)
// is regardless of how the scene has been rotated up until now.
void E3dObject::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
- // So currently the glue points are defined relative to the scene aOutRect.
- // Before turning the glue points are defined relative to the page. They
+ // So currently the gluepoints are defined relative to the scene aOutRect.
+ // Before turning the gluepoints are defined relative to the page. They
// take no part in the rotation of the scene. To ensure this, there is the
// SetGlueReallyAbsolute(sal_True);
double fAngleInRad = toRadians(nAngle);
@@ -441,7 +441,7 @@ void E3dObject::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double
NbcSetTransform(aRotateZ * GetTransform());
SetBoundAndSnapRectsDirty(); // This forces a recalculation of all BoundRects
- NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the glue points (who still
+ NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the gluepoints (who still
// have coordinates relative to the
// original page)
SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index af91c52b1309..0a7253139330 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -609,8 +609,8 @@ void E3dScene::SetTransform(const basegfx::B3DHomMatrix& rMatrix)
void E3dScene::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
- // So currently the glue points are defined relative to the scene aOutRect.
- // Before turning the glue points are defined relative to the page. They
+ // So currently the gluepoints are defined relative to the scene aOutRect.
+ // Before turning the gluepoints are defined relative to the page. They
// take no part in the rotation of the scene. To ensure this, there is the
// SetGlueReallyAbsolute(sal_True);
@@ -628,7 +628,7 @@ void E3dScene::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double
NbcSetTransform(aRotation * GetTransform());
SetBoundAndSnapRectsDirty(); // This forces a recalculation of all BoundRects
- NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the glue points (who still
+ NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the gluepoints (who still
// have coordinates relative to the
// original page)
SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
diff --git a/svx/source/inc/svdobjplusdata.hxx b/svx/source/inc/svdobjplusdata.hxx
index c5d0596bab29..5e00a37c57c6 100644
--- a/svx/source/inc/svdobjplusdata.hxx
+++ b/svx/source/inc/svdobjplusdata.hxx
@@ -25,7 +25,7 @@ class SdrObjPlusData final
std::unique_ptr<SfxBroadcaster> pBroadcast; // broadcaster, if this object is referenced (bVirtObj=true). Also for connectors etc.
std::unique_ptr<SdrObjUserDataList> pUserDataList; // application specific data
- std::unique_ptr<SdrGluePointList> pGluePoints; // glue points for glueing object connectors
+ std::unique_ptr<SdrGluePointList> pGluePoints; // gluepoints for glueing object connectors
// #i68101#
// object name, title and description
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 67820ff1d732..9d6dc71b7d4f 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -81,7 +81,7 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
xTargetOverlay->add(*pNew);
maObjects.append(std::move(pNew));
- // glue points
+ // gluepoints
for(sal_uInt16 i(0); i < 4; i++)
{
SdrGluePoint aGluePoint(rObject.GetVertexGluePoint(i));
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 17376206f8a7..5917d1475c44 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1621,7 +1621,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
}
if (getSdrDragView().IsDraggingGluePoints())
- { // restrict glue points to the BoundRect of the Obj
+ { // restrict gluepoints to the BoundRect of the Obj
aPt1-=DragStat().GetStart();
const SdrMarkList& rML=GetMarkedObjectList();
const size_t nMarkCount=rML.GetMarkCount();
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index b5a8025a51d5..b6ac05cef7c1 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -619,7 +619,7 @@ void SdrDragView::BrkDragObj()
if (IsInsertGluePoint())
{
- mpInsPointUndo->Undo(); // delete inserted glue point again
+ mpInsPointUndo->Undo(); // delete inserted gluepoint again
delete mpInsPointUndo;
mpInsPointUndo=nullptr;
SetInsertGluePoint(false);
@@ -781,7 +781,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
}
else
{
- // no glue points possible for this object (e. g. Edge)
+ // no gluepoints possible for this object (e. g. Edge)
SetInsertGluePoint(false);
delete mpInsPointUndo;
mpInsPointUndo=nullptr;
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 59576ea01a69..7f25074cf425 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -290,8 +290,8 @@ SdrGluePointList& SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
return *this;
}
-// The ID's of the glue points always increase monotonously!
-// If an ID is taken already, the new glue point gets a new ID. ID 0 is reserved.
+// The ID's of the gluepoints always increase monotonously!
+// If an ID is taken already, the new gluepoint gets a new ID. ID 0 is reserved.
sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
{
SdrGluePoint aGP(rGP);
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 85d46f99a00e..ed0331c24a38 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1041,7 +1041,7 @@ bool SdrHdl::IsFocusHdl() const
case SdrHdlKind::Circle: // angle of circle segments, corner radius of rectangles
case SdrHdlKind::Ref1: // reference point 1, e. g. center of rotation
case SdrHdlKind::Ref2: // reference point 2, e. g. endpoint of reflection axis
- case SdrHdlKind::Glue: // glue point
+ case SdrHdlKind::Glue: // gluepoint
// for SJ and the CustomShapeHandles:
case SdrHdlKind::CustomShape1:
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 442719ad15e8..456ffd30f7fd 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1792,7 +1792,7 @@ void SdrMarkView::CheckMarked()
}
else
{
- if (!IsGluePointEditMode()) { // selected glue points only in GlueEditMode
+ if (!IsGluePointEditMode()) { // selected gluepoints only in GlueEditMode
SdrUShortCont& rPts = pM->GetMarkedGluePoints();
rPts.clear();
}
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 89ec0c5dc199..0c32aefcfd11 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -322,7 +322,7 @@ void SdrMarkView::UndirtyMrkPnt() const
SdrUShortCont& rPts = pM->GetMarkedGluePoints();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
if (pGPL!=nullptr) {
- // Remove invalid selected glue points, that is, all entries
+ // Remove invalid selected gluepoints, that is, all entries
// (IDs) that aren't contained in the GluePointList of the
// object
for(SdrUShortCont::const_iterator it = rPts.begin(); it != rPts.end(); )
@@ -337,7 +337,7 @@ void SdrMarkView::UndirtyMrkPnt() const
}
} else {
if (!rPts.empty()) {
- rPts.clear(); // object doesn't have any glue points (any more)
+ rPts.clear(); // object doesn't have any gluepoints (any more)
bChg=true;
}
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 27c2fb50b6c2..05f7712c0431 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1912,7 +1912,7 @@ void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
rGeo.bClosedObj =m_bClosedObj ;
rGeo.mnLayerID = mnLayerID;
- // user-defined glue points
+ // user-defined gluepoints
if (m_pPlusData!=nullptr && m_pPlusData->pGluePoints!=nullptr) {
if (rGeo.pGPL!=nullptr) {
*rGeo.pGPL=*m_pPlusData->pGluePoints;
@@ -1936,7 +1936,7 @@ void SdrObject::RestoreGeoData(const SdrObjGeoData& rGeo)
m_bClosedObj =rGeo.bClosedObj ;
mnLayerID = rGeo.mnLayerID;
- // user-defined glue points
+ // user-defined gluepoints
if (rGeo.pGPL!=nullptr) {
ImpForcePlusData();
if (m_pPlusData->pGluePoints!=nullptr) {
@@ -2303,7 +2303,7 @@ SdrGluePointList* SdrObject::ForceGluePointList()
void SdrObject::SetGlueReallyAbsolute(bool bOn)
{
- // First a const call to see whether there are any glue points.
+ // First a const call to see whether there are any gluepoints.
// Force const call!
if (GetGluePointList()!=nullptr) {
SdrGluePointList* pGPL=ForceGluePointList();
@@ -2313,7 +2313,7 @@ void SdrObject::SetGlueReallyAbsolute(bool bOn)
void SdrObject::NbcRotateGluePoints(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
- // First a const call to see whether there are any glue points.
+ // First a const call to see whether there are any gluepoints.
// Force const call!
if (GetGluePointList()!=nullptr) {
SdrGluePointList* pGPL=ForceGluePointList();
@@ -2323,7 +2323,7 @@ void SdrObject::NbcRotateGluePoints(const Point& rRef, Degree100 nAngle, double
void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2)
{
- // First a const call to see whether there are any glue points.
+ // First a const call to see whether there are any gluepoints.
// Force const call!
if (GetGluePointList()!=nullptr) {
SdrGluePointList* pGPL=ForceGluePointList();
@@ -2333,7 +2333,7 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2)
void SdrObject::NbcShearGluePoints(const Point& rRef, double tn, bool bVShear)
{
- // First a const call to see whether there are any glue points.
+ // First a const call to see whether there are any gluepoints.
// Force const call!
if (GetGluePointList()!=nullptr) {
SdrGluePointList* pGPL=ForceGluePointList();
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index c48d954c9ace..45e4329a54a8 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -460,12 +460,12 @@ SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const
const SdrGluePointList* SdrEdgeObj::GetGluePointList() const
{
- return nullptr; // no user defined glue points for connectors
+ return nullptr; // no user defined gluepoints for connectors
}
SdrGluePointList* SdrEdgeObj::ForceGluePointList()
{
- return nullptr; // no user defined glue points for connectors
+ return nullptr; // no user defined gluepoints for connectors
}
void SdrEdgeObj::ConnectToNode(bool bTail1, SdrObject* pObj)
@@ -2553,10 +2553,10 @@ void SdrEdgeObj::SetTailPoint( bool bTail, const Point& rPt )
SetChanged();
}
-/** this method is used by the api to set a glue point for a connection
+/** this method is used by the api to set a gluepoint for a connection
nId == -1 : The best default point is automatically chosen
0 <= nId <= 3 : One of the default points is chosen
- nId >= 4 : A user defined glue point is chosen
+ nId >= 4 : A user defined gluepoint is chosen
*/
void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ )
{
@@ -2570,7 +2570,7 @@ void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ )
{
nIndex -= 3; // the start api index is 0, whereas the implementation in svx starts from 1
- // for user defined glue points we have
+ // for user defined gluepoints we have
// to get the id for this index first
const SdrGluePointList* pList = rConn1.GetObject() ? rConn1.GetObject()->GetGluePointList() : nullptr;
if( pList == nullptr || SDRGLUEPOINT_NOTFOUND == pList->FindGluePoint(static_cast<sal_uInt16>(nIndex)) )
@@ -2588,7 +2588,7 @@ void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ )
ImpRecalcEdgeTrack();
}
-/** this method is used by the api to return a glue point id for a connection.
+/** this method is used by the api to return a gluepoint id for a connection.
See setGluePointId for possible return values */
sal_Int32 SdrEdgeObj::getGluePointIndex( bool bTail )
{
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f61c1cb7c852..37dc5a8bb1c8 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -336,7 +336,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
else if (bGluePointMode && PickGluePoint(aLocalLogicPosition,pObj,nGlueId,pPV))
{
- eHit=SdrHitKind::Gluepoint; // deselected glue point hit
+ eHit=SdrHitKind::Gluepoint; // deselected gluepoint hit
}
else if ((pHitObj = PickObj(aLocalLogicPosition,mnHitTolLog,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::MARKED,&pObj,&bHitPassDirect)))
{
@@ -805,7 +805,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (!MarkObj(aLogicPos, mnHitTolLog, rVEvt.mbAddMark))
{
// No object hit. Do the following:
- // 1. deselect any selected glue points
+ // 1. deselect any selected gluepoints
// 2. deselect any selected polygon points
// 3. deselect any selected objects
if (!rVEvt.mbAddMark) UnmarkAll();
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index fcc381a95451..0467bc46d1eb 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -209,7 +209,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement )
SdrGluePointList* pList = mpObject->ForceGluePointList();
if( pList )
{
- // second, insert the new glue point
+ // second, insert the new gluepoint
drawing::GluePoint2 aUnoGlue;
if( aElement >>= aUnoGlue )
@@ -279,7 +279,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c
{
if( (*pList)[i].GetId() == nId )
{
- // change the glue point
+ // change the gluepoint
SdrGluePoint& rTempPoint = (*pList)[i];
convert( aGluePoint, rTempPoint );
@@ -301,7 +301,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier )
{
struct drawing::GluePoint2 aGluePoint;
- if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default glue point?
+ if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default gluepoint?
{
SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( static_cast<sal_uInt16>(Identifier) );
aGluePoint.IsUserDefined = false;
@@ -449,8 +449,8 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount()
sal_Int32 nCount = 0;
if( mpObject.is() )
{
- // each node has a default of 4 glue points
- // and any number of user defined glue points
+ // each node has a default of 4 gluepoints
+ // and any number of user defined gluepoints
nCount += 4;
const SdrGluePointList* pList = mpObject->GetGluePointList();
@@ -467,7 +467,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
{
struct drawing::GluePoint2 aGluePoint;
- if( Index < 4 ) // default glue point?
+ if( Index < 4 ) // default gluepoint?
{
SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( static_cast<sal_uInt16>(Index) );
aGluePoint.IsUserDefined = false;
generated by cgit (git 2.34.1) at 2025-01-19 02:39:25 +0000