summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-01-04 21:07:57 +0100
committerJan Holesovsky <kendy@suse.cz>2013-01-04 21:07:57 +0100
commit4a4627eba410df933d004170d9f5638526acaed2 (patch)
tree93442f0d651425c5a33e5455e6cd7c5d414b4e35 /vcl/source/app
parent6112d7b94201f785a722d1d9d9f4da826452d5c5 (diff)
Personas: Fix copy constructor + always reference the Application settings
...to avoid reading the bitmaps more than once. Change-Id: I7577f5df96a5a28f1ac1f800867af5eee298663e
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/settings.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index abaff95fb5b7..17d523db7513 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -305,8 +305,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maDialogStyle( rData.maDialogStyle ),
maFrameStyle( rData.maFrameStyle ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
- mpPersonaHeaderBitmap( NULL ),
- mpPersonaFooterBitmap( NULL )
+ mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap? new BitmapEx( *rData.mpPersonaHeaderBitmap ): NULL ),
+ mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap? new BitmapEx( *rData.mpPersonaFooterBitmap ): NULL )
{
mnRefCount = 1;
mnBorderSize = rData.mnBorderSize;