summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sfx2/source/dialog/about.cxx11
-rw-r--r--sfx2/source/view/prnmon.cxx2
2 files changed, 4 insertions, 9 deletions
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index e23ef33f82..c1f8dc493b 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: about.cxx,v $
- * $Revision: 1.41 $
+ * $Revision: 1.41.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -208,20 +208,15 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
Color aWhiteCol( rSettings.GetWindowColor() );
Wallpaper aWall( aWhiteCol );
- #if 0
- // pl: FIXME #i78884#
SetBackground( aWall );
- #else
- SetControlBackground( aWhiteCol );
- #endif
Font aNewFont( aCopyrightText.GetFont() );
aNewFont.SetTransparent( TRUE );
aVersionText.SetFont( aNewFont );
aCopyrightText.SetFont( aNewFont );
- aVersionText.SetBackground( aWall );
- aCopyrightText.SetBackground( aWall );
+ aVersionText.SetBackground();
+ aCopyrightText.SetBackground();
Color aTextColor( rSettings.GetWindowTextColor() );
aVersionText.SetControlForeground( aTextColor );
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index a2645c69d4..6be24a75e2 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -240,7 +240,7 @@ BOOL SfxPrintProgress_Impl::SetPage( USHORT nPage, const String &rPage )
IMPL_LINK( SfxPrintProgress_Impl, CancelHdl, Button *, EMPTYARG )
{
- if ( !pViewShell->GetPrinter()->IsJobActive() )
+ if ( !pViewShell->GetPrinter()->IsJobActive() && pViewShell->GetPrinter()->IsPrinting() )
// we are still in StartJob, cancelling now might lead to a crash
return 0;