diff options
author | rocso <ross.johnson@homemail.com.au> | 2021-09-17 17:12:37 +1000 |
---|---|---|
committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2021-09-17 12:53:38 +0200 |
commit | 4f7560240d8a9273fd5ecbc76e7ac054b3a6e4ae (patch) | |
tree | e60ece962e82d692568e1ffbb3a54ee9a6d5865a /sd | |
parent | 74691a6f1b4aaadfed284ba9746032e438f7468b (diff) |
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>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/gluectrl.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuconbez.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuediglu.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drviews4.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 87ac30fb7cda..171d475c87af 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -47,7 +47,7 @@ const SdrEscapeDirection aEscDirArray[] = SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item ) /** - * Constructor for glue point escape direction Listbox + * Constructor for gluepoint escape direction Listbox */ GlueEscDirLB::GlueEscDirLB(vcl::Window* pParent, const Reference<XFrame>& rFrame) : InterimItemWindow(pParent, "modules/simpress/ui/gluebox.ui", "GlueBox") @@ -131,7 +131,7 @@ void GlueEscDirLB::Fill() } /** - * Constructor for glue point escape direction toolbox control + * Constructor for gluepoint escape direction toolbox control */ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx ) : diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 6ab9bf17c669..8c4219cf523c 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -167,7 +167,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT) { - // insert glue point + // insert gluepoint mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1()); } else diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 6a793db7a60c..5d9d614479e9 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -115,12 +115,12 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) } else if (eHit == SdrHitKind::MarkedObject && mpView->IsInsGluePointMode()) { - // insert glue points + // insert gluepoints mpView->BegInsGluePoint(aMDPos); } else if (eHit == SdrHitKind::MarkedObject && rMEvt.IsMod1()) { - // select glue points + // select gluepoints if (!rMEvt.IsShift()) mpView->UnmarkAllGluePoints(); @@ -133,7 +133,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) } else if (eHit == SdrHitKind::Gluepoint) { - // select glue points + // select gluepoints if (!rMEvt.IsShift()) mpView->UnmarkAllGluePoints(); @@ -175,7 +175,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) } else if (mpView->AreObjectsMarked()) { - // select glue point + // select gluepoint if (!rMEvt.IsShift()) mpView->UnmarkAllGluePoints(); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 37f3c15fe604..57d3bab073b6 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -468,14 +468,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) else if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT) { /****************************************************************** - * Insert glue point + * Insert gluepoint ******************************************************************/ mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1()); } else if (eHit == SdrHitKind::MarkedObject && rMEvt.IsMod1()) { /****************************************************************** - * Select glue point + * Select gluepoint ******************************************************************/ if (!rMEvt.IsShift()) mpView->UnmarkAllPoints(); @@ -494,7 +494,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) else if (eHit == SdrHitKind::Handle) { /****************************************************************** - * Select glue point + * Select gluepoint ******************************************************************/ if (!mpView->IsPointMarked(*aVEvt.mpHdl) || rMEvt.IsShift()) { @@ -567,7 +567,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) else if (mpView->AreObjectsMarked()) { /************************************************************** - * Select glue point + * Select gluepoint **************************************************************/ if (!rMEvt.IsShift()) mpView->UnmarkAllPoints(); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index bcfcc452713d..7e4932b29856 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -562,7 +562,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) sal_uInt16 nHitLog = static_cast<sal_uInt16>(GetActiveWindow()->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width()); sal_uInt16 nHelpLine; - // for glue points + // for gluepoints SdrObject* pObj = nullptr; sal_uInt16 nPickId = 0; // for field command @@ -577,7 +577,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) ShowSnapLineContextMenu(*pPV, nHelpLine, rCEvt.GetMousePosPixel()); return; } - // is glue point under cursor marked? + // is gluepoint under cursor marked? else if( mpDrawView->PickGluePoint( aMPos, pObj, nPickId, pPV ) && mpDrawView->IsGluePointMarked( pObj, nPickId ) ) { diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index d9a1acf7ae99..1a362508beab 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -501,7 +501,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } - // glue points + // gluepoints if( SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_EDITMODE ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_INSERT_POINT ) || SfxItemState::DEFAULT == rSet.GetItemState( SID_GLUE_PERCENT ) || |