diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 14:25:31 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-03-04 17:48:48 +0100 |
| commit | 5579810492ce0a171d3a180a7158e6ae317cbc64 (patch) | |
| tree | ddf5ac14cf8997ae8d3026d8eb1836b21914fd79 /vcl | |
| parent | 8713ae48fab49d066520dcf06746543e53783548 (diff) | |
Personas: Clear the BitmapEx first, so that we can switch off Personas.
[Also rename mpPersona*Bitmap -> maPersona*Bitmap, it is not a pointer.]
Conflicts:
vcl/source/app/settings.cxx
Change-Id: I93cc56b1f30c4fe966b8de87b766e820d9e2cefa
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/settings.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 67864832f012..09cda0361250 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -330,8 +330,8 @@ private: rtl::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 ace45ad3184e..c0325ceadf7c 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -212,8 +212,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const ImplStyleData::ImplStyleData() : maPersonaHeaderFooter(), - mpPersonaHeaderBitmap(), - mpPersonaFooterBitmap() + maPersonaHeaderBitmap(), + maPersonaFooterBitmap() { mnRefCount = 1; mnScrollBarSize = 16; @@ -311,8 +311,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : maGroupFont( rData.maGroupFont ), maWorkspaceGradient( rData.maWorkspaceGradient ), maPersonaHeaderFooter( rData.maPersonaHeaderFooter ), - mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ), - mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap ) + maPersonaHeaderBitmap( rData.maPersonaHeaderBitmap ), + maPersonaFooterBitmap( rData.maPersonaFooterBitmap ) { mnRefCount = 1; mnBorderSize = rData.mnBorderSize; @@ -730,14 +730,14 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, rtl::OUString& /*rHea 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; } // ----------------------------------------------------------------------- |