[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 17 10:28:06 PST 2013
vcl/inc/vcl/settings.hxx | 4 ++--
vcl/source/app/settings.cxx | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 08fe57d99c7bbf17b21ec14ced945f68f0a89a52
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 17 14:25:31 2013 +0100
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 at suse.com>
Tested-by: Noel Power <noel.power at suse.com>
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 @@ 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 32366fa..4389453 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;
}
// -----------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list