summaryrefslogtreecommitdiffstats
path: root/basctl
diff options
context:
space:
mode:
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/baside2b.cxx9
-rw-r--r--basctl/source/dlged/dlged.cxx2
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();