commit e722d9a406da01514bb256def98624da3eafee0c
author Mike Kaganski <mike.kaganski@collabora.com> Mon Mar 12 10:07:06 2018 +0300
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue Mar 13 11:38:06 2018 +0100
tree b61501ca29adc47f77ef3653d8fe866dcfe7d408
parent 3686a3fc1b2eaee53b1ab32f33455b2b37aa8c6e

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/51110
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

sc/source/ui/view/prevwsh.cxx

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 8fe89c5..281d10f 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);
            }
        }
    }