summaryrefslogtreecommitdiff
path: root/vcl/source/app/settings.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/app/settings.cxx')
-rw-r--r--vcl/source/app/settings.cxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4174d5af59ae..ceab2f69f5c3 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2095,7 +2095,6 @@ static BitmapEx readBitmapEx( const OUString& rPath )
Graphic aGraphic;
if ( GraphicFilter::LoadGraphic( aPath, OUString(), aGraphic ) != GRFILTER_OK )
return BitmapEx();
-
return aGraphic.GetBitmapEx();
}
@@ -2123,7 +2122,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot
// now read the new values and setup bitmaps
OUString aHeader, aFooter;
- if ( aPersona == "own" )
+ if ( aPersona == "own" || aPersona == "default" )
{
sal_Int32 nIndex = 0;
aHeader = aPersonaSettings.getToken( 0, ';', nIndex );
@@ -2137,11 +2136,6 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot
rMenuBarTextColor = Color( aColor.toUInt64( 16 ) );
}
}
- else if ( aPersona == "default" )
- {
- aHeader = "header.jpg";
- aFooter = "footer.jpg";
- }
OUString aName;
switch ( eWhich ) {