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

INTEGRATION: CWS cups01 (1.9.62); FILE MERGED

Browse source 
2003/08/15 13:21:13 pl 1.9.62.2: removed a bunch of warnings
2003/08/07 15:06:48 pl 1.9.62.1: #i12087# adjustments for CUPS
This commit is contained in:
Oliver Bolte 2004-03-17 09:44:08 +00:00
parent 5a7d123b63
commit d15776888e
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
padmin/source/cmddlg.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: cmddlg.cxx,v $ * $RCSfile: cmddlg.cxx,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change: $Author: pl $ $Date: 2002-09-03 13:33:00 $ * last change: $Author: obo $ $Date: 2004-03-17 10:44:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -268,24 +268,26 @@ void CommandStore::setFaxCommands( const ::std::list< String >& rCommands )
RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
TabPage( &pParent->m_aTabControl, PaResId( RID_RTS_COMMANDPAGE ) ), TabPage( &pParent->m_aTabControl, PaResId( RID_RTS_COMMANDPAGE ) ),
m_pParent( pParent ), m_pParent( pParent ),
m_aCommandsCB( this, PaResId( RID_RTS_CMD_CB_COMMANDS ) ),
m_aCommandTitle( this, PaResId( RID_RTS_CMD_FL_INSTALL ) ), m_aCommandTitle( this, PaResId( RID_RTS_CMD_FL_INSTALL ) ),
m_aPrinterName( this, PaResId( RID_RTS_CMD_TXT_PRTNAME ) ), m_aPrinterName( this, PaResId( RID_RTS_CMD_TXT_PRTNAME ) ),
m_aConnectedTo( this, PaResId( RID_RTS_CMD_TXT_CONNECT ) ),
m_aPrinterFL( this, PaResId( RID_RTS_CMD_FL_DEFAULT ) ), m_aPrinterFL( this, PaResId( RID_RTS_CMD_FL_DEFAULT ) ),
m_aCommandsCB( this, PaResId( RID_RTS_CMD_CB_COMMANDS ) ),
m_aConfigureText( this, PaResId( RID_RTS_CMD_TXT_CONFIGURE ) ), m_aConfigureText( this, PaResId( RID_RTS_CMD_TXT_CONFIGURE ) ),
m_aConfigureBox( this, PaResId( RID_RTS_CMD_LB_CONFIGURE ) ), m_aConfigureBox( this, PaResId( RID_RTS_CMD_LB_CONFIGURE ) ),
m_aHelpButton( this, PaResId( RID_RTS_CMD_BTN_HELP ) ), m_aPdfDirectoryText( this, PaResId( RID_RTS_CMD_TXT_PDFDIR ) ),
m_aRemovePB( this, PaResId( RID_RTS_CMD_BTN_REMOVE ) ),
m_aConnectedTo( this, PaResId( RID_RTS_CMD_TXT_CONNECT ) ),
m_aFaxHelp( PaResId( RID_RTS_CMD_STR_FAXHELP ) ),
m_aPrinterHelp( PaResId( RID_RTS_CMD_STR_PRINTERHELP ) ),
m_aPdfHelp( PaResId( RID_RTS_CMD_STR_PDFHELP ) ),
m_aPdfDirectoryButton( this, PaResId( RID_RTS_CMD_BTN_PDFDIR ) ), m_aPdfDirectoryButton( this, PaResId( RID_RTS_CMD_BTN_PDFDIR ) ),
m_aPdfDirectoryEdit( this, PaResId( RID_RTS_CMD_EDT_PDFDIR ) ), m_aPdfDirectoryEdit( this, PaResId( RID_RTS_CMD_EDT_PDFDIR ) ),
m_aPdfDirectoryText( this, PaResId( RID_RTS_CMD_TXT_PDFDIR ) ), m_aFaxSwallowBox( this, PaResId( RID_RTS_CMD_BOX_SWALLOWFAXNO ) ),
m_aFaxSwallowBox( this, PaResId( RID_RTS_CMD_BOX_SWALLOWFAXNO ) ) m_aHelpButton( this, PaResId( RID_RTS_CMD_BTN_HELP ) ),
m_aRemovePB( this, PaResId( RID_RTS_CMD_BTN_REMOVE ) ),
m_aFaxHelp( PaResId( RID_RTS_CMD_STR_FAXHELP ) ),
m_aPrinterHelp( PaResId( RID_RTS_CMD_STR_PRINTERHELP ) ),
m_aPdfHelp( PaResId( RID_RTS_CMD_STR_PDFHELP ) )
{ {
m_nPrinterEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_PRINTER ) ) ); // configuring as printer is only sensible in default print system
if( PrinterInfoManager::get().getType() == PrinterInfoManager::Default )
m_nPrinterEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_PRINTER ) ) );
m_nFaxEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_FAX ) ) ); m_nFaxEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_FAX ) ) );
m_nPdfEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_PDF ) ) ); m_nPdfEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_PDF ) ) );