diff options
Diffstat (limited to 'padmin/source')
26 files changed, 622 insertions, 622 deletions
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index 453a7668b772..28dca6b79488 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString& rSel std::list< rtl::OUString > aDrivers; psp::PPDParser::getKnownPPDDrivers( aDrivers, bRefresh ); - + rtl::OUString aSelectDriver( psp::PPDParser::getPPDPrinterName( rSelectDriver ) ); rtl::OUString aSelectedEntry; @@ -270,7 +270,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton ) std::list< rtl::OUString > aDirs; // get only psprint's directories, not eventual system dirs psp::getPrinterPathList( aDirs, NULL ); - std::list< rtl::OUString >::iterator dir; + std::list< rtl::OUString >::iterator dir; for( dir = aDirs.begin(); dir != aDirs.end(); ++dir ) { ::std::list< String > aFiles; @@ -388,9 +388,9 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind } switch( m_eKind ) { - case DeviceKind::Printer: CommandStore::getPrintCommands( aCommands );break; - case DeviceKind::Fax: CommandStore::getFaxCommands( aCommands );break; - case DeviceKind::Pdf: CommandStore::getPdfCommands( aCommands );break; + case DeviceKind::Printer: CommandStore::getPrintCommands( aCommands );break; + case DeviceKind::Fax: CommandStore::getFaxCommands( aCommands );break; + case DeviceKind::Pdf: CommandStore::getPdfCommands( aCommands );break; } // adjust height of command text and help button Rectangle aPosSize( m_aCommandTxt.GetPosPixel(), m_aCommandTxt.GetSizePixel() ); @@ -433,9 +433,9 @@ APCommandPage::~APCommandPage() aCommands.push_back( aLastCommand ); switch( m_eKind ) { - case DeviceKind::Printer: CommandStore::setPrintCommands( aCommands );break; - case DeviceKind::Fax: CommandStore::setFaxCommands( aCommands );break; - case DeviceKind::Pdf: CommandStore::setPdfCommands( aCommands );break; + case DeviceKind::Printer: CommandStore::setPrintCommands( aCommands );break; + case DeviceKind::Fax: CommandStore::setFaxCommands( aCommands );break; + case DeviceKind::Pdf: CommandStore::setPdfCommands( aCommands );break; } } @@ -546,11 +546,11 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent ) String aUPrinter( AddPrinterDialog::uniquePrinterName( String( aPrinter, aEncoding ) ) ); PrinterInfo aInfo; - aInfo.m_aDriverName = String( aNewDriver, aEncoding ); - aInfo.m_pParser = pParser; + aInfo.m_aDriverName = String( aNewDriver, aEncoding ); + aInfo.m_pParser = pParser; aInfo.m_aContext.setParser( pParser ); - aInfo.m_aPrinterName = aUPrinter; - aInfo.m_aCommand = String( aCommand, aEncoding ); + aInfo.m_aPrinterName = aUPrinter; + aInfo.m_aCommand = String( aCommand, aEncoding ); // read the printer settings ByteString aGroup( aDriver ); diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx index a8494d26d5d6..98dd93311a67 100644 --- a/padmin/source/adddlg.hxx +++ b/padmin/source/adddlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include "vcl/combobox.hxx" #include "vcl/printerinfomanager.hxx" -namespace padmin +namespace padmin { class AddPrinterDialog; @@ -48,12 +48,12 @@ namespace DeviceKind { enum type { Printer, Fax, Pdf }; } class APTabPage : public TabPage { - String m_aTitle; + String m_aTitle; protected: - AddPrinterDialog* m_pParent; + AddPrinterDialog* m_pParent; public: APTabPage( AddPrinterDialog* pParent, const ResId& rResId ); - + // returns false if information is incomplete or invalid virtual bool check() = 0; virtual void fill( ::psp::PrinterInfo& rInfo ) = 0; @@ -62,11 +62,11 @@ public: class APChooseDevicePage : public APTabPage { - RadioButton m_aPrinterBtn; - RadioButton m_aFaxBtn; - RadioButton m_aPDFBtn; - RadioButton m_aOldBtn; - FixedText m_aOverTxt; + RadioButton m_aPrinterBtn; + RadioButton m_aFaxBtn; + RadioButton m_aPDFBtn; + RadioButton m_aOldBtn; + FixedText m_aOverTxt; public: APChooseDevicePage( AddPrinterDialog* pParent ); ~APChooseDevicePage(); @@ -75,72 +75,72 @@ public: bool isFax() { return m_aFaxBtn.IsChecked(); } bool isPDF() { return m_aPDFBtn.IsChecked(); } bool isOld() { return m_aOldBtn.IsChecked(); } - - + + virtual bool check(); virtual void fill( ::psp::PrinterInfo& rInfo ); }; class APChooseDriverPage : public APTabPage { - FixedText m_aDriverTxt; - DelListBox m_aDriverBox; - PushButton m_aAddBtn; - PushButton m_aRemBtn; + FixedText m_aDriverTxt; + DelListBox m_aDriverBox; + PushButton m_aAddBtn; + PushButton m_aRemBtn; - String m_aRemStr; - String m_aLastPrinterName; + String m_aRemStr; + String m_aLastPrinterName; DECL_LINK( ClickBtnHdl, PushButton* ); DECL_LINK( DelPressedHdl, ListBox* ); - + void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SGENPRT" ) ) ); public: APChooseDriverPage( AddPrinterDialog* pParent ); ~APChooseDriverPage(); - + virtual bool check(); virtual void fill( ::psp::PrinterInfo& rInfo ); }; class APNamePage : public APTabPage { - FixedText m_aNameTxt; - Edit m_aNameEdt; - CheckBox m_aDefaultBox; - CheckBox m_aFaxSwallowBox; + FixedText m_aNameTxt; + Edit m_aNameEdt; + CheckBox m_aDefaultBox; + CheckBox m_aFaxSwallowBox; public: APNamePage( AddPrinterDialog* pParent, const String& rInitName, DeviceKind::type eKind ); ~APNamePage(); - bool isDefault() { return m_aDefaultBox.IsChecked(); } + bool isDefault() { return m_aDefaultBox.IsChecked(); } bool isFaxSwallow() { return m_aFaxSwallowBox.IsChecked(); } void setText( const String& rText ) { m_aNameEdt.SetText( rText ); } - + virtual bool check(); virtual void fill( ::psp::PrinterInfo& rInfo ); }; class APCommandPage : public APTabPage { - FixedText m_aCommandTxt; - ComboBox m_aCommandBox; - PushButton m_aHelpBtn; - String m_aHelpTxt; - FixedText m_aPdfDirTxt; - Edit m_aPdfDirEdt; - PushButton m_aPdfDirBtn; + FixedText m_aCommandTxt; + ComboBox m_aCommandBox; + PushButton m_aHelpBtn; + String m_aHelpTxt; + FixedText m_aPdfDirTxt; + Edit m_aPdfDirEdt; + PushButton m_aPdfDirBtn; - DeviceKind::type m_eKind; + DeviceKind::type m_eKind; DECL_LINK( ClickBtnHdl, PushButton* ); DECL_LINK( ModifyHdl, ComboBox* ); public: - + APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind ); ~APCommandPage(); - + virtual bool check(); virtual void fill( ::psp::PrinterInfo& rInfo ); @@ -149,17 +149,17 @@ public: class APOldPrinterPage : public APTabPage { - FixedText m_aOldPrinterTxt; - MultiListBox m_aOldPrinterBox; - PushButton m_aSelectAllBtn; + FixedText m_aOldPrinterTxt; + MultiListBox m_aOldPrinterBox; + PushButton m_aSelectAllBtn; - ::std::list< ::psp::PrinterInfo > m_aOldPrinters; + ::std::list< ::psp::PrinterInfo > m_aOldPrinters; DECL_LINK( ClickBtnHdl, PushButton* ); public: APOldPrinterPage( AddPrinterDialog* pParent ); ~APOldPrinterPage(); - + virtual bool check(); virtual void fill( ::psp::PrinterInfo& rInfo ); @@ -168,9 +168,9 @@ public: class APFaxDriverPage : public APTabPage { - FixedText m_aFaxTxt; - RadioButton m_aDefBtn; - RadioButton m_aSelectBtn; + FixedText m_aFaxTxt; + RadioButton m_aDefBtn; + RadioButton m_aSelectBtn; public: APFaxDriverPage( AddPrinterDialog* pParent ); ~APFaxDriverPage(); @@ -183,10 +183,10 @@ public: class APPdfDriverPage : public APTabPage { - FixedText m_aPdfTxt; - RadioButton m_aDefBtn; - RadioButton m_aDistBtn; - RadioButton m_aSelectBtn; + FixedText m_aPdfTxt; + RadioButton m_aDefBtn; + RadioButton m_aDistBtn; + RadioButton m_aSelectBtn; public: APPdfDriverPage( AddPrinterDialog* pParent ); ~APPdfDriverPage(); @@ -200,37 +200,37 @@ public: class AddPrinterDialog : public ModalDialog { - CancelButton m_aCancelPB; - PushButton m_aPrevPB; - PushButton m_aNextPB; - OKButton m_aFinishPB; - FixedLine m_aLine; - TitleImage m_aTitleImage; - - ::psp::PrinterInfo m_aPrinter; - - APTabPage* m_pCurrentPage; - - APChooseDevicePage* m_pChooseDevicePage; - APCommandPage* m_pCommandPage; - APChooseDriverPage* m_pChooseDriverPage; - APNamePage* m_pNamePage; - APOldPrinterPage* m_pOldPrinterPage; - APFaxDriverPage* m_pFaxDriverPage; - APChooseDriverPage* m_pFaxSelectDriverPage; - APNamePage* m_pFaxNamePage; - APCommandPage* m_pFaxCommandPage; - APPdfDriverPage* m_pPdfDriverPage; - APChooseDriverPage* m_pPdfSelectDriverPage; - APNamePage* m_pPdfNamePage; - APCommandPage* m_pPdfCommandPage; - + CancelButton m_aCancelPB; + PushButton m_aPrevPB; + PushButton m_aNextPB; + OKButton m_aFinishPB; + FixedLine m_aLine; + TitleImage m_aTitleImage; + + ::psp::PrinterInfo m_aPrinter; + + APTabPage* m_pCurrentPage; + + APChooseDevicePage* m_pChooseDevicePage; + APCommandPage* m_pCommandPage; + APChooseDriverPage* m_pChooseDriverPage; + APNamePage* m_pNamePage; + APOldPrinterPage* m_pOldPrinterPage; + APFaxDriverPage* m_pFaxDriverPage; + APChooseDriverPage* m_pFaxSelectDriverPage; + APNamePage* m_pFaxNamePage; + APCommandPage* m_pFaxCommandPage; + APPdfDriverPage* m_pPdfDriverPage; + APChooseDriverPage* m_pPdfSelectDriverPage; + APNamePage* m_pPdfNamePage; + APCommandPage* m_pPdfCommandPage; + DECL_LINK( ClickBtnHdl, PushButton* ); void advance(); void back(); void addPrinter(); - + void updateSettings(); virtual void DataChanged( const DataChangedEvent& rEv ); diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index f26ca0293d63..3252ee747898 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ void CommandStore::getSystemPrintCommands( ::std::list< String >& rCommands ) bOnce = true; PrinterInfoManager::get().getSystemPrintCommands( aSysCommands ); } - - ::std::list< OUString >::const_iterator it; + + ::std::list< OUString >::const_iterator it; for( it = aSysCommands.begin(); it != aSysCommands.end(); ++it ) rCommands.push_back( *it ); } @@ -71,7 +71,7 @@ void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands ) FILE* pPipe; String aCommand; rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - + pPipe = popen( "which gs 2>/dev/null", "r" ); if( pPipe ) { @@ -154,7 +154,7 @@ void CommandStore::setCommands( rConfig.SetGroup( pGroup ); ::std::list< String >::const_iterator it, loop; ::std::list< String > aWriteList; - + int nWritten = 0; for( it = rCommands.begin(); it != rCommands.end(); ++it ) { @@ -218,7 +218,7 @@ void CommandStore::setFaxCommands( const ::std::list< String >& rCommands ) ::std::list< String > aSysCmds; setCommands( FAX_PERSISTENCE_GROUP, rCommands, aSysCmds ); } - + RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : TabPage( &pParent->m_aTabControl, PaResId( RID_RTS_COMMANDPAGE ) ), @@ -259,7 +259,7 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : CommandStore::getPdfCommands( m_aPdfCommands ); m_aPrinterName.SetText( m_pParent->m_aPrinter ); - + m_aCommandsCB.SetDoubleClickHdl( LINK( this, RTSCommandPage, DoubleClickHdl ) ); m_aCommandsCB.SetSelectHdl( LINK( this, RTSCommandPage, SelectHdl ) ); m_aCommandsCB.SetModifyHdl( LINK( this, RTSCommandPage, ModifyHdl ) ); @@ -307,7 +307,7 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : m_bWasExternalDialog = true; } } - + m_aQuickCB.Enable( m_aExternalCB.IsChecked() ); String aString( m_aConnectedTo.GetText() ); @@ -327,14 +327,14 @@ void RTSCommandPage::save() bool bHaveFax = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? true : false; bool bHavePdf = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? true : false; ::std::list< String >::iterator it; - + String aFeatures; sal_Int32 nIndex = 0; String aOldPdfPath; bool bOldFaxSwallow = false; bool bFaxSwallow = m_aFaxSwallowBox.IsChecked() ? true : false; bool bOldExternalDialog = false, bExternalDialog = m_aExternalCB.IsChecked() ? true : false; - + while( nIndex != -1 ) { OUString aToken( m_pParent->m_aJobData.m_aFeatures.getToken( 0, ',', nIndex ) ); @@ -395,24 +395,24 @@ void RTSCommandPage::save() ; if( it == pList->end() ) pList->push_back( aCommand ); - - if( aCommand != String( m_pParent->m_aJobData.m_aCommand ) || + + if( aCommand != String( m_pParent->m_aJobData.m_aCommand ) || aQuickCommand != String( m_pParent->m_aJobData.m_aQuickCommand ) || - ( m_bWasFax && ! bHaveFax ) || - ( ! m_bWasFax && bHaveFax ) || - ( m_bWasPdf && ! bHavePdf ) || - ( ! m_bWasPdf && bHavePdf ) || + ( m_bWasFax && ! bHaveFax ) || + ( ! m_bWasFax && bHaveFax ) || + ( m_bWasPdf && ! bHavePdf ) || + ( ! m_bWasPdf && bHavePdf ) || ( bHavePdf && aOldPdfPath != m_aPdfDirectoryEdit.GetText() ) || ( bHaveFax && bFaxSwallow != bOldFaxSwallow ) || ( m_bWasExternalDialog && ! bExternalDialog ) || ( ! m_bWasExternalDialog && bExternalDialog ) ) { - m_pParent->m_aJobData.m_aCommand = aCommand; + m_pParent->m_aJobData.m_aCommand = aCommand; m_pParent->m_aJobData.m_aQuickCommand = aQuickCommand; - m_pParent->m_aJobData.m_aFeatures = aFeatures; - - PrinterInfoManager::get().changePrinterInfo( m_pParent->m_aPrinter, m_pParent->m_aJobData ); + m_pParent->m_aJobData.m_aFeatures = aFeatures; + + PrinterInfoManager::get().changePrinterInfo( m_pParent->m_aPrinter, m_pParent->m_aJobData ); } CommandStore::setPrintCommands( m_aPrinterCommands ); CommandStore::setFaxCommands( m_aFaxCommands ); @@ -436,7 +436,7 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox ) { m_aRemovePB.Enable( TRUE ); } - + return 0; } @@ -494,7 +494,7 @@ IMPL_LINK( RTSCommandPage, ModifyHdl, Edit*, pEdit ) { if( pEdit == &m_aCommandsCB ) m_aRemovePB.Enable( m_aCommandsCB.GetEntryPos( m_aCommandsCB.GetText() ) != LISTBOX_ENTRY_NOTFOUND ); - + return 0; } diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx index 8c47530dab39..4022db905392 100644 --- a/padmin/source/cmddlg.hxx +++ b/padmin/source/cmddlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,64 +51,64 @@ class CommandStore static void getSystemPrintCommands( ::std::list< String >& rCommands ); static void getSystemPdfCommands( ::std::list< String >& rCommands ); static void setCommands( const char* pGroup, const ::std::list< String >& rCommands, const ::std::list< String >& rSysCommands ); - + public: static void getPrintCommands( ::std::list< String >& rCommands ); static void getFaxCommands( ::std::list< String >& rCommands ); static void getPdfCommands( ::std::list< String >& rCommands ); - + static void setPrintCommands( const ::std::list< String >& rCommands ); static void setFaxCommands( const ::std::list< String >& rCommands ); static void setPdfCommands( const ::std::list< String >& rCommands ); }; - + class RTSCommandPage : public TabPage { private: - RTSDialog* m_pParent; - - ComboBox m_aCommandsCB; + RTSDialog* m_pParent; + + ComboBox m_aCommandsCB; CheckBox m_aExternalCB; FixedText m_aQuickFT; ComboBox m_aQuickCB; - FixedLine m_aCommandTitle; - FixedText m_aPrinterName; - FixedText m_aConnectedTo; - FixedLine m_aPrinterFL; - - FixedText m_aConfigureText; - ListBox m_aConfigureBox; - USHORT m_nPrinterEntry; - USHORT m_nFaxEntry; - USHORT m_nPdfEntry; - FixedText m_aPdfDirectoryText; - PushButton m_aPdfDirectoryButton; - Edit m_aPdfDirectoryEdit; - CheckBox m_aFaxSwallowBox; - - PushButton m_aHelpButton; - PushButton m_aRemovePB; - - ::std::list< String > m_aPrinterCommands; - ::std::list< String > m_aFaxCommands; - ::std::list< String > m_aPdfCommands; - - String m_aFaxHelp; - String m_aPrinterHelp; - String m_aPdfHelp; - - bool m_bWasFax; - bool m_bWasPdf; + FixedLine m_aCommandTitle; + FixedText m_aPrinterName; + FixedText m_aConnectedTo; + FixedLine m_aPrinterFL; + + FixedText m_aConfigureText; + ListBox m_aConfigureBox; + USHORT m_nPrinterEntry; + USHORT m_nFaxEntry; + USHORT m_nPdfEntry; + FixedText m_aPdfDirectoryText; + PushButton m_aPdfDirectoryButton; + Edit m_aPdfDirectoryEdit; + CheckBox m_aFaxSwallowBox; + + PushButton m_aHelpButton; + PushButton m_aRemovePB; + + ::std::list< String > m_aPrinterCommands; + ::std::list< String > m_aFaxCommands; + ::std::list< String > m_aPdfCommands; + + String m_aFaxHelp; + String m_aPrinterHelp; + String m_aPdfHelp; + + bool m_bWasFax; + bool m_bWasPdf; bool m_bWasExternalDialog; - + DECL_LINK( DoubleClickHdl, ComboBox* ); DECL_LINK( ClickBtnHdl, Button* ); DECL_LINK( SelectHdl, Control* ); DECL_LINK( ModifyHdl, Edit* ); - + void ConnectCommand(); void UpdateCommands(); - + public: RTSCommandPage( RTSDialog* ); ~RTSCommandPage(); diff --git a/padmin/source/desktopcontext.cxx b/padmin/source/desktopcontext.cxx index 3aea19862c2b..9e2db2aa65d4 100644 --- a/padmin/source/desktopcontext.cxx +++ b/padmin/source/desktopcontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/padmin/source/desktopcontext.hxx b/padmin/source/desktopcontext.hxx index 2330019f23a5..8bca914b1571 100644 --- a/padmin/source/desktopcontext.hxx +++ b/padmin/source/desktopcontext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx index 43abfe3b2bac..edd48fca2dc3 100644 --- a/padmin/source/fontentry.cxx +++ b/padmin/source/fontentry.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,35 +102,35 @@ String FontNameDlg::fillFontEntry( FastPrintFontInfo& rInfo, const String& rFile bool bWeight = true, bItalic = true, bWidth = true; switch( rInfo.m_eWeight ) { - case weight::Thin: aEntry.AppendAscii( ", " ); aEntry.Append( aThinTxt ); break; - case weight::UltraLight: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraLightTxt ); break; - case weight::Light: aEntry.AppendAscii( ", " ); aEntry.Append( aLightTxt ); break; - case weight::SemiLight: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiLightTxt ); break; - case weight::SemiBold: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiBoldTxt ); break; - case weight::Bold: aEntry.AppendAscii( ", " ); aEntry.Append( aBoldTxt ); break; - case weight::UltraBold: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraBoldTxt ); break; + case weight::Thin: aEntry.AppendAscii( ", " ); aEntry.Append( aThinTxt ); break; + case weight::UltraLight: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraLightTxt ); break; + case weight::Light: aEntry.AppendAscii( ", " ); aEntry.Append( aLightTxt ); break; + case weight::SemiLight: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiLightTxt ); break; + case weight::SemiBold: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiBoldTxt ); break; + case weight::Bold: aEntry.AppendAscii( ", " ); aEntry.Append( aBoldTxt ); break; + case weight::UltraBold: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraBoldTxt ); break; default: bWeight = false; break; } switch( rInfo.m_eItalic ) { - case italic::Oblique: aEntry.AppendAscii( ", " ); aEntry.Append( aObliqueTxt ); break; - case italic::Italic: aEntry.AppendAscii( ", " ); aEntry.Append( aItalicTxt ); break; + case italic::Oblique: aEntry.AppendAscii( ", " ); aEntry.Append( aObliqueTxt ); break; + case italic::Italic: aEntry.AppendAscii( ", " ); aEntry.Append( aItalicTxt ); break; default: bItalic = false; break; } switch( rInfo.m_eWidth ) { - case width::UltraCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraCondensedTxt ); break; - case width::ExtraCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aExtraCondensedTxt ); break; - case width::Condensed: aEntry.AppendAscii( ", " ); aEntry.Append( aCondensedTxt ); break; - case width::SemiCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiCondensedTxt ); break; - case width::SemiExpanded: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiExpandedTxt ); break; - case width::Expanded: aEntry.AppendAscii( ", " ); aEntry.Append( aExpandedTxt ); break; - case width::ExtraExpanded: aEntry.AppendAscii( ", " ); aEntry.Append( aExtraExpandedTxt ); break; - case width::UltraExpanded: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraExpandedTxt ); break; + case width::UltraCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraCondensedTxt ); break; + case width::ExtraCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aExtraCondensedTxt ); break; + case width::Condensed: aEntry.AppendAscii( ", " ); aEntry.Append( aCondensedTxt ); break; + case width::SemiCondensed: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiCondensedTxt ); break; + case width::SemiExpanded: aEntry.AppendAscii( ", " ); aEntry.Append( aSemiExpandedTxt ); break; + case width::Expanded: aEntry.AppendAscii( ", " ); aEntry.Append( aExpandedTxt ); break; + case width::ExtraExpanded: aEntry.AppendAscii( ", " ); aEntry.Append( aExtraExpandedTxt ); break; + case width::UltraExpanded: aEntry.AppendAscii( ", " ); aEntry.Append( aUltraExpandedTxt ); break; default: bWidth = false; break; @@ -422,10 +422,10 @@ bool FontImportDialog::queryOverwriteFile( const ::rtl::OUString& rFile ) int nResult = aQueryBox.Execute(); switch( nResult ) { - case BUTTONID_YES: bRet = true; break; - case BUTTONID_NO: bRet = false; break; - case 20: bRet = m_bOverwriteAll = true; break; - case 21: bRet = false; m_bOverwriteNone = true; break; + case BUTTONID_YES: bRet = true; break; + case BUTTONID_NO: bRet = false; break; + case 20: bRet = m_bOverwriteAll = true; break; + case 21: bRet = false; m_bOverwriteNone = true; break; } return bRet; diff --git a/padmin/source/fontentry.hxx b/padmin/source/fontentry.hxx index 087927078098..f76300cc9307 100644 --- a/padmin/source/fontentry.hxx +++ b/padmin/source/fontentry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,52 +48,52 @@ namespace padmin { public ModalDialog, public ::psp::PrintFontManager::ImportFontCallback { - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - PushButton m_aSelectAllBtn; - ListBox m_aNewFontsBox; - FixedLine m_aFromFL; - Edit m_aFromDirEdt; - PushButton m_aFromBtn; - CheckBox m_aSubDirsBox; - FixedLine m_aTargetOptFL; - CheckBox m_aLinkOnlyBox; - FixedText m_aFixedText; - bool m_bOverwriteAll; - bool m_bOverwriteNone; - ProgressDialog* m_pProgress; - int m_nFont; - - String m_aImportOperation; - String m_aOverwriteQueryText; - String m_aOverwriteAllText; - String m_aOverwriteNoneText; - String m_aNoAfmText; - String m_aAfmCopyFailedText; - String m_aFontCopyFailedText; - String m_aNoWritableFontsDirText; - String m_aFontsImportedText; + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; + PushButton m_aSelectAllBtn; + ListBox m_aNewFontsBox; + FixedLine m_aFromFL; + Edit m_aFromDirEdt; + PushButton m_aFromBtn; + CheckBox m_aSubDirsBox; + FixedLine m_aTargetOptFL; + CheckBox m_aLinkOnlyBox; + FixedText m_aFixedText; + bool m_bOverwriteAll; + bool m_bOverwriteNone; + ProgressDialog* m_pProgress; + int m_nFont; + + String m_aImportOperation; + String m_aOverwriteQueryText; + String m_aOverwriteAllText; + String m_aOverwriteNoneText; + String m_aNoAfmText; + String m_aAfmCopyFailedText; + String m_aFontCopyFailedText; + String m_aNoWritableFontsDirText; + String m_aFontsImportedText; ::std::hash_map< ::rtl::OString, ::std::list< ::psp::FastPrintFontInfo >, ::rtl::OStringHash > m_aNewFonts; - - Timer m_aRefreshTimer; + + Timer m_aRefreshTimer; DECL_LINK( RefreshTimeoutHdl, void* ); - - ::psp::PrintFontManager& m_rFontManager; - + + ::psp::PrintFontManager& m_rFontManager; + DECL_LINK( ClickBtnHdl, Button* ); DECL_LINK( ModifyHdl, Edit* ); DECL_LINK( ToggleHdl, CheckBox* ); - + // implement ImportFontCallback virtual void importFontsFailed( ::psp::PrintFontManager::ImportFontCallback::FailCondition eReason ); virtual void progress( const ::rtl::OUString& rFile ); virtual bool queryOverwriteFile( const ::rtl::OUString& rFile ); virtual void importFontFailed( const ::rtl::OUString& rFile, ::psp::PrintFontManager::ImportFontCallback::FailCondition eReason ); virtual bool isCanceled(); - + void copyFonts(); void fillFontBox(); public: @@ -104,19 +104,19 @@ namespace padmin { class FontNameDlg : public ModalDialog { private: - OKButton m_aOKButton; - PushButton m_aRenameButton; - PushButton m_aRemoveButton; - PushButton m_aImportButton; + OKButton m_aOKButton; + PushButton m_aRenameButton; + PushButton m_aRemoveButton; + PushButton m_aImportButton; + + DelListBox m_aFontBox; + FixedText m_aFixedText; - DelListBox m_aFontBox; - FixedText m_aFixedText; + String m_aRenameString; + String m_aRenameTTCString; + String m_aNoRenameString; - String m_aRenameString; - String m_aRenameTTCString; - String m_aNoRenameString; - - ::psp::PrintFontManager& m_rFontManager; + ::psp::PrintFontManager& m_rFontManager; // maps fontID to XLFD ::std::hash_map< ::psp::fontID, String > @@ -125,7 +125,7 @@ namespace padmin { public: FontNameDlg( Window* ); ~FontNameDlg(); - + DECL_LINK( ClickBtnHdl, Button* ); DECL_LINK( DelPressedHdl, ListBox* ); DECL_LINK( SelectHdl, ListBox* ); diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index 3d5d18c596be..9e1fbba1faea 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ using namespace com::sun::star::ui::dialogs; #define MAX_PATH 1024 /* - * PaResId + * PaResId */ ResId padmin::PaResId( sal_uInt32 nId ) @@ -65,8 +65,8 @@ ResId padmin::PaResId( sal_uInt32 nId ) if( ! pPaResMgr ) { ::com::sun::star::lang::Locale aLocale; -// LanguageType nLang = LANGUAGE_SYSTEM; - +// LanguageType nLang = LANGUAGE_SYSTEM; + utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory( vcl::unohelper::GetMultiServiceFactory(), @@ -96,7 +96,7 @@ ResId padmin::PaResId( sal_uInt32 nId ) } /* - * FindFiles + * FindFiles */ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult, const String& rSuffixes, bool bRecursive ) @@ -111,7 +111,7 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult DirectoryItem aItem; while( aDir.getNextItem( aItem ) == FileBase::E_None ) { - FileStatus aStatus( FileStatusMask_FileName | + FileStatus aStatus( FileStatusMask_FileName | FileStatusMask_Type ); if( aItem.getFileStatus( aStatus ) == FileBase::E_None ) @@ -149,7 +149,7 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult aSubFile.appendAscii( "/", 1 ); aSubFile.append( *it ); rResult.push_back( aSubFile.makeStringAndClear() ); - } + } } } } @@ -157,7 +157,7 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult } /* - * DelMultiListBox + * DelMultiListBox */ long DelMultiListBox::Notify( NotifyEvent& rEvent ) @@ -177,7 +177,7 @@ long DelMultiListBox::Notify( NotifyEvent& rEvent ) } /* - * DelListBox + * DelListBox */ long DelListBox::Notify( NotifyEvent& rEvent ) @@ -197,7 +197,7 @@ long DelListBox::Notify( NotifyEvent& rEvent ) } /* - * QueryString + * QueryString */ QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const ::std::list< String >& rChoices ) : @@ -247,7 +247,7 @@ IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton ) } /* - * AreYouSure + * AreYouSure */ BOOL padmin::AreYouSure( Window* pParent, int nRid ) @@ -260,7 +260,7 @@ BOOL padmin::AreYouSure( Window* pParent, int nRid ) } /* - * getPadminRC + * getPadminRC */ static Config* pRC = NULL; diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index 503de2dda960..ad263a6b004e 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,14 +49,14 @@ namespace padmin { class DelMultiListBox : public MultiListBox { - Link m_aDelPressedLink; + Link m_aDelPressedLink; public: DelMultiListBox( Window* pParent, const ResId& rResId ) : MultiListBox( pParent, rResId ) {} ~DelMultiListBox() {} - + virtual long Notify( NotifyEvent& rEvent ); - + Link setDelPressedLink( const Link& rLink ) { Link aOldLink( m_aDelPressedLink ); @@ -68,14 +68,14 @@ public: class DelListBox : public ListBox { - Link m_aDelPressedLink; + Link m_aDelPressedLink; public: DelListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) {} ~DelListBox() {} - + virtual long Notify( NotifyEvent& rEvent ); - + Link setDelPressedLink( const Link& rLink ) { Link aOldLink( m_aDelPressedLink ); @@ -92,13 +92,13 @@ private: CancelButton m_aCancelButton; FixedText m_aFixedText; Edit m_aEdit; - ComboBox m_aComboBox; - + ComboBox m_aComboBox; + String& m_rReturnValue; - bool m_bUseEdit; - + bool m_bUseEdit; + DECL_LINK( ClickBtnHdl, Button* ); - + public: QueryString( Window*, String &, String &, const ::std::list< String >& rChoices = ::std::list<String>() ); // parent window, Query text, initial value diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index cf52a7e23308..514801792013 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx index 576a1bf2cb43..860befbac577 100644 --- a/padmin/source/newppdlg.hxx +++ b/padmin/source/newppdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,38 +39,38 @@ namespace psp { class PPDParser; } namespace padmin { - + class PPDImportDialog : public ModalDialog { - OKButton m_aOKBtn; - CancelButton m_aCancelBtn; - FixedText m_aPathTxt; - ComboBox m_aPathBox; - PushButton m_aSearchBtn; - FixedText m_aDriverTxt; - MultiListBox m_aDriverLB; - - FixedLine m_aPathGroup; - FixedLine m_aDriverGroup; - - String m_aLoadingPPD; - + OKButton m_aOKBtn; + CancelButton m_aCancelBtn; + FixedText m_aPathTxt; + ComboBox m_aPathBox; + PushButton m_aSearchBtn; + FixedText m_aDriverTxt; + MultiListBox m_aDriverLB; + + FixedLine m_aPathGroup; + FixedLine m_aDriverGroup; + + String m_aLoadingPPD; + DECL_LINK( ClickBtnHdl, PushButton* ); DECL_LINK( SelectHdl, ComboBox* ); DECL_LINK( ModifyHdl, ComboBox* ); - + void Import(); - + std::list< rtl::OUString > m_aImportedFiles; public: PPDImportDialog( Window* pParent ); ~PPDImportDialog(); - + const std::list< rtl::OUString >& getImportedFiles() const { return m_aImportedFiles; } }; - -} // namespace + +} // namespace #endif // _NEWPPDLG_HXX diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 4eb51b4b0b45..36a0e94e0d61 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ void PADialog::Init() // #i79787# initially ensure printer discovery has ended m_rPIManager.checkPrintersChanged( true ); m_aCUPSCB.Check( m_rPIManager.isCUPSDisabled() ); - + UpdateDevice(); UpdateText(); @@ -373,7 +373,7 @@ public: {} virtual ~SpaPrinterController() {} - + virtual int getPageCount() const { return 1; } virtual Sequence< PropertyValue > getPageParameters( int i_nPage ) const; virtual void printPage( int i_nPage ) const; @@ -383,22 +383,22 @@ public: Sequence< PropertyValue > SpaPrinterController::getPageParameters( int ) const { Sequence< PropertyValue > aRet( 1 ); - + Size aPageSize( getPrinter()->GetPaperSizePixel() ); aPageSize = getPrinter()->PixelToLogic( aPageSize, MapMode( MAP_100TH_MM ) ); - + awt::Size aSize; aSize.Width = aPageSize.Width(); aSize.Height = aPageSize.Height(); aRet[0].Value = makeAny(aSize); - + return aRet; } void SpaPrinterController::printPage( int ) const { const double DELTA = 5.0; - + boost::shared_ptr<Printer> pPrinter( getPrinter() ); PrinterInfo aInfo( psp::PrinterInfoManager::get().getPrinterInfo( pPrinter->GetName() ) ); @@ -708,7 +708,7 @@ void PADialog::RenameDevice() void PADialog::UpdateDevice() { m_aDevicesLB.Clear(); - + m_rPIManager.listPrinters( m_aPrinters ); ::std::list< OUString >::iterator it; for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it ) diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc index 2f238592231a..bd53ebdeb7b9 100644 --- a/padmin/source/padialog.hrc +++ b/padmin/source/padialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #define RID_PA_BTN_STD 2 #define RID_PA_BTN_DEL 3 #define RID_PA_LB_DEV 4 -#define RID_PA_FL_PRINTERS 5 +#define RID_PA_FL_PRINTERS 5 #define RID_PA_BTN_CONF 6 #define RID_PA_BTN_RENAME 7 #define RID_PA_TESTPAGE 8 @@ -50,7 +50,7 @@ #define RID_PA_BTN_ADD 19 #define RID_PA_BTN_ADDFONTS 20 #define RID_PA_STR_RENAME 21 -#define RID_PA_FL_SEPBUTTON 22 +#define RID_PA_FL_SEPBUTTON 22 #define RID_PA_FL_CUPSUSAGE 23 #define RID_PA_CB_CUPSUSAGE 23 @@ -59,7 +59,7 @@ #define RID_STRQRY_EDT_NEWNAME 2 #define RID_STRQRY_BTN_OK 3 #define RID_STRQRY_BTN_CANCEL 4 -#define RID_STRQRY_BOX_NEWNAME 5 +#define RID_STRQRY_BOX_NEWNAME 5 #define RID_PPDIMPORT_DLG 1004 #define RID_PPDIMP_BTN_OK 1 @@ -103,37 +103,37 @@ #define RID_FNTNM_BTN_REMOVE 3 #define RID_FNTNM_LB_FONTS 4 #define RID_FNTNM_BTN_IMPORT 5 -#define RID_FNTNM_BTN_RENAME 6 -#define RID_FNTNM_STR_RENAME 7 -#define RID_FNTNM_STR_TTCRENAME 8 -#define RID_FNTNM_STR_NOTRENAMABLE 9 - -#define RID_TXT_REFETCH 1031 - -#define RID_BXT_TESTPAGE 1034 -#define RID_BXT_ENVIRONMENT 1035 - -#define RID_YOU_SURE 1040 - -#define RID_ERR_REMOVEDRIVERFAILED 1041 - -#define RID_BUTTERFLY 1047 - -#define RID_COMMAND_TXT_MODIFY 1049 -#define RID_COMMAND_TXT_ADDENTRY 1050 -#define RID_ERR_REMOVESGENPRT 1051 -#define RID_PA_TXT_NOWRITE 1052 -#define RID_DOUBLEFONTFILE 1053 -#define RID_INVALIDFONTPATH 1054 -#define RID_TESTPAGESAVE 1055 -#define RID_FNTNM_FONTNAME_TXT 1056 -#define RID_FNTNM_NOFONT_TXT 1057 -#define RID_QUERY_REMOVEDRIVER 1058 -#define RID_QUERY_REMOVEPRINTER 1059 -#define RID_QUERY_REMOVEFONTFROMLIST 1060 -#define RID_QUERY_DRIVERUSED 1062 -#define RID_ERR_REMOVEDEFAULTDRIVER 1063 -#define RID_ERR_WRITEFONTSDIR 1064 +#define RID_FNTNM_BTN_RENAME 6 +#define RID_FNTNM_STR_RENAME 7 +#define RID_FNTNM_STR_TTCRENAME 8 +#define RID_FNTNM_STR_NOTRENAMABLE 9 + +#define RID_TXT_REFETCH 1031 + +#define RID_BXT_TESTPAGE 1034 +#define RID_BXT_ENVIRONMENT 1035 + +#define RID_YOU_SURE 1040 + +#define RID_ERR_REMOVEDRIVERFAILED 1041 + +#define RID_BUTTERFLY 1047 + +#define RID_COMMAND_TXT_MODIFY 1049 +#define RID_COMMAND_TXT_ADDENTRY 1050 +#define RID_ERR_REMOVESGENPRT 1051 +#define RID_PA_TXT_NOWRITE 1052 +#define RID_DOUBLEFONTFILE 1053 +#define RID_INVALIDFONTPATH 1054 +#define RID_TESTPAGESAVE 1055 +#define RID_FNTNM_FONTNAME_TXT 1056 +#define RID_FNTNM_NOFONT_TXT 1057 +#define RID_QUERY_REMOVEDRIVER 1058 +#define RID_QUERY_REMOVEPRINTER 1059 +#define RID_QUERY_REMOVEFONTFROMLIST 1060 +#define RID_QUERY_DRIVERUSED 1062 +#define RID_ERR_REMOVEDEFAULTDRIVER 1063 +#define RID_ERR_WRITEFONTSDIR 1064 #define RID_FONTIMPORT_DIALOG 1065 #define RID_FIMP_BTN_OK 1 @@ -143,7 +143,7 @@ #define RID_FIMP_FL_FROM 5 #define RID_FIMP_BTN_SELECTALL 6 #define RID_FIMP_BOX_NEWFONTS 7 -#define RID_FIMP_TXT_HELP 8 +#define RID_FIMP_TXT_HELP 8 #define RID_FIMP_STR_IMPORTOP 9 #define RID_FIMP_STR_QUERYOVERWRITE 10 #define RID_FIMP_STR_OVERWRITEALL 11 @@ -153,49 +153,49 @@ #define RID_FIMP_STR_FONTCOPYFAILED 15 #define RID_FIMP_STR_NOWRITEABLEFONTSDIR 16 #define RID_FIMP_STR_NUMBEROFFONTSIMPORTED 17 -#define RID_FIMP_BOX_LINKONLY 18 -#define RID_FIMP_BOX_SUBDIRS 19 -#define RID_FIMP_FL_TARGETOPTS 20 +#define RID_FIMP_BOX_LINKONLY 18 +#define RID_FIMP_BOX_SUBDIRS 19 +#define RID_FIMP_FL_TARGETOPTS 20 -#define RID_TXT_IMPORTTITLE 1066 +#define RID_TXT_IMPORTTITLE 1066 #define RID_TXT_FONTS2IMPORT 1067 -#define RID_TXT_TESTPAGE_MODEL 1068 -#define RID_TXT_TESTPAGE_QUEUE 1069 -#define RID_TXT_TESTPAGE_DATE 1070 -#define RID_TXT_TESTPAGE_TIME 1071 +#define RID_TXT_TESTPAGE_MODEL 1068 +#define RID_TXT_TESTPAGE_QUEUE 1069 +#define RID_TXT_TESTPAGE_DATE 1070 +#define RID_TXT_TESTPAGE_TIME 1071 #define RID_TXT_PRINTERALREADYEXISTS 1072 -#define RID_TXT_PRINTERWITHOUTCOMMAND 1073 +#define RID_TXT_PRINTERWITHOUTCOMMAND 1073 #define RID_TXT_PRINTERADDFAILED 1074 -#define RID_TXT_DRIVERDOESNOTEXIST 1075 +#define RID_TXT_DRIVERDOESNOTEXIST 1075 #define RID_TXT_TESTPAGE_COMMENT 1076 -#define RID_TXT_TESTPAGE_NAME 1077 - -#define RID_TXT_FONT_ITALIC 1078 -#define RID_TXT_FONT_OBLIQUE 1079 -#define RID_TXT_FONT_THIN 1080 -#define RID_TXT_FONT_ULTRALIGHT 1081 -#define RID_TXT_FONT_LIGHT 1082 -#define RID_TXT_FONT_SEMILIGHT 1083 -#define RID_TXT_FONT_SEMIBOLD 1084 -#define RID_TXT_FONT_BOLD 1085 -#define RID_TXT_FONT_ULTRABOLD 1086 -#define RID_TXT_FONT_ULTRACONDENSED 1087 -#define RID_TXT_FONT_EXTRACONDENSED 1088 -#define RID_TXT_FONT_CONDENSED 1089 +#define RID_TXT_TESTPAGE_NAME 1077 + +#define RID_TXT_FONT_ITALIC 1078 +#define RID_TXT_FONT_OBLIQUE 1079 +#define RID_TXT_FONT_THIN 1080 +#define RID_TXT_FONT_ULTRALIGHT 1081 +#define RID_TXT_FONT_LIGHT 1082 +#define RID_TXT_FONT_SEMILIGHT 1083 +#define RID_TXT_FONT_SEMIBOLD 1084 +#define RID_TXT_FONT_BOLD 1085 +#define RID_TXT_FONT_ULTRABOLD 1086 +#define RID_TXT_FONT_ULTRACONDENSED 1087 +#define RID_TXT_FONT_EXTRACONDENSED 1088 +#define RID_TXT_FONT_CONDENSED 1089 #define RID_TXT_FONT_SEMICONDENSED 1090 -#define RID_TXT_FONT_SEMIEXPANDED 1091 -#define RID_TXT_FONT_EXPANDED 1092 -#define RID_TXT_FONT_EXTRAEXPANDED 1093 -#define RID_TXT_FONT_ULTRAEXPANDED 1094 -#define RID_TXT_FONT_REGULAR 1095 +#define RID_TXT_FONT_SEMIEXPANDED 1091 +#define RID_TXT_FONT_EXPANDED 1092 +#define RID_TXT_FONT_EXTRAEXPANDED 1093 +#define RID_TXT_FONT_ULTRAEXPANDED 1094 +#define RID_TXT_FONT_REGULAR 1095 -#define RID_BMP_SMALL_PRINTER 1096 +#define RID_BMP_SMALL_PRINTER 1096 #define RID_BMP_SMALL_PRINTER_HC 1097 -#define RID_BMP_SMALL_FAX 1098 +#define RID_BMP_SMALL_FAX 1098 #define RID_BMP_SMALL_FAX_HC 1099 -#define RID_BMP_SMALL_PDF 1100 +#define RID_BMP_SMALL_PDF 1100 #define RID_BMP_SMALL_PDF_HC 1101 -#define RID_BMP_PRINTER 1102 +#define RID_BMP_PRINTER 1102 #define RID_BMP_PRINTER_HC 1103 #define RID_AFMERROR_OK 1300 @@ -229,7 +229,7 @@ #define RID_ADDP_BTN_PREV 4 #define RID_ADDP_LINE 5 #define RID_ADDP_CTRL_TITLE 6 -#define RID_ADDP_STR_TITLE 127 +#define RID_ADDP_STR_TITLE 127 #define RID_ADDP_PAGE_CHOOSEDEV 2001 #define RID_ADDP_CHDEV_TXT_OVER 1 diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 915158bc6eca..2baa3dd66183 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,52 +48,52 @@ namespace psp { class PrinterInfoManager; } class Printer; namespace padmin { - + class PADialog : public ModalDialog { private: - DelListBox m_aDevicesLB; - PushButton m_aConfPB; - PushButton m_aRenamePB; - PushButton m_aStdPB; - PushButton m_aRemPB; - PushButton m_aTestPagePB; - FixedLine m_aPrintersFL; - FixedText m_aDriverTxt; - FixedText m_aDriver; - FixedText m_aLocationTxt; - FixedText m_aLocation; - FixedText m_aCommandTxt; - FixedText m_aCommand; - FixedText m_aCommentTxt; - FixedText m_aComment; - + DelListBox m_aDevicesLB; + PushButton m_aConfPB; + PushButton m_aRenamePB; + PushButton m_aStdPB; + PushButton m_aRemPB; + PushButton m_aTestPagePB; + FixedLine m_aPrintersFL; + FixedText m_aDriverTxt; + FixedText m_aDriver; + FixedText m_aLocationTxt; + FixedText m_aLocation; + FixedText m_aCommandTxt; + FixedText m_aCommand; + FixedText m_aCommentTxt; + FixedText m_aComment; + FixedLine m_aCUPSFL; CheckBox m_aCUPSCB; - FixedLine m_aSepButtonFL; - PushButton m_aAddPB; - PushButton m_aFontsPB; - CancelButton m_aCancelButton; + FixedLine m_aSepButtonFL; + PushButton m_aAddPB; + PushButton m_aFontsPB; + CancelButton m_aCancelButton; - String m_aDefPrt; - String m_aRenameStr; + String m_aDefPrt; + String m_aRenameStr; - ::psp::PrinterInfoManager& m_rPIManager; - ::std::list< ::rtl::OUString > m_aPrinters; - - Image m_aPrinterImg; - Image m_aFaxImg; - Image m_aPdfImg; + ::psp::PrinterInfoManager& m_rPIManager; + ::std::list< ::rtl::OUString > m_aPrinters; + Image m_aPrinterImg; + Image m_aFaxImg; + Image m_aPdfImg; + DECL_LINK( ClickBtnHdl, PushButton* ); DECL_LINK( DoubleClickHdl, ListBox* ); DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( DelPressedHdl, ListBox* ); - + PADialog( Window*, BOOL ); void Init(); - + void UpdateDefPrt(); void UpdateText(); void UpdateDevice(); @@ -103,14 +103,14 @@ namespace padmin { void RenameDevice(); void PrintTestPage(); void updateSettings(); - + virtual long Notify( NotifyEvent& rEv ); virtual void DataChanged( const DataChangedEvent& rEv ); - + String getSelectedDevice(); public: ~PADialog(); - + static PADialog* Create( Window*, BOOL ); }; diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index 8834bba3226c..0cd2d40567fb 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ ModalDialog RID_PADIALOG Size = MAP_APPFONT( 168, 8 ); Text [ en-US ] = "Disable CUPS Support"; }; - + FixedLine RID_PA_FL_SEPBUTTON { Pos = MAP_APPFONT( 0, 176 ); @@ -265,7 +265,7 @@ ModalDialog RID_PADIALOG Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Test ~Page"; }; - + PushButton RID_PA_BTN_FONTS { Pos = MAP_APPFONT( 80, 181 ); @@ -284,7 +284,7 @@ ModalDialog RID_PADIALOG Text [ en-US ] = "Default printer"; }; String RID_PA_STR_RENAME - { + { Text [ en-US ] = "Rename"; }; Text [ en-US ] = "Printer Administration"; @@ -820,19 +820,19 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV Pos = MAP_APPFONT ( 40, 40 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Add a ~printer"; - }; + }; RadioButton RID_ADDP_CHDEV_BTN_FAX { Pos = MAP_APPFONT ( 40, 50 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a fa~x device"; - }; + }; RadioButton RID_ADDP_CHDEV_BTN_PDF { Pos = MAP_APPFONT ( 40, 60 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a P~DF converter"; - }; + }; RadioButton RID_ADDP_CHDEV_BTN_OLD { Pos = MAP_APPFONT ( 40, 70 ); diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx index 16968a843a83..352b54b1bf82 100644 --- a/padmin/source/pamain.cxx +++ b/padmin/source/pamain.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,9 +59,9 @@ using namespace comphelper; class MyApp : public Application { public: - void Main(); - virtual USHORT Exception( USHORT nError ); - + void Main(); + virtual USHORT Exception( USHORT nError ); + static void ReadStringHook( String& ); }; @@ -114,7 +114,7 @@ void MyApp::Main() catch( com::sun::star::uno::Exception& rExc) { } - + if( ! xFactory.is() ) { fprintf( stderr, "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" ); @@ -126,7 +126,7 @@ void MyApp::Main() new DesktopContext( com::sun::star::uno::getCurrentContext() ) ); /* - * Create UCB. + * Create UCB. */ Sequence< Any > aArgs( 2 ); aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); @@ -143,11 +143,11 @@ void MyApp::Main() exit( 1 ); } #endif - + /* - * Initialize the Java UNO AccessBridge if accessibility is turned on + * Initialize the Java UNO AccessBridge if accessibility is turned on */ - + if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ) { BOOL bQuitApp; @@ -158,7 +158,7 @@ void MyApp::Main() // initialize test-tool library (if available) tools::InitTestToolLib(); - + ResMgr::SetReadStringHook( MyApp::ReadStringHook ); pPADialog = PADialog::Create( NULL , FALSE ); diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx index 467541fbb53c..7c6bea85fc87 100644 --- a/padmin/source/progress.cxx +++ b/padmin/source/progress.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx index 50449ac6d520..6f767099d083 100644 --- a/padmin/source/progress.hxx +++ b/padmin/source/progress.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,26 +39,26 @@ namespace padmin { class ProgressDialog : public ModelessDialog { - FixedText maOperation; - FixedText maFilename; - FixedText maProgressTxt; - CancelButton maCancelButton; - ProgressBar maProgressBar; - + FixedText maOperation; + FixedText maFilename; + FixedText maProgressTxt; + CancelButton maCancelButton; + ProgressBar maProgressBar; + int mnMax, mnMin; BOOL mbCanceled; - + public: ProgressDialog( Window*, BOOL bCancelable = TRUE, int nMin = 0, int nMax = 100 ); ~ProgressDialog(); - + DECL_LINK( ClickBtnHdl, Button* ); - + void setValue( int nValue ); void setRange( int nMin, int nMax ) { mnMin = nMin; mnMax = nMax; } void startOperation( const String& ); void setFilename( const String& ); - + BOOL isCanceled() { return mbCanceled; } }; diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 3d9b4e51b0cb..04d58b538167 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,12 +50,12 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con const PPDValue* pValue = NULL; USHORT nPos = 0; String aOptionText; - + for( int i = 0; i < pKey->countValues(); i++ ) { pValue = pKey->getValue( i ); aOptionText = pParser->translateOption( pKey->getKey(), pValue->m_aOption) ; - + if( m_aJobData.m_aContext.checkConstraints( pKey, pValue ) ) { if( rBox.GetEntryPos( (void*)pValue ) == LISTBOX_ENTRY_NOTFOUND ) @@ -173,8 +173,8 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl ) { switch( nId ) { - case RID_RTS_PAPERPAGE: m_pPaperPage->update();break; - case RID_RTS_DEVICEPAGE: m_pDevicePage->update();break; + case RID_RTS_PAPERPAGE: m_pPaperPage->update();break; + case RID_RTS_DEVICEPAGE: m_pDevicePage->update();break; default: break; } } @@ -196,9 +196,9 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) } if( m_pDevicePage ) { - m_aJobData.m_nColorDepth = m_pDevicePage->getDepth(); - m_aJobData.m_nColorDevice = m_pDevicePage->getColorDevice(); - m_aJobData.m_nPSLevel = m_pDevicePage->getLevel(); + m_aJobData.m_nColorDepth = m_pDevicePage->getDepth(); + m_aJobData.m_nColorDevice = m_pDevicePage->getColorDevice(); + m_aJobData.m_nPSLevel = m_pDevicePage->getLevel(); } if( m_pOtherPage ) // write other settings @@ -206,7 +206,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) if( m_pCommandPage ) // write command settings m_pCommandPage->save(); - + EndDialog( 1 ); } else if( pButton == &m_aCancelButton ) @@ -225,7 +225,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) : TabPage( & pParent->m_aTabControl, PaResId( RID_RTS_PAPERPAGE ) ), m_pParent( pParent ), - + m_aPaperText( this, PaResId( RID_RTS_PAPER_PAPER_TXT ) ), m_aPaperBox( this, PaResId( RID_RTS_PAPER_PAPER_BOX ) ), m_aOrientText( this, PaResId( RID_RTS_PAPER_ORIENTATION_TXT ) ), @@ -243,7 +243,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) : FreeResource(); USHORT nPos = 0; - + m_aOrientBox.InsertEntry( PORTRAIT_STRING ); m_aOrientBox.InsertEntry( LSCAPE_STRING ); // duplex @@ -269,13 +269,13 @@ RTSPaperPage::~RTSPaperPage() void RTSPaperPage::update() { - const PPDKey* pKey = NULL; - + const PPDKey* pKey = NULL; + // orientation m_aOrientBox.SelectEntry( m_pParent->m_aJobData.m_eOrientation == orientation::Landscape ? LSCAPE_STRING : PORTRAIT_STRING ); - + // duplex if( m_pParent->m_aJobData.m_pParser && (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) )) ) @@ -393,7 +393,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) : m_aLevelBox.SelectEntry( m_pParent->m_aFromDriverString ); else m_aLevelBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nPSLevel ) ); - + m_aDepthBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nColorDepth ).AppendAscii( " Bit" ) ); // fill ppd boxes @@ -402,10 +402,10 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) : for( int i = 0; i < m_pParent->m_aJobData.m_pParser->getKeys(); i++ ) { const PPDKey* pKey = m_pParent->m_aJobData.m_pParser->getKey( i ); - if( pKey->isUIKey() && - ! pKey->getKey().EqualsAscii( "PageSize" ) && - ! pKey->getKey().EqualsAscii( "InputSlot" ) && - ! pKey->getKey().EqualsAscii( "PageRegion" ) && + if( pKey->isUIKey() && + ! pKey->getKey().EqualsAscii( "PageSize" ) && + ! pKey->getKey().EqualsAscii( "InputSlot" ) && + ! pKey->getKey().EqualsAscii( "PageRegion" ) && ! pKey->getKey().EqualsAscii( "Duplex" ) ) { @@ -534,10 +534,10 @@ void RTSOtherPage::initValues() nMarginBottom ); } - nMarginLeft += m_pParent->m_aJobData.m_nLeftMarginAdjust; - nMarginRight += m_pParent->m_aJobData.m_nRightMarginAdjust; - nMarginTop += m_pParent->m_aJobData.m_nTopMarginAdjust; - nMarginBottom += m_pParent->m_aJobData.m_nBottomMarginAdjust; + nMarginLeft += m_pParent->m_aJobData.m_nLeftMarginAdjust; + nMarginRight += m_pParent->m_aJobData.m_nRightMarginAdjust; + nMarginTop += m_pParent->m_aJobData.m_nTopMarginAdjust; + nMarginBottom += m_pParent->m_aJobData.m_nBottomMarginAdjust; m_aLeftLB.SetValue( nMarginLeft, FUNIT_POINT ); m_aRightLB.SetValue( nMarginRight, FUNIT_POINT ); @@ -565,10 +565,10 @@ void RTSOtherPage::save() nMarginBottom ); } - m_pParent->m_aJobData.m_nLeftMarginAdjust = m_aLeftLB.GetValue( FUNIT_POINT ) - nMarginLeft; - m_pParent->m_aJobData.m_nRightMarginAdjust = m_aRightLB.GetValue( FUNIT_POINT ) - nMarginRight; - m_pParent->m_aJobData.m_nTopMarginAdjust = m_aTopLB.GetValue( FUNIT_POINT ) - nMarginTop; - m_pParent->m_aJobData.m_nBottomMarginAdjust = m_aBottomLB.GetValue( FUNIT_POINT ) - nMarginBottom; + m_pParent->m_aJobData.m_nLeftMarginAdjust = m_aLeftLB.GetValue( FUNIT_POINT ) - nMarginLeft; + m_pParent->m_aJobData.m_nRightMarginAdjust = m_aRightLB.GetValue( FUNIT_POINT ) - nMarginRight; + m_pParent->m_aJobData.m_nTopMarginAdjust = m_aTopLB.GetValue( FUNIT_POINT ) - nMarginTop; + m_pParent->m_aJobData.m_nBottomMarginAdjust = m_aBottomLB.GetValue( FUNIT_POINT ) - nMarginBottom; m_pParent->m_aJobData.m_aComment = m_aCommentEdt.GetText(); } @@ -583,7 +583,7 @@ IMPL_LINK( RTSOtherPage, ClickBtnHdl, Button*, pButton ) m_pParent->m_aJobData.m_nTopMarginAdjust = m_pParent->m_aJobData.m_nBottomMarginAdjust = 0; - initValues(); + initValues(); } return 0; } @@ -591,7 +591,7 @@ IMPL_LINK( RTSOtherPage, ClickBtnHdl, Button*, pButton ) // ------------------------------------------------------------------ /* - * RTSFontSubstPage + * RTSFontSubstPage */ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) : @@ -730,18 +730,18 @@ IMPL_LINK( RTSFontSubstPage, ClickBtnHdl, Button*, pButton ) class RTSPWDialog : public ModalDialog { - FixedText m_aText; - FixedText m_aUserText; - Edit m_aUserEdit; - FixedText m_aPassText; - Edit m_aPassEdit; - - OKButton m_aOKButton; - CancelButton m_aCancelButton; + FixedText m_aText; + FixedText m_aUserText; + Edit m_aUserEdit; + FixedText m_aPassText; + Edit m_aPassEdit; + + OKButton m_aOKButton; + CancelButton m_aCancelButton; public: RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent ); ~RTSPWDialog(); - + OString getUserName() const; OString getPassword() const; }; @@ -804,7 +804,7 @@ extern "C" { bool Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) { bool bRet = false; - + RTSPWDialog aDialog( rServer, rUserName, NULL ); if( aDialog.Execute() ) { diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx index 10a7b57e857b..c50205d7cf2b 100644 --- a/padmin/source/prtsetup.hxx +++ b/padmin/source/prtsetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,95 +59,95 @@ class RTSDialog : public TabDialog friend class RTSOtherPage; friend class RTSFontSubstPage; friend class RTSCommandPage; - - ::psp::PrinterInfo m_aJobData; - String m_aPrinter; - + + ::psp::PrinterInfo m_aJobData; + String m_aPrinter; + // controls - TabControl m_aTabControl; - OKButton m_aOKButton; - CancelButton m_aCancelButton; - + TabControl m_aTabControl; + OKButton m_aOKButton; + CancelButton m_aCancelButton; + // pages - RTSPaperPage* m_pPaperPage; - RTSDevicePage* m_pDevicePage; - RTSOtherPage* m_pOtherPage; - RTSFontSubstPage* m_pFontSubstPage; - RTSCommandPage* m_pCommandPage; - + RTSPaperPage* m_pPaperPage; + RTSDevicePage* m_pDevicePage; + RTSOtherPage* m_pOtherPage; + RTSFontSubstPage* m_pFontSubstPage; + RTSCommandPage* m_pCommandPage; + // some resources - String m_aInvalidString; - String m_aFromDriverString; - + String m_aInvalidString; + String m_aFromDriverString; + DECL_LINK( ActivatePage, TabControl* ); DECL_LINK( ClickButton, Button* ); - + // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); public: RTSDialog( const ::psp::PrinterInfo& rJobData, const String& rPrinter, bool bAllPages, Window* pParent = NULL ); ~RTSDialog(); - + const ::psp::PrinterInfo& getSetup() const { return m_aJobData; } }; - + class RTSPaperPage : public TabPage { - RTSDialog* m_pParent; - - FixedText m_aPaperText; - ListBox m_aPaperBox; - - FixedText m_aOrientText; - ListBox m_aOrientBox; - - FixedText m_aDuplexText; - ListBox m_aDuplexBox; - - FixedText m_aSlotText; - ListBox m_aSlotBox; - + RTSDialog* m_pParent; + + FixedText m_aPaperText; + ListBox m_aPaperBox; + + FixedText m_aOrientText; + ListBox m_aOrientBox; + + FixedText m_aDuplexText; + ListBox m_aDuplexBox; + + FixedText m_aSlotText; + ListBox m_aSlotBox; + DECL_LINK( SelectHdl, ListBox* ); public: RTSPaperPage( RTSDialog* ); ~RTSPaperPage(); - + void update(); - + String getOrientation() { return m_aOrientBox.GetSelectEntry(); } }; class RTSDevicePage : public TabPage { - RTSDialog* m_pParent; - - String m_aSpaceColor; - String m_aSpaceGray; - - FixedText m_aPPDKeyText; - ListBox m_aPPDKeyBox; - - FixedText m_aPPDValueText; - ListBox m_aPPDValueBox; - - FixedText m_aLevelText; - ListBox m_aLevelBox; - - FixedText m_aSpaceText; - ListBox m_aSpaceBox; - - FixedText m_aDepthText; - ListBox m_aDepthBox; - + RTSDialog* m_pParent; + + String m_aSpaceColor; + String m_aSpaceGray; + + FixedText m_aPPDKeyText; + ListBox m_aPPDKeyBox; + + FixedText m_aPPDValueText; + ListBox m_aPPDValueBox; + + FixedText m_aLevelText; + ListBox m_aLevelBox; + + FixedText m_aSpaceText; + ListBox m_aSpaceBox; + + FixedText m_aDepthText; + ListBox m_aDepthBox; + void FillValueBox( const ::psp::PPDKey* ); - + DECL_LINK( SelectHdl, ListBox* ); public: RTSDevicePage( RTSDialog* ); ~RTSDevicePage(); - + void update(); - + ULONG getLevel() { return m_aLevelBox.GetSelectEntry().ToInt32(); } ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); } ULONG getColorDevice() @@ -156,48 +156,48 @@ public: return aSpace == m_aSpaceColor ? 1 : ( aSpace == m_aSpaceGray ? -1 : 0 ); } }; - + class RTSOtherPage : public TabPage { - RTSDialog* m_pParent; - - FixedText m_aLeftTxt; - MetricField m_aLeftLB; - FixedText m_aTopTxt; - MetricField m_aTopLB; - FixedText m_aRightTxt; - MetricField m_aRightLB; - FixedText m_aBottomTxt; - MetricField m_aBottomLB; - FixedText m_aCommentTxt; - Edit m_aCommentEdt; - PushButton m_aDefaultBtn; - + RTSDialog* m_pParent; + + FixedText m_aLeftTxt; + MetricField m_aLeftLB; + FixedText m_aTopTxt; + MetricField m_aTopLB; + FixedText m_aRightTxt; + MetricField m_aRightLB; + FixedText m_aBottomTxt; + MetricField m_aBottomLB; + FixedText m_aCommentTxt; + Edit m_aCommentEdt; + PushButton m_aDefaultBtn; + void initValues(); - + DECL_LINK( ClickBtnHdl, Button *); - + public: RTSOtherPage( RTSDialog* ); ~RTSOtherPage(); - + void save(); }; class RTSFontSubstPage : public TabPage { - RTSDialog* m_pParent; + RTSDialog* m_pParent; - FixedText m_aSubstitutionsText; - DelMultiListBox m_aSubstitutionsBox; - FixedText m_aFromFontText; - ComboBox m_aFromFontBox; - FixedText m_aToFontText; - ListBox m_aToFontBox; + FixedText m_aSubstitutionsText; + DelMultiListBox m_aSubstitutionsBox; + FixedText m_aFromFontText; + ComboBox m_aFromFontBox; + FixedText m_aToFontText; + ListBox m_aToFontBox; - PushButton m_aAddButton; - PushButton m_aRemoveButton; - CheckBox m_aEnableBox; + PushButton m_aAddButton; + PushButton m_aRemoveButton; + CheckBox m_aEnableBox; DECL_LINK( ClickBtnHdl, Button* ); DECL_LINK( SelectHdl, ListBox* ); @@ -208,8 +208,8 @@ public: RTSFontSubstPage( RTSDialog* ); ~RTSFontSubstPage(); }; - -} // namespace + +} // namespace #endif // _PAD_PRTSETUP_HXX diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc index 30439088de8e..9fa500a4a329 100644 --- a/padmin/source/rtsetup.hrc +++ b/padmin/source/rtsetup.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,93 +28,93 @@ #ifndef _PAD_RTSETUP_HRC_ #define _PAD_RTSETUP_HRC_ -#define RID_RTS_RTSDIALOG 4001 -#define RID_RTS_RTSDIALOG_INVALID_TXT 1 -#define RID_RTS_RTSDIALOG_FROMDRIVER_TXT 2 -#define RID_RTS_RTSDIALOG_TABCONTROL 3 +#define RID_RTS_RTSDIALOG 4001 +#define RID_RTS_RTSDIALOG_INVALID_TXT 1 +#define RID_RTS_RTSDIALOG_FROMDRIVER_TXT 2 +#define RID_RTS_RTSDIALOG_TABCONTROL 3 -#define RID_RTS_OTHERPAGE 4002 -#define RID_RTS_OTHER_LEFTMARGIN_TXT 1 -#define RID_RTS_OTHER_LEFTMARGIN_BOX 2 -#define RID_RTS_OTHER_TOPMARGIN_TXT 3 -#define RID_RTS_OTHER_TOPMARGIN_BOX 4 -#define RID_RTS_OTHER_RIGHTMARGIN_TXT 5 -#define RID_RTS_OTHER_RIGHTMARGIN_BOX 6 -#define RID_RTS_OTHER_BOTTOMMARGIN_TXT 7 -#define RID_RTS_OTHER_BOTTOMMARGIN_BOX 8 -#define RID_RTS_OTHER_COMMENT_TXT 9 -#define RID_RTS_OTHER_COMMENT_EDT 10 -#define RID_RTS_OTHER_DEFAULT_BTN 11 +#define RID_RTS_OTHERPAGE 4002 +#define RID_RTS_OTHER_LEFTMARGIN_TXT 1 +#define RID_RTS_OTHER_LEFTMARGIN_BOX 2 +#define RID_RTS_OTHER_TOPMARGIN_TXT 3 +#define RID_RTS_OTHER_TOPMARGIN_BOX 4 +#define RID_RTS_OTHER_RIGHTMARGIN_TXT 5 +#define RID_RTS_OTHER_RIGHTMARGIN_BOX 6 +#define RID_RTS_OTHER_BOTTOMMARGIN_TXT 7 +#define RID_RTS_OTHER_BOTTOMMARGIN_BOX 8 +#define RID_RTS_OTHER_COMMENT_TXT 9 +#define RID_RTS_OTHER_COMMENT_EDT 10 +#define RID_RTS_OTHER_DEFAULT_BTN 11 -#define RID_RTS_DEVICEPAGE 4003 -#define RID_RTS_DEVICE_COLOR_TXT 1 -#define RID_RTS_DEVICE_GRAY_TXT 2 -#define RID_RTS_DEVICE_PPDKEY_TXT 3 -#define RID_RTS_DEVICE_PPDKEY_BOX 4 -#define RID_RTS_DEVICE_PPDVALUE_TXT 5 -#define RID_RTS_DEVICE_PPDVALUE_BOX 6 -#define RID_RTS_DEVICE_LEVEL_TXT 7 -#define RID_RTS_DEVICE_LEVEL_BOX 8 -#define RID_RTS_DEVICE_SPACE_TXT 9 -#define RID_RTS_DEVICE_SPACE_BOX 10 -#define RID_RTS_DEVICE_DEPTH_TXT 11 -#define RID_RTS_DEVICE_DEPTH_BOX 12 -#define RID_RTS_DEVICE_COMPRESS_BOX 13 +#define RID_RTS_DEVICEPAGE 4003 +#define RID_RTS_DEVICE_COLOR_TXT 1 +#define RID_RTS_DEVICE_GRAY_TXT 2 +#define RID_RTS_DEVICE_PPDKEY_TXT 3 +#define RID_RTS_DEVICE_PPDKEY_BOX 4 +#define RID_RTS_DEVICE_PPDVALUE_TXT 5 +#define RID_RTS_DEVICE_PPDVALUE_BOX 6 +#define RID_RTS_DEVICE_LEVEL_TXT 7 +#define RID_RTS_DEVICE_LEVEL_BOX 8 +#define RID_RTS_DEVICE_SPACE_TXT 9 +#define RID_RTS_DEVICE_SPACE_BOX 10 +#define RID_RTS_DEVICE_DEPTH_TXT 11 +#define RID_RTS_DEVICE_DEPTH_BOX 12 +#define RID_RTS_DEVICE_COMPRESS_BOX 13 -#define RID_RTS_PAPERPAGE 4004 -#define RID_RTS_PAPER_PAPER_TXT 1 -#define RID_RTS_PAPER_PAPER_BOX 2 -#define RID_RTS_PAPER_ORIENTATION_TXT 3 -#define RID_RTS_PAPER_ORIENTATION_BOX 4 -#define RID_RTS_PAPER_DUPLEX_TXT 5 -#define RID_RTS_PAPER_DUPLEX_BOX 6 -#define RID_RTS_PAPER_SLOT_TXT 7 -#define RID_RTS_PAPER_SLOT_BOX 8 +#define RID_RTS_PAPERPAGE 4004 +#define RID_RTS_PAPER_PAPER_TXT 1 +#define RID_RTS_PAPER_PAPER_BOX 2 +#define RID_RTS_PAPER_ORIENTATION_TXT 3 +#define RID_RTS_PAPER_ORIENTATION_BOX 4 +#define RID_RTS_PAPER_DUPLEX_TXT 5 +#define RID_RTS_PAPER_DUPLEX_BOX 6 +#define RID_RTS_PAPER_SLOT_TXT 7 +#define RID_RTS_PAPER_SLOT_BOX 8 -#define RID_RTS_FONTSUBSTPAGE 4005 -#define RID_RTS_FS_SUBST_TXT 1 -#define RID_RTS_FS_SUBST_BOX 2 -#define RID_RTS_FS_FROM_TXT 3 -#define RID_RTS_FS_FROM_BOX 4 -#define RID_RTS_FS_TO_TXT 5 -#define RID_RTS_FS_TO_BOX 6 -#define RID_RTS_FS_ADD_BTN 7 -#define RID_RTS_FS_REMOVE_BTN 8 -#define RID_RTS_FS_ENABLE_BTN 9 +#define RID_RTS_FONTSUBSTPAGE 4005 +#define RID_RTS_FS_SUBST_TXT 1 +#define RID_RTS_FS_SUBST_BOX 2 +#define RID_RTS_FS_FROM_TXT 3 +#define RID_RTS_FS_FROM_BOX 4 +#define RID_RTS_FS_TO_TXT 5 +#define RID_RTS_FS_TO_BOX 6 +#define RID_RTS_FS_ADD_BTN 7 +#define RID_RTS_FS_REMOVE_BTN 8 +#define RID_RTS_FS_ENABLE_BTN 9 #define RID_RTS_COMMANDPAGE 4006 -#define RID_RTS_CMD_TXT_PRTNAME 1 -#define RID_RTS_CMD_TXT_CONNECT 2 -#define RID_RTS_CMD_FL_DEFAULT 3 -#define RID_RTS_CMD_BTN_HELP 4 -#define RID_RTS_CMD_CB_COMMANDS 5 -#define RID_RTS_CMD_FL_INSTALL 6 -#define RID_RTS_CMD_TXT_CONFIGURE 7 -#define RID_RTS_CMD_LB_CONFIGURE 8 -#define RID_RTS_CMD_STR_CONFIGURE_PRINTER 9 -#define RID_RTS_CMD_STR_CONFIGURE_FAX 10 -#define RID_RTS_CMD_STR_CONFIGURE_PDF 11 -#define RID_RTS_CMD_STR_PRINTERHELP 12 -#define RID_RTS_CMD_STR_FAXHELP 13 -#define RID_RTS_CMD_STR_PDFHELP 14 -#define RID_RTS_CMD_BTN_REMOVE 15 -#define RID_RTS_CMD_EDT_PDFDIR 16 -#define RID_RTS_CMD_BTN_PDFDIR 17 -#define RID_RTS_CMD_TXT_PDFDIR 18 -#define RID_RTS_CMD_BOX_SWALLOWFAXNO 19 +#define RID_RTS_CMD_TXT_PRTNAME 1 +#define RID_RTS_CMD_TXT_CONNECT 2 +#define RID_RTS_CMD_FL_DEFAULT 3 +#define RID_RTS_CMD_BTN_HELP 4 +#define RID_RTS_CMD_CB_COMMANDS 5 +#define RID_RTS_CMD_FL_INSTALL 6 +#define RID_RTS_CMD_TXT_CONFIGURE 7 +#define RID_RTS_CMD_LB_CONFIGURE 8 +#define RID_RTS_CMD_STR_CONFIGURE_PRINTER 9 +#define RID_RTS_CMD_STR_CONFIGURE_FAX 10 +#define RID_RTS_CMD_STR_CONFIGURE_PDF 11 +#define RID_RTS_CMD_STR_PRINTERHELP 12 +#define RID_RTS_CMD_STR_FAXHELP 13 +#define RID_RTS_CMD_STR_PDFHELP 14 +#define RID_RTS_CMD_BTN_REMOVE 15 +#define RID_RTS_CMD_EDT_PDFDIR 16 +#define RID_RTS_CMD_BTN_PDFDIR 17 +#define RID_RTS_CMD_TXT_PDFDIR 18 +#define RID_RTS_CMD_BOX_SWALLOWFAXNO 19 #define RID_RTS_CMD_CB_EXTERNAL 20 #define RID_RTS_CMD_FT_QUICKCMD 21 #define RIT_RTS_CMD_CB_QUICKCMD 22 -#define RID_TXT_QUERYFAXNUMBER 4007 +#define RID_TXT_QUERYFAXNUMBER 4007 -#define RID_RTS_PWDIALOG 4008 -#define RID_RTS_PWDIALOG_TXT 1 -#define RID_RTS_PWDIALOG_USER_TXT 2 -#define RID_RTS_PWDIALOG_USER_EDT 3 -#define RID_RTS_PWDIALOG_PASS_TXT 4 -#define RID_RTS_PWDIALOG_PASS_EDT 5 -#define RID_RTS_PWDIALOG_OK_BTN 6 -#define RID_RTS_PWDIALOG_CANCEL_BTN 7 +#define RID_RTS_PWDIALOG 4008 +#define RID_RTS_PWDIALOG_TXT 1 +#define RID_RTS_PWDIALOG_USER_TXT 2 +#define RID_RTS_PWDIALOG_USER_EDT 3 +#define RID_RTS_PWDIALOG_PASS_TXT 4 +#define RID_RTS_PWDIALOG_PASS_EDT 5 +#define RID_RTS_PWDIALOG_OK_BTN 6 +#define RID_RTS_PWDIALOG_CANCEL_BTN 7 #endif diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index e04374a72245..d439928220ae 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -337,7 +337,7 @@ TabPage RID_RTS_COMMANDPAGE { Text [ en-US ] = "PDF converter"; }; - + ListBox RID_RTS_CMD_LB_CONFIGURE { DropDown = true; diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh index 3d8aa73e846b..b57fd63cf894 100644 --- a/padmin/source/spadmin.sh +++ b/padmin/source/spadmin.sh @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ export SAL_ENABLE_FILE_LOCKING sd_cwd="`pwd`" if [ -h "$0" ] ; then sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` + sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` cd "`dirname "$0"`" cd "`dirname "$sd_script"`" else diff --git a/padmin/source/titlectrl.cxx b/padmin/source/titlectrl.cxx index 1b67939099aa..ccd31fdebef6 100644 --- a/padmin/source/titlectrl.cxx +++ b/padmin/source/titlectrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/padmin/source/titlectrl.hxx b/padmin/source/titlectrl.hxx index df5a70bb07c9..c1fa2c1a8865 100644 --- a/padmin/source/titlectrl.hxx +++ b/padmin/source/titlectrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,13 +37,13 @@ namespace padmin class TitleImage : public Control { - Image m_aImage; - String m_aText; - Color m_aBGColor; - Point m_aImagePos; - Point m_aTextPos; + Image m_aImage; + String m_aText; + Color m_aBGColor; + Point m_aImagePos; + Point m_aTextPos; - bool m_bArranged; + bool m_bArranged; void arrange(); public: |