diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
| commit | 5a7157d319477830426797532e02ac39d3b859f4 (patch) | |
| tree | 3773f5ce209bee14a5643e98672e0f3828c71434 /basctl | |
| parent | Releasing progress-linux version 4:24.2.0-3~progress7.99u1. (diff) | |
| download | libreoffice-5a7157d319477830426797532e02ac39d3b859f4.tar.xz libreoffice-5a7157d319477830426797532e02ac39d3b859f4.zip | |
Merging upstream version 4:24.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 9 | ||||
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 2 |
2 files changed, 8 insertions, 3 deletions
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(); |