INTEGRATION: CWS mergebuild (1.22.26); FILE MERGED

2004/04/20 16:27:12 hjs 1.22.26.2: RESYNC: (1.22-1.23); FILE MERGED
2004/01/29 14:38:35 hjs 1.22.26.1: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun::lang::Locale
This commit is contained in:
Hans-Joachim Lankenau 2004-06-25 11:35:09 +00:00
parent a0845e8561
commit be1466482b

View file

@ -2,9 +2,9 @@
*
* $RCSfile: eps.cxx,v $
*
* $Revision: 1.23 $
* $Revision: 1.24 $
*
* last change: $Author: vg $ $Date: 2004-01-06 15:04:37 $
* last change: $Author: hjs $ $Date: 2004-06-25 12:35:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -345,7 +345,7 @@ BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream,
ResMgr* pResMgr;
aResMgrName.Append( ByteString::CreateFromInt32( SOLARUPD ) );
pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILanguage() );
pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
if( pResMgr )
{
@ -474,7 +474,7 @@ BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream,
ByteString aResMgrName( "eps" );
ResMgr* pResMgr;
aResMgrName.Append( ByteString::CreateFromInt32( SOLARUPD ) );
pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILanguage() );
pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
if( pResMgr )
{
InfoBox aInfoBox( NULL, String( ResId( KEY_VERSION_CHECK, pResMgr ) ) );
@ -2781,7 +2781,7 @@ extern "C" BOOL __LOADONCALLAPI DoExportDialog( FltCallDialogParameter& rPara )
ResMgr* pResMgr;
aResMgrName.Append( ByteString::CreateFromInt32( SOLARUPD ) );
pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILanguage() );
pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
if( pResMgr )
{