Kaydet (Commit) 8dd5be05 authored tarafından Henry Castro's avatar Henry Castro Kaydeden (comit) Aron Budea

tdf#118540: LO6.1b2: DOCX crashes when properties...

are opened in print preview mode

Change-Id: Idc64d2b98dff157d28813dd3f90a276f8cacd11f
Reviewed-on: https://gerrit.libreoffice.org/57024
Tested-by: Jenkins
Reviewed-by: 's avatarHenry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/57059Reviewed-by: 's avatarAron Budea <aron.budea@collabora.com>
Tested-by: 's avatarAron Budea <aron.budea@collabora.com>
üst cf2ac116
...@@ -139,7 +139,9 @@ using namespace ::sfx2; ...@@ -139,7 +139,9 @@ using namespace ::sfx2;
// create DocInfo (virtual) // create DocInfo (virtual)
VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog(const SfxItemSet &rSet) VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog(const SfxItemSet &rSet)
{ {
VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create(&GetView()->GetViewFrame()->GetWindow(), rSet); SfxViewShell* pViewShell = GetView() ? GetView() : SfxViewShell::Current();
vcl::Window* pWindow = pViewShell ? &pViewShell->GetViewFrame()->GetWindow() : nullptr;
VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create(pWindow, rSet);
//only with statistics, when this document is being shown, not //only with statistics, when this document is being shown, not
//from within the Doc-Manager //from within the Doc-Manager
SwDocShell* pDocSh = static_cast<SwDocShell*>( SfxObjectShell::Current()); SwDocShell* pDocSh = static_cast<SwDocShell*>( SfxObjectShell::Current());
......
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