[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Mike Kaganski]

 sc/source/ui/view/prevwsh.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f4bb984750887422dea4d1f6c4ef183f57b0ae5
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Mar 12 10:07:06 2018 +0300

    tdf#103175: Initialize DrawLayer if required
    
    Change-Id: Ia99dd1e349e807d339dce0ead518a72a31e0fc02
    Reviewed-on: https://gerrit.libreoffice.org/51096
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit de53d4690d25b9f1bbc0def6c66ce5b45b2fdc96)
    Reviewed-on: https://gerrit.libreoffice.org/51111
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

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);
             }
         }
     }