summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-03-12 10:07:06 +0300
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2018-03-13 11:38:00 +0100
commit9f4bb984750887422dea4d1f6c4ef183f57b0ae5 (patch)
tree95ae5f24528500dc2effd55812045ce7126a5026
parentf79c3fbd8a9c4e89346e042cc31397bd6e277e09 (diff)
tdf#103175: Initialize DrawLayer if required
Change-Id: Ia99dd1e349e807d339dce0ead518a72a31e0fc02 Reviewed-on: https://gerrit.libreoffice.org/51096 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit de53d4690d25b9f1bbc0def6c66ce5b45b2fdc96) Reviewed-on: https://gerrit.libreoffice.org/51111 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org>
-rw-r--r--sc/source/ui/view/prevwsh.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 37097ed5474e..86c1e53ff9d0 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -940,7 +940,8 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue
}
// Common SdrModel processing
- GetDocument().GetDrawLayer()->WriteUserDataSequence(rSeq);
+ if (ScDrawLayer* pDrawLayer = GetDocument().GetDrawLayer())
+ pDrawLayer->WriteUserDataSequence(rSeq);
}
void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq)
@@ -967,7 +968,7 @@ void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyV
pPreview->SetPageNo(nTemp);
}
// Fallback to common SdrModel processing
- else GetDocument().GetDrawLayer()->ReadUserDataSequenceValue(pSeq);
+ else pDocShell->MakeDrawLayer()->ReadUserDataSequenceValue(pSeq);
}
}
}