diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 14:25:31 +0100 |
---|---|---|
committer | Noel Power <noel.power@suse.com> | 2013-01-17 18:27:46 +0000 |
commit | 08fe57d99c7bbf17b21ec14ced945f68f0a89a52 (patch) | |
tree | 94ab751ca49b3913cf64770d32daba7a66660cb9 /vcl/source | |
parent | 4453ea0f988e861217a5cf94445e8ca8a36fa174 (diff) |
Personas: Clear the BitmapEx first, so that we can switch off Personas.
[Also rename mpPersona*Bitmap -> maPersona*Bitmap, it is not a pointer.]
Change-Id: I93cc56b1f30c4fe966b8de87b766e820d9e2cefa
Reviewed-on: https://gerrit.libreoffice.org/1741
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/app/settings.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 32366face1bc..438945316141 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -203,8 +203,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const ImplStyleData::ImplStyleData() : maPersonaHeaderFooter(), - mpPersonaHeaderBitmap(), - mpPersonaFooterBitmap() + maPersonaHeaderBitmap(), + maPersonaFooterBitmap() { mnRefCount = 1; mnScrollBarSize = 16; @@ -304,8 +304,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : maDialogStyle( rData.maDialogStyle ), maFrameStyle( rData.maFrameStyle ), maPersonaHeaderFooter( rData.maPersonaHeaderFooter ), - mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ), - mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap ) + maPersonaHeaderBitmap( rData.maPersonaHeaderBitmap ), + maPersonaFooterBitmap( rData.maPersonaFooterBitmap ) { mnRefCount = 1; mnBorderSize = rData.mnBorderSize; @@ -718,6 +718,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot return; rHeaderFooter = aOldValue; + rHeaderFooterBitmap = BitmapEx(); // now read the new values and setup bitmaps OUString aHeader, aFooter; @@ -761,14 +762,14 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot const BitmapEx StyleSettings::GetPersonaHeader() const { - setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->mpPersonaHeaderBitmap ); - return mpData->mpPersonaHeaderBitmap; + setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->maPersonaHeaderBitmap ); + return mpData->maPersonaHeaderBitmap; } const BitmapEx StyleSettings::GetPersonaFooter() const { - setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->mpPersonaFooterBitmap ); - return mpData->mpPersonaFooterBitmap; + setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->maPersonaFooterBitmap ); + return mpData->maPersonaFooterBitmap; } // ----------------------------------------------------------------------- |