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

INTEGRATION: CWS mergebuild (1.6.20); FILE MERGED

Browse source 
2004/05/30 13:37:00 hjs 1.6.20.4: RESYNC: (1.7-1.8); FILE MERGED
2004/04/20 19:11:42 hjs 1.6.20.3: RESYNC: (1.6-1.7); FILE MERGED
2004/02/06 11:33:33 hjs 1.6.20.2: #i8252# avoid LanguageType for indexing; define valid ISO code in RSC_ISO_LANG
2004/01/21 14:57:41 pl 1.6.20.1: #110286# fallback resources, move to iso codes
This commit is contained in:
Hans-Joachim Lankenau 2004-06-26 19:25:04 +00:00
parent d28ce5f26c
commit de090f2cb7
1 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
rsc/source/parser/rscdb.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: rscdb.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: rt $ $Date: 2004-05-21 13:59:32 $
* last change: $Author: hjs $ $Date: 2004-06-26 20:25:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -71,6 +71,8 @@
#include <tools/intn.hxx>
#include <tools/fsys.hxx>
#include <tools/rc.h>
#include <tools/isolang.hxx>
#include <tools/isofallback.hxx>
#include <rtl/strbuf.hxx>
// Programmabhaengige Includes.
@ -102,15 +104,12 @@ using namespace rtl;
|*
*************************************************************************/
RscTypCont :: RscTypCont( RscError * pErrHdl,
LanguageType nLangType,
RSCBYTEORDER_TYPE nOrder,
rtl_TextEncoding nSourceCharSet_,
const ByteString & rSearchPath,
USHORT nFlagsP )
: nLangTypeId( nLangType ),
nDfltLangTypeId( International::GetNeutralLanguage( nLangType ) ),
:
nByteOrder( nOrder ),
nSourceCharSet( nSourceCharSet_ ),
nSourceCharSet( RTL_TEXTENCODING_UTF8 ),
aSearchPath( rSearchPath ),
nFlags( nFlagsP ),
aBool( pHS->Insert( "BOOL" ), RSC_NOTYPE ),
@ -130,11 +129,9 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
aIdLong( pHS->Insert( "IDLONG" ), RSC_NOTYPE, TRUE ),
aString( pHS->Insert( "Chars" ), RSC_NOTYPE ),
aWinBits( pHS->Insert( "WinBits" ), RSC_NOTYPE, FALSE ),
aLangType( pHS->Insert( "LangEnum" ), RSC_NOTYPE ),
aLangString( pHS->Insert( "Lang_Chars" ), RSC_NOTYPE, &aString,
&aLangType, &nLangTypeId, &nDfltLangTypeId ),
aLangShort( pHS->Insert( "Lang_short" ), RSC_NOTYPE, &aShort,
&aLangType, &nLangTypeId, &nDfltLangTypeId ),
aLangType(),
aLangString( pHS->Insert( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ),
aLangShort( pHS->Insert( "Lang_short" ), RSC_NOTYPE, &aShort, &aLangType ),
nAcceleratorType( 0 )
{
nUniqueId = 256;
@ -143,6 +140,35 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
Init();
}
ByteString RscTypCont::ChangeLanguage( const ByteString& rNewLang )
{
ByteString aRet = aLanguage;
aLanguage = rNewLang;
ByteString aLang = aLanguage;
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "RscTypCont::ChangeLanguage:" );
#endif
aLangFallbacks.clear();
do
{
USHORT nFallback = GetLangId( aLang );
aLangFallbacks.push_back( nFallback );
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, " %s (0x%hx)", aLang.GetBuffer(), nFallback );
#endif
} while( GetIsoFallback( aLang ) );
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "\n" );
#endif
return aRet;
}
/*************************************************************************
|*
|* RscTypCont :: ~RscTypCont