[Libreoffice-commits] core.git: sfx2/source

[Mark Wielaard]

 sfx2/source/doc/objxtor.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2aacba2b2a43079c5000b6564b0d192cd208893c
Author: Mark Wielaard <mark at klomp.org>
Date:   Tue Jun 4 21:47:03 2013 +0200

    Initialize SfxObjectShell bIsInGenerateThumbnail to sal_False.
    
    paintfrm.cxx SwFlyFrm::Paint tries to optimize thumbnail generation
    by checking IsInGenerateAndStoreThumbnail(). But bIsInGenerateThumbnail
    is only set if SfxObjectShell::GenerateAndStoreThumbnail has already been
    called. Before that the value returned by IsInGenerateAndStoreThumbnail()
    would be random/uninitialized.
    
    Change-Id: I8bf44cd5664b2ba34e95127a922dcbdbb85ddccb
    Reviewed-on: https://gerrit.libreoffice.org/4155
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 242ec24..133ac02 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -294,6 +294,7 @@ SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags )
     ,   pStyleSheetPool(0)
     ,   eCreateMode( ( i_nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD )
     ,   bHasName( sal_False )
+    ,   bIsInGenerateThumbnail ( sal_False )
 {
     DBG_CTOR(SfxObjectShell, 0);
 
@@ -340,7 +341,8 @@ SfxObjectShell::SfxObjectShell
     pMedium(0),
     pStyleSheetPool(0),
     eCreateMode(eMode),
-    bHasName( sal_False )
+    bHasName( sal_False ),
+    bIsInGenerateThumbnail ( sal_False )
 {
     DBG_CTOR(SfxObjectShell, 0);
 }