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

INTEGRATION: CWS cups01 (1.10.34); FILE MERGED

Browse source 
2003/08/15 13:21:13 pl 1.10.34.1: removed a bunch of warnings
This commit is contained in:
Oliver Bolte 2004-03-17 09:44:23 +00:00
parent d15776888e
commit b2794e6c37
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
padmin/source/fontentry.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: fontentry.cxx,v $ * $RCSfile: fontentry.cxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: vg $ $Date: 2003-04-15 17:21:31 $ * last change: $Author: obo $ $Date: 2004-03-17 10:44:23 $
* *
* 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
@ -186,12 +186,12 @@ static void CreateAfmFile( const INetURLObject& rFontFile )
FontNameDlg::FontNameDlg( Window *pParent ) : FontNameDlg::FontNameDlg( Window *pParent ) :
ModalDialog( pParent, PaResId( RID_FONTNAMEDIALOG ) ), ModalDialog( pParent, PaResId( RID_FONTNAMEDIALOG ) ),
m_aFixedText( this, PaResId( RID_FNTNM_FIXED ) ),
m_aOKButton( this, PaResId( RID_FNTNM_BTN_OK ) ), m_aOKButton( this, PaResId( RID_FNTNM_BTN_OK ) ),
m_aRemoveButton( this, PaResId( RID_FNTNM_BTN_REMOVE ) ),
m_aRenameButton( this, PaResId( RID_FNTNM_BTN_RENAME ) ), m_aRenameButton( this, PaResId( RID_FNTNM_BTN_RENAME ) ),
m_aFontBox( this, PaResId( RID_FNTNM_LB_FONTS ) ), m_aRemoveButton( this, PaResId( RID_FNTNM_BTN_REMOVE ) ),
m_aImportButton( this, PaResId( RID_FNTNM_BTN_IMPORT ) ), m_aImportButton( this, PaResId( RID_FNTNM_BTN_IMPORT ) ),
m_aFontBox( this, PaResId( RID_FNTNM_LB_FONTS ) ),
m_aFixedText( this, PaResId( RID_FNTNM_FIXED ) ),
m_aRenameString( PaResId( RID_FNTNM_STR_RENAME ) ), m_aRenameString( PaResId( RID_FNTNM_STR_RENAME ) ),
m_aRenameTTCString( PaResId( RID_FNTNM_STR_TTCRENAME ) ), m_aRenameTTCString( PaResId( RID_FNTNM_STR_TTCRENAME ) ),
m_aNoRenameString( PaResId( RID_FNTNM_STR_NOTRENAMABLE ) ), m_aNoRenameString( PaResId( RID_FNTNM_STR_NOTRENAMABLE ) ),
@ -473,12 +473,12 @@ FontImportDialog::FontImportDialog( Window* pParent ) :
ModalDialog( pParent, PaResId( RID_FONTIMPORT_DIALOG ) ), ModalDialog( pParent, PaResId( RID_FONTIMPORT_DIALOG ) ),
m_aOKBtn( this, PaResId( RID_FIMP_BTN_OK ) ), m_aOKBtn( this, PaResId( RID_FIMP_BTN_OK ) ),
m_aCancelBtn( this, PaResId( RID_FIMP_BTN_CANCEL ) ), m_aCancelBtn( this, PaResId( RID_FIMP_BTN_CANCEL ) ),
m_aSelectAllBtn( this, PaResId( RID_FIMP_BTN_SELECTALL ) ),
m_aNewFontsBox( this, PaResId( RID_FIMP_BOX_NEWFONTS ) ),
m_aFromFL( this, PaResId( RID_FIMP_FL_FROM ) ), m_aFromFL( this, PaResId( RID_FIMP_FL_FROM ) ),
m_aFromDirEdt( this, PaResId( RID_FIMP_EDT_FROM ) ), m_aFromDirEdt( this, PaResId( RID_FIMP_EDT_FROM ) ),
m_aFromBtn( this, PaResId( RID_FIMP_BTN_FROM ) ), m_aFromBtn( this, PaResId( RID_FIMP_BTN_FROM ) ),
m_aLinkOnlyBox( this, PaResId( RID_FIMP_BOX_LINKONLY ) ), m_aLinkOnlyBox( this, PaResId( RID_FIMP_BOX_LINKONLY ) ),
m_aSelectAllBtn( this, PaResId( RID_FIMP_BTN_SELECTALL ) ),
m_aNewFontsBox( this, PaResId( RID_FIMP_BOX_NEWFONTS ) ),
m_aFixedText( this, PaResId( RID_FIMP_TXT_HELP ) ), m_aFixedText( this, PaResId( RID_FIMP_TXT_HELP ) ),
m_bOverwriteAll( false ), m_bOverwriteAll( false ),
m_bOverwriteNone( false ), m_bOverwriteNone( false ),
@ -524,8 +524,11 @@ void FontImportDialog::importFontsFailed( ::psp::PrintFontManager::ImportFontCal
String aText; String aText;
switch( eReason ) switch( eReason )
{ {
case ::psp::PrintFontManager::ImportFontCallback::NoWritableDirectory: case psp::PrintFontManager::ImportFontCallback::NoWritableDirectory:
aText = m_aNoWritableFontsDirText; aText = m_aNoWritableFontsDirText;
break;
default:
break;
} }
ErrorBox aBox( m_pProgress ? (Window*)m_pProgress : (Window*)this, WB_OK | WB_DEF_OK, aText ); ErrorBox aBox( m_pProgress ? (Window*)m_pProgress : (Window*)this, WB_OK | WB_DEF_OK, aText );
aBox.Execute(); aBox.Execute();
@ -570,15 +573,17 @@ void FontImportDialog::importFontFailed( const ::rtl::OUString& rFile, ::psp::Pr
String aText; String aText;
switch( eReason ) switch( eReason )
{ {
case ::psp::PrintFontManager::ImportFontCallback::NoAfmMetric: case psp::PrintFontManager::ImportFontCallback::NoAfmMetric:
aText = m_aNoAfmText; aText = m_aNoAfmText;
break; break;
case ::psp::PrintFontManager::ImportFontCallback::AfmCopyFailed: case psp::PrintFontManager::ImportFontCallback::AfmCopyFailed:
aText = m_aAfmCopyFailedText; aText = m_aAfmCopyFailedText;
break; break;
case ::psp::PrintFontManager::ImportFontCallback::FontCopyFailed: case psp::PrintFontManager::ImportFontCallback::FontCopyFailed:
aText = m_aFontCopyFailedText; aText = m_aFontCopyFailedText;
break; break;
default:
break;
} }
aText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), rFile ); aText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), rFile );
ErrorBox aBox( m_pProgress ? (Window*)m_pProgress : (Window*)this, WB_OK | WB_DEF_OK, aText ); ErrorBox aBox( m_pProgress ? (Window*)m_pProgress : (Window*)this, WB_OK | WB_DEF_OK, aText );