summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog/about.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-11-20 15:13:11 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-11-20 15:13:11 +0000
commit21a4a0827e185c8195f989470e04c2b6756d4a18 (patch)
tree06146f65ff58ee653d351094f02cec8f4ef87222 /sfx2/source/dialog/about.cxx
parent9fc97737a2ccc06fe075234396e41269acfbad07 (diff)
CWS-TOOLING: integrate CWS buildid301_DEV300
Diffstat (limited to 'sfx2/source/dialog/about.cxx')
-rw-r--r--sfx2/source/dialog/about.cxx16
1 files changed, 5 insertions, 11 deletions
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 4fd6e4382f04..916af19962d6 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -150,12 +150,15 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
while ( !bLoaded && ( nIndex >= 0 ) );
// fallback to "about.bmp"
- if ( !bLoaded ) {
+ if ( !bLoaded )
+ {
bLoaded = impl_loadBitmap(
rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
}
- if (!bLoaded) {
+
+ if ( !bLoaded )
+ {
bLoaded = impl_loadBitmap(
rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
@@ -169,15 +172,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
// if necessary more info
String sVersion = aVersionText.GetText();
sVersion.SearchAndReplaceAscii( "$(VER)", Application::GetDisplayName() );
- ::rtl::OUString aDefault;
- String sPatchLevel( utl::Bootstrap::getProductPatchLevel( aDefault ) );
- if ( sPatchLevel.Len() > 0 )
- {
- sVersion.EraseTrailingChars();
- sVersion += ' ';
- sVersion += sPatchLevel;
- }
-
sVersion += '\n';
sVersion += rVerStr;
aVersionText.SetText( sVersion );