summaryrefslogtreecommitdiff
path: root/vcl/source/window/menu.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-01-09 11:16:47 +0100
committerJan Holesovsky <kendy@suse.cz>2013-01-09 11:17:53 +0100
commit0721b5b83e34de1e2fcb320d6a7deae1ad109d61 (patch)
tree0c210865ffc8df7218f47b9bb6f87647c5f80401 /vcl/source/window/menu.cxx
parent0d91792ae34ca6531fbd6244d7717a2738f6a607 (diff)
Personas: As Michael suggested, use BitmapEx instead of BitmapEx*.
Change-Id: Ib1d84b37d452785d12502095c0eedaac4a25fb6b
Diffstat (limited to 'vcl/source/window/menu.cxx')
-rw-r--r--vcl/source/window/menu.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index d2d6adf89b20..dc70650f090a 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3874,10 +3874,10 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
pWin->SetPointFont( rStyleSettings.GetMenuFont() );
if( bMenuBar )
{
- const BitmapEx* pPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
- if ( pPersonaBitmap != NULL )
+ const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
+ if ( !rPersonaBitmap.IsEmpty() )
{
- Wallpaper aWallpaper( *pPersonaBitmap );
+ Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
pWin->SetBackground( aWallpaper );
pWin->SetPaintTransparent( sal_False );
@@ -5521,7 +5521,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aControlValue;
aControlValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase();
else
{
@@ -5557,7 +5557,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase( aRect );
else
{
@@ -5793,7 +5793,7 @@ void MenuBarWindow::Paint( const Rectangle& )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase();
else
{