diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 14:25:31 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 17:11:11 +0100 |
| commit | dbf3077f72881ec44e0bb33c9ffbf6363c381862 (patch) | |
| tree | 2ba069fc7d0871fffc77c601644380429b7adccf /vcl | |
| parent | aab4b03f605ff4273aa41bbbc6fdbf3ffae8daee (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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/settings.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 8e49b2cc9fdd..9d99ad051c1f 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -351,8 +351,8 @@ private: OUString maPersonaHeaderFooter; ///< Cache the settings to detect changes. - BitmapEx mpPersonaHeaderBitmap; ///< Cache the header bitmap. - BitmapEx mpPersonaFooterBitmap; ///< Cache the footer bitmap. + BitmapEx maPersonaHeaderBitmap; ///< Cache the header bitmap. + BitmapEx maPersonaFooterBitmap; ///< Cache the footer bitmap. }; #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 ) diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 9991b9008f93..caedc9d35197 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; } // ----------------------------------------------------------------------- |