summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2013-06-04 21:47:03 +0200
committerNoel Power <noel.power@suse.com>2013-06-05 08:39:40 +0000
commit2aacba2b2a43079c5000b6564b0d192cd208893c (patch)
treeee29c8c6c3bb305a4fa7067c56f9e6fdb1583530 /sfx2
parentf4e7b7758b99aaec99aa333dbd31580286e422d9 (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>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objxtor.cxx4
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);
}