diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-01-04 21:07:57 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-08 16:12:46 +0100 |
| commit | cece3121947fe7fe01707f73a4aaaa6ddcde1761 (patch) | |
| tree | 644247d8fe0d289b8826dfcbf6ae5f69a37df2cc /vcl/source/app/settings.cxx | |
| parent | 26badd06cddc8e990b95eee4c0077b84e8200484 (diff) | |
Personas: Fix copy constructor + always reference the Application settings
...to avoid reading the bitmaps more than once.
Change-Id: I7577f5df96a5a28f1ac1f800867af5eee298663e
Signed-off-by: Cor Nouws <oolst@nouenoff.nl>
Signed-off-by: Olivier Hallot <olivier.hallot@documentfoundation.org>
Signed-off-by: Adolfo Jayme Barrientos <fitoschido@ubuntu.com>
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 4 |
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; |