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

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 )

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;
 }
 
 // -----------------------------------------------------------------------