diff options
| author | Mark Wielaard <mark@klomp.org> | 2013-06-04 21:47:03 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-05 10:07:15 +0100 |
| commit | 9f1e4bc48597ba429001cd4d1707983bc5f426a0 (patch) | |
| tree | fa98adf49fd8325c8d970b7b39ecbca025737cf2 | |
| parent | cedb8f7995f0085bf1b851553f88b87118dfccda (diff) | |
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@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
(cherry picked from commit 2aacba2b2a43079c5000b6564b0d192cd208893c)
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 242ec24360c6..133ac0280399 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); } |