[Libreoffice-commits] .: Branch 'libreoffice-3-4-2' - sc/source

[Noel Power]

 sc/source/ui/view/output.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8f7e08c1349a3e3737de36110aac22dd7494d816
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Jul 14 13:03:04 2011 -0400

    fdo#36688: Make sure the drawing layer is initialized before use.
    
    From how it's used, it appears to be the convention to call
    InitDrawLayer() before getting the drawing layer pointer, to ensure
    that the drawing layer is present when needed.
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index f37a2c8..ab698e4 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1634,6 +1634,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
 
 drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( )
 {
+    pDoc->InitDrawLayer(pDoc->GetDocumentShell());
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
     if (!pDrawLayer)
         return NULL;