Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1741

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1741/1

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
---
M vcl/inc/vcl/settings.hxx
M vcl/source/app/settings.cxx
2 files changed, 11 insertions(+), 10 deletions(-)



diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 8e49b2c..9d99ad0 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -351,8 +351,8 @@
 
     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 32366fa..4389453 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -203,8 +203,8 @@
 
 ImplStyleData::ImplStyleData() :
     maPersonaHeaderFooter(),
-    mpPersonaHeaderBitmap(),
-    mpPersonaFooterBitmap()
+    maPersonaHeaderBitmap(),
+    maPersonaFooterBitmap()
 {
     mnRefCount                  = 1;
     mnScrollBarSize             = 16;
@@ -304,8 +304,8 @@
     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 @@
         return;
 
     rHeaderFooter = aOldValue;
+    rHeaderFooterBitmap = BitmapEx();
 
     // now read the new values and setup bitmaps
     OUString aHeader, aFooter;
@@ -761,14 +762,14 @@
 
 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;
 }
 
 // -----------------------------------------------------------------------

-- 
To view, visit https://gerrit.libreoffice.org/1741
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93cc56b1f30c4fe966b8de87b766e820d9e2cefa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky <kendy@suse.cz>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.