[PATCH] Initialize SfxObjectShell bIsInGenerateThumbnail to sal_Fals...

Mark Wielaard (via Code Review) gerrit at gerrit.libreoffice.org
Tue Jun 4 14:07:05 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4155

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/4155/1

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
---
M sfx2/source/doc/objxtor.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



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 @@
     ,   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 @@
     pMedium(0),
     pStyleSheetPool(0),
     eCreateMode(eMode),
-    bHasName( sal_False )
+    bHasName( sal_False ),
+    bIsInGenerateThumbnail ( sal_False )
 {
     DBG_CTOR(SfxObjectShell, 0);
 }

-- 
To view, visit https://gerrit.libreoffice.org/4155
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bf44cd5664b2ba34e95127a922dcbdbb85ddccb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard <mark at klomp.org>



More information about the LibreOffice mailing list