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

INTEGRATION: CWS residcleanup (1.8.60); FILE MERGED

Browse source 
2007/02/28 21:10:09 pl 1.8.60.1: #i74635# no more ResMgr fallback
This commit is contained in:
Rüdiger Timm 2007-04-26 07:13:01 +00:00
parent dbb1272caf
commit 87554d5440
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
filter/source/xsltdialog/xmlfileview.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: xmlfileview.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: rt $ $Date: 2006-12-01 14:33:44 $
* last change: $Author: rt $ $Date: 2007-04-26 08:12:15 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -559,12 +559,12 @@ void XMLFileWindow::showLine( sal_Int32 nLine )
XMLSourceFileDialog::XMLSourceFileDialog( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF )
: WorkWindow( pParent, ResId( DLG_XML_SOURCE_FILE_DIALOG, &rResMgr ) ),
: WorkWindow( pParent, ResId( DLG_XML_SOURCE_FILE_DIALOG, rResMgr ) ),
mnOutputHeight( LogicToPixel( Size( 80, 80 ), MAP_APPFONT ).Height() ),
mxMSF( rxMSF ),
mrResMgr( rResMgr ),
maLBOutput( this ),
maPBValidate( this, ResId( PB_VALIDATE, &rResMgr ) )
maPBValidate( this, ResId( PB_VALIDATE, rResMgr ) )
{
FreeResource();

10
filter/source/xsltdialog/xmlfiltertabdialog.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: xmlfiltertabdialog.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: rt $ $Date: 2006-12-01 14:35:11 $
* last change: $Author: rt $ $Date: 2007-04-26 08:13:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -71,10 +71,10 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const Reference< XMultiServiceFactory >& rxMSF, const filter_info_impl* pInfo ) :
TabDialog( pParent, ResId( DLG_XML_FILTER_TABDIALOG, &rResMgr ) ),
TabDialog( pParent, ResId( DLG_XML_FILTER_TABDIALOG, rResMgr ) ),
mxMSF( rxMSF ),
mrResMgr( rResMgr ),
maTabCtrl( this, ResId( 1, &rResMgr ) ),
maTabCtrl( this, ResId( 1, rResMgr ) ),
maOKBtn( this ),
maCancelBtn( this ),
maHelpBtn( this )
@ -320,7 +320,7 @@ bool XMLFilterTabDialog::onOk()
maTabCtrl.SetCurPageId( (USHORT)nErrorPage );
ActivatePageHdl( &maTabCtrl );
ResId aResId( nErrorId, &mrResMgr );
ResId aResId( nErrorId, mrResMgr );
String aMessage( aResId );
if( aReplace2.Len() )