diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 13:31:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 13:31:44 +0000 |
| commit | 7ca0fafb4a0416ea68eed4bbc2ae339220a408a0 (patch) | |
| tree | 3cbef07f9fdebfdecd51f7e1e82a70ebbbc00d07 | |
| parent | d0e9b60b781afac1f100110f9e771369b1f17741 (diff) | |
CWS-TOOLING: integrate CWS vcl92
| -rw-r--r-- | sfx2/source/dialog/about.cxx | 11 | ||||
| -rw-r--r-- | sfx2/source/view/prnmon.cxx | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 98c498b0b9d6..4fd6e4382f04 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 0c23aa4ffbdf..9fdd29db2805 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; |