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

[Markus Mohrhard]

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

New commits:
commit 923514a2dc7a0de237eba70f131f361efd33865a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Jul 14 17:03:04 2011 +0000

    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: Markus Mohrhard <markus.mohrhard at googlemail.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;