From 5a7157d319477830426797532e02ac39d3b859f4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:29:03 +0200 Subject: Merging upstream version 4:24.2.1. Signed-off-by: Daniel Baumann --- basctl/source/basicide/baside2b.cxx | 9 ++++++--- basctl/source/dlged/dlged.cxx | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'basctl/source') diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 0cb1316117..33cbbc4787 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1252,9 +1252,12 @@ void EditorWindow::ChangeFontColor( Color aColor ) void EditorWindow::UpdateSyntaxHighlighting () { - const sal_uInt32 nCount = pEditEngine->GetParagraphCount(); - for (sal_uInt32 i = 0; i < nCount; ++i) - DoDelayedSyntaxHighlight(i); + if (pEditEngine) + { + const sal_uInt32 nCount = pEditEngine->GetParagraphCount(); + for (sal_uInt32 i = 0; i < nCount; ++i) + DoDelayedSyntaxHighlight(i); + } } void EditorWindow::ImplSetFont() diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 2eb099718b..a91a6511bd 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -620,6 +620,8 @@ void DlgEditor::CreateDefaultObject() // set default property values pDlgEdObj->SetDefaults(); + // set the form to which the new object belongs + pDlgEdObj->SetDlgEdForm(pDlgEdForm.get()); // insert object into drawing page SdrPageView* pPageView = pDlgEdView->GetSdrPageView(); -- cgit v1.2.3