Kaydet (Commit) 86abd3ec authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Katarina Behrens

Check pDoc is not null

Change-Id: I9a85e6ee0b1d2df36999cbd968d84bf60e62f0a9
Reviewed-on: https://gerrit.libreoffice.org/64758
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst b2583abd
......@@ -157,19 +157,22 @@ SlideBackground::SlideBackground(
::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( SfxObjectShell::Current() );
SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType());
if (pOptions)
if (pDoc)
{
FieldUnit eMetric = static_cast<FieldUnit>(pOptions->GetMetric());
if (IsInch(eMetric))
SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType());
if (pOptions)
{
for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
FieldUnit eMetric = static_cast<FieldUnit>(pOptions->GetMetric());
if (IsInch(eMetric))
{
for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
}
else
{
for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i)
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
}
else
{
for (size_t i = 0; i < SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i)
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment