From 0721b5b83e34de1e2fcb320d6a7deae1ad109d61 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 9 Jan 2013 11:16:47 +0100 Subject: Personas: As Michael suggested, use BitmapEx instead of BitmapEx*. Change-Id: Ib1d84b37d452785d12502095c0eedaac4a25fb6b --- vcl/source/window/dockingarea.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vcl/source/window/dockingarea.cxx') diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 8269c5e94985..e20265ded966 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -50,10 +50,10 @@ DockingAreaWindow::ImplData::~ImplData() static void ImplInitBackground( DockingAreaWindow* pThis ) { - const BitmapEx* pPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader(); - if ( pPersonaBitmap != NULL && pThis->GetAlign() == WINDOWALIGN_TOP ) + const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader(); + if ( !rPersonaBitmap.IsEmpty() && pThis->GetAlign() == WINDOWALIGN_TOP ) { - Wallpaper aWallpaper( *pPersonaBitmap ); + Wallpaper aWallpaper( rPersonaBitmap ); aWallpaper.SetStyle( WALLPAPER_TOPRIGHT ); // we need to shift the bitmap vertically so that it spans over the @@ -175,7 +175,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) } ControlState nState = CTRL_STATE_ENABLED; - if ( GetAlign() == WINDOWALIGN_TOP && Application::GetSettings().GetStyleSettings().GetPersonaHeader() ) + if ( GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) Erase(); else if ( !ImplGetSVData()->maNWFData.mbDockingAreaSeparateTB ) { -- cgit