strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS nativeprintdlg01_DEV300 (1.23.122); FILE MERGED

Browse source 
2008/02/26 14:17:44 pl 1.23.122.3: #i77579# print progress should get a different text in case of native print dialog after the job
2007/11/26 20:14:37 ericb 1.23.122.2: #i77579# another change avoiding the fake printing
2007/11/26 19:55:37 ericb 1.23.122.1: #i77579# a try to hide the old dialog box
This commit is contained in:
Kurt Zenker 2008-03-05 15:55:03 +00:00
parent a62799867c
commit 281849fe0b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sfx2/source/view/prnmon.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: prnmon.cxx,v $
*
* $Revision: 1.23 $
* $Revision: 1.24 $
*
* last change: $Author: hr $ $Date: 2007-06-27 23:34:41 $
* last change: $Author: kz $ $Date: 2008-03-05 16:55:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -172,6 +172,12 @@ SfxPrintMonitor_Impl::SfxPrintMonitor_Impl( Window* pParent, SfxViewShell* rpVie
aPrintInfo ( this, SfxResId( FT_PRINTINFO ) ),
aCancel ( this, SfxResId( PB_CANCELPRNMON ) )
{
if( rpViewShell->GetPrinter()->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) != 0 )
{
String aPrep( SfxResId( STR_FT_PREPARATION ) );
aPrinting.SetText( aPrep );
aPrinter.Show( FALSE );
}
FreeResource();
}
@ -223,6 +229,7 @@ void SfxPrintProgress_Impl::CreateMonitor()
{
// mark monitor to been shown in first status indication
bShow = TRUE;
if ( !pMonitor )
{
Window* pParent = pViewShell->GetWindow();