From ddd35aeefaf1dd32af3c5c195dc24cb725d2c0ad Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Mon, 22 Apr 2024 15:12:24 +0200 Subject: [PATCH] Fix typo introduced by solving conflict. --- src/Mod/TechDraw/Gui/Command.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 76143df922..3c953b72b6 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -422,7 +422,7 @@ void CmdTechDrawView::activated(int iMsg) bool dontShowAgain = hGrp->GetBool("DontShowInsertFileMessage", false); if (!dontShowAgain) { QMessageBox msgBox; - msgBox.setText(msgBox.tr("If you want to insert a view from existing objects, please select them before evoking this tool. Without a selection, a file browser will open, to insert a SVG or image file.")); + msgBox.setText(msgBox.tr("If you want to insert a view from existing objects, please select them before invoking this tool. Without a selection, a file browser will open, to insert a SVG or image file.")); QCheckBox dontShowCheckBox(msgBox.tr("Do not show this message again"), &msgBox); msgBox.setCheckBox(&dontShowCheckBox); QPushButton* okButton = msgBox.addButton(QMessageBox::Ok); diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp index f81740d836..bc5c7e6ee9 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp @@ -123,9 +123,9 @@ void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj) //this code used to live in ViewProviderPage void ViewProviderPageExtension::dropObject(App::DocumentObject* obj) { - if (docObj->isDerivedFrom()) { + if (obj->isDerivedFrom()) { //DPGI can not be dropped onto the Page if it belongs to DPG - auto* dpgi = static_cast(docObj); + auto* dpgi = static_cast(obj); if (dpgi->getPGroup()) { return; }