tdf#143550 - use the term "gluepoints" consistently

Change-Id: Id10dc2ef13f54a148a800003cc4bd88ca1a0056f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122233
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

8 files changed, 39 insertions, 39 deletions

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 915c84762686..1b30c31fa1a0 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -206,7 +206,7 @@
 #define STR_EditImportMtf                                   NC_("STR_EditImportMtf", "Split %1")
 #define STR_ExchangePaste                                   NC_("STR_ExchangePaste", "Insert object(s)")
 #define STR_DragInsertPoint                                 NC_("STR_DragInsertPoint", "Insert point to %1")
-#define STR_DragInsertGluePoint                             NC_("STR_DragInsertGluePoint", "Insert glue point to %1")
+#define STR_DragInsertGluePoint                             NC_("STR_DragInsertGluePoint", "Insert gluepoint to %1")
 #define STR_DragMethMovHdl                                  NC_("STR_DragMethMovHdl", "Move reference-point")
 #define STR_DragMethObjOwn                                  NC_("STR_DragMethObjOwn", "Geometrically change %1")
 #define STR_DragMethMove                                    NC_("STR_DragMethMove", "Move %1")
@@ -234,14 +234,14 @@
 #define STR_ViewMarked                                      NC_("STR_ViewMarked", "%1 selected")
 #define STR_ViewMarkedPoint                                 NC_("STR_ViewMarkedPoint", "Point from %1")
 #define STR_ViewMarkedPoints                                NC_("STR_ViewMarkedPoints", "%2 points from %1")
-#define STR_ViewMarkedGluePoint                             NC_("STR_ViewMarkedGluePoint", "Glue point from %1")
-#define STR_ViewMarkedGluePoints                            NC_("STR_ViewMarkedGluePoints", "%2 glue points from %1")
+#define STR_ViewMarkedGluePoint                             NC_("STR_ViewMarkedGluePoint", "Gluepoint from %1")
+#define STR_ViewMarkedGluePoints                            NC_("STR_ViewMarkedGluePoints", "%2 gluepoints from %1")
 #define STR_ViewMarkObjs                                    NC_("STR_ViewMarkObjs", "Mark objects")
 #define STR_ViewMarkMoreObjs                                NC_("STR_ViewMarkMoreObjs", "Mark additional objects")
 #define STR_ViewMarkPoints                                  NC_("STR_ViewMarkPoints", "Mark points")
 #define STR_ViewMarkMorePoints                              NC_("STR_ViewMarkMorePoints", "Mark additional points")
-#define STR_ViewMarkGluePoints                              NC_("STR_ViewMarkGluePoints", "Mark glue points")
-#define STR_ViewMarkMoreGluePoints                          NC_("STR_ViewMarkMoreGluePoints", "Mark additional glue points")
+#define STR_ViewMarkGluePoints                              NC_("STR_ViewMarkGluePoints", "Mark gluepoints")
+#define STR_ViewMarkMoreGluePoints                          NC_("STR_ViewMarkMoreGluePoints", "Mark additional gluepoints")
 #define STR_ViewCreateObj                                   NC_("STR_ViewCreateObj", "Create %1")
 #define STR_UndoInsertObj                                   NC_("STR_UndoInsertObj", "Insert %1")
 #define STR_UndoCopyObj                                     NC_("STR_UndoCopyObj", "Copy %1")
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 6718e5f36b5d..5a1d8d16af48 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -80,10 +80,10 @@ class SVXCORE_DLLPUBLIC SdrDragStat final
     sal_Int32 GetPrevPos() const { return mvPnts.size()-(mvPnts.size()>1 ? 2 : 1); }
 
     // This is passed all the way through to ApplySpecialDrag of the Edge Object
-    // For LOK, we cannot really specify which glue point to select by default
-    // It selects the nearest glue points after DragEnd event.
-    // When multiple objects are on top of each other or somehow their glue points
-    // collide, the glue point is selected from the lowest order numbered object
+    // For LOK, we cannot really specify which gluepoint to select by default
+    // It selects the nearest gluepoints after DragEnd event.
+    // When multiple objects are on top of each other or somehow their gluepoints
+    // collide, the gluepoint is selected from the lowest order numbered object
     // We can pass the ord number information inside the draginfo and choose the correct shape
     struct {
         sal_Int32 objectOrdNum = -1;
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index bdd1046c097d..58f38d594c89 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -60,7 +60,7 @@ enum class SdrHitKind
     Object,          // Hit
     Handle,          // Marking handle
     HelpLine,        // Reference line
-    Gluepoint,       // Glue point
+    Gluepoint,       // Gluepoint
     TextEdit,        // Open OutlinerView was hit
     TextEditObj,     // Object for SdrBeginTextEdit (Textbereich)
     UrlField,        // Field in TextObj was hit (while it is currently not edited)
@@ -73,7 +73,7 @@ enum class SdrHitKind
 enum class SdrViewEditMode {
     Edit,           // Also known as arrow or pointer mode
     Create,         // Tool for object creation
-    GluePointEdit   // Glue point editing mode
+    GluePointEdit   // Gluepoint editing mode
 };
 
 /** options for ImpGetDescriptionString() */
@@ -199,7 +199,7 @@ public:
     virtual void HideSdrPage() override;
     bool IsObjMarkable(SdrObject const * pObj, SdrPageView const * pPV) const;
 
-    // Returns sal_True if objects, points or glue points are selected by drawing a frame
+    // Returns sal_True if objects, points or gluepoints are selected by drawing a frame
     // (as long as the frame is drawn).
     bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); }
 
@@ -369,13 +369,13 @@ public:
 
     // 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
-    // several glue points. Here at the View there is an additional
+    // several gluepoints. Here at the View there is an additional
     // SdrPageView, which should be defined correctly always.
     // Alternatively a gluepoint may be characterized by a SdrHdl.
     // In this case the SdrHdl instance consists of all required information.
-    // And in this case, the glue point are always is marked by enforcement
+    // And in this case, the gluepoint are always is marked by enforcement
     // (Handlers are just situated at marked gluepoints )
-    // Attention: With each change of the glue point status the handle list is re-calculated.
+    // Attention: With each change of the gluepoint status the handle list is re-calculated.
     // All previously saved SdrHdl* became invalid by this, the same with the point IDs!
     bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV) const;
     bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, bool bUnmark);
@@ -396,7 +396,7 @@ public:
     // P1 is deleted, a mark is set at P2.
     void MarkNextGluePoint();
 
-    // Draw a selection frame for glue point marking.
+    // 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);
@@ -415,7 +415,7 @@ 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 glue points
+    const tools::Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked gluepoints
     const tools::Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); }
     tools::Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); }
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 760f53f3a019..a5aa10aa7c66 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -650,7 +650,7 @@ public:
     // (see also documentation in SvdoEdge.hxx, SdrEdgeObj, as well as SvdGlue.hxx and SvdGlEV.hxx)
     //
     // There are nodes and edges. In theory an edge can also be a node, but this isn't implemented yet.
-    // A node has a number of glue points, onto which edges can glued to
+    // A node has a number of gluepoints, onto which edges can glued to
     // An edge can be either
     // - without any connection to any node,
     // - or connected on one end to a node, while the other end is not connected,
@@ -660,7 +660,7 @@ public:
     // This is also true for SetGluePoint()... on the node.
     // On the other hand, moving/resizing an edge breaks the connection.
 
-    // automatic glue points:
+    // automatic gluepoints:
     // a node object must provide four vertex and corner positions
     // usually 0: top, 1: right, 2: bottom, 3: left
     virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
@@ -669,7 +669,7 @@ public:
     // 0: top-left, 1: top-right, 2: bottom-right, 3: bottom-left
     virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
 
-    // list of all glue points, can be NULL
+    // list of all gluepoints, can be NULL
     virtual const SdrGluePointList* GetGluePointList() const;
 
     // after changing the GluePointList, one has to call the object's SendRepaintBroadcast!
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index ee0e64b08281..455d72f74014 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -362,7 +362,7 @@ public:
  // SdrView). SdrEdgeObj::Move() itself does not remove the
  // connection.
  //
- // Each node object can have connectors, so-called glue points. These
+ // Each node object can have connectors, so-called gluepoints. These
  // are the geometric points at which the connecting edge object ends
  // when the connection is established. By default, each object has no
  // connectors.  Nevertheless, one can dock an edge in certain view
@@ -380,32 +380,32 @@ public:
  // used from the offering of connectors of the object or/and of the
  // vertices. The user assigns this attribute by docking the node in
  // its center (see, e.g., Visio).
- // 09-06-1996: bUseBestConnector uses vertex glue points only.
+ // 09-06-1996: bUseBestConnector uses vertex gluepoints only.
  //
  // And here is some terminology:
  //   Connector : The connector object (edge object)
  //   Node      : Any object to which a connector can be glued to, e.g., a rectangle,
  //               etc.
- //   Glue point: The point at which the connector is glued to the node object.
+ //   Gluepoint: The point at which the connector is glued to the node object.
  //               There are:
- //                 Vertex glue points: Each node object presents these glue
+ //                 Vertex gluepoints: Each node object presents these glue
  //                     points inherently. Perhaps there is already the option
  //                     "automatically glue to object vertex" in Draw (default is
  //                     on).
- //                 Corner glue points: These glue points, too, are already
+ //                 Corner gluepoints: These gluepoints, too, are already
  //                     auto-enabled on objects. Similar to the ones above,
  //                     there may already be an option for them in Draw (default is
  //                     off).
- //                 In contrast to Visio, vertex glue points and corner glue
+ //                 In contrast to Visio, vertex gluepoints and corner glue
  //                     points are not displayed in the UI; they are simply there (if
  //                     the option is activated).
- //                 Custom glue points: Any number of them are present on each
+ //                 Custom gluepoints: Any number of them are present on each
  //                     node object. They can be made visible using the option
  //                     (always visible when editing). At the moment, however, they
  //                     are not yet fully implemented.
- //                 Automatic glue point selection: If the connector is docked
+ //                 Automatic gluepoint selection: If the connector is docked
  //                     to the node object so that the black frame encompasses the
  //                     entire object, then the connector tries to find the most
- //                     convenient of the 4 vertex glue points (and only of those).
+ //                     convenient of the 4 vertex gluepoints (and only of those).
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 15ae50d9222a..048c5f6b5cd8 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -157,10 +157,10 @@ protected:
     bool                        mbGridFront : 1;
     bool                        mbHlplVisible : 1;
     bool                        mbHlplFront : 1;
-    bool                        mbGlueVisible : 1;    // Persistent; show glue points
-    bool                        mbGlueVisible2 : 1;   // Also show glue points for GluePointEdit
-    bool                        mbGlueVisible3 : 1;   // Also show glue points for EdgeTool
-    bool                        mbGlueVisible4 : 1;   // Show glue points, if one edge is selected
+    bool                        mbGlueVisible : 1;    // Persistent; show gluepoints
+    bool                        mbGlueVisible2 : 1;   // Also show gluepoints for GluePointEdit
+    bool                        mbGlueVisible3 : 1;   // Also show gluepoints for EdgeTool
+    bool                        mbGlueVisible4 : 1;   // Show gluepoints, if one edge is selected
     bool                        mbSomeObjChgdFlag : 1;
     bool                        mbSwapAsynchron : 1;
     bool                        mbPrintPreview : 1;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 7043f0f75131..83c780b431ec 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -206,7 +206,7 @@ public:
     // The methods consider the particular context:
     // - simple drawing
     // - mode for editing points
-    // - mode for editing glue points
+    // - mode for editing gluepoints
     // - TextEdit
     // - ... to be continued
     void MarkAll();
@@ -216,7 +216,7 @@ public:
 
     virtual void DeleteMarked();
 
-    // Marking objects, traverse stations or glue points (depending on view-
+    // Marking objects, traverse stations or gluepoints (depending on view-
     // context) by enveloping the selection frame.
     //   bAddMark=TRUE: add to existing selection (->Shift)
     //   bUnmark=TRUE: remove objects from selection which are inside of
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 51bc59a25d1f..12cb9f8fd581 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -220,16 +220,16 @@ public:
                              const OUString& rDestShapeId,
                              sal_Int32 nDestGlueId );
 
-    /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting
-        the new glue point into the core. The saved mappings can be retrieved by getGluePointId() */
+    /** adds a mapping for a gluepoint identifier from an xml file to the identifier created after inserting
+        the new gluepoint into the core. The saved mappings can be retrieved by getGluePointId() */
     void addGluePointMapping( css::uno::Reference< css::drawing::XShape > const & xShape,
                               sal_Int32 nSourceId, sal_Int32 nDestinnationId );
 
     /** moves all current DestinationId's for rXShape by n */
     void moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n );
 
-    /** retrieves a mapping for a glue point identifier from the current xml file to the identifier created after
-        inserting the new glue point into the core. The mapping must be initialized first with addGluePointMapping() */
+    /** retrieves a mapping for a gluepoint identifier from the current xml file to the identifier created after
+        inserting the new gluepoint into the core. The mapping must be initialized first with addGluePointMapping() */
     sal_Int32 getGluePointId( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId );
 
     /** this method must be calling before the first shape is imported for the given page.