Skip to content

C
core
Kaydet (Commit) c8209ae6 authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

added FIXME markers 

Change-Id: I7f9b5f9843c6f20fec17cec1e43d49624922b4fe
üst 76c22d36
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
tools/source/rc/resmgr.cxx
Dosyayı görüntüle @ c8209ae6
...@@ -270,6 +270,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, ...@@ -270,6 +270,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
OUStringBuffer aSearch( rPrefix.getLength() + 16 ); OUStringBuffer aSearch( rPrefix.getLength() + 16 );
boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end(); boost::unordered_map< OUString, ContainerElement, OUStringHash >::iterator it = m_aResFiles.end();
/* FIXME-BCP47: handle language tags! */
int nTries = 0; int nTries = 0;
if( !aLocale.Language.isEmpty() ) if( !aLocale.Language.isEmpty() )
nTries = 1; nTries = 1;
...@@ -362,6 +363,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, ...@@ -362,6 +363,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
// give up // give up
if( it == m_aResFiles.end() ) if( it == m_aResFiles.end() )
{ {
/* FIXME-BCP47: handle language tags! */
OUStringBuffer sKey = rPrefix; OUStringBuffer sKey = rPrefix;
sKey.append( rLocale.Language ); sKey.append( rLocale.Language );
if( !rLocale.Country.isEmpty() ) if( !rLocale.Country.isEmpty() )
...@@ -423,6 +425,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix, ...@@ -423,6 +425,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr ) InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr )
{ {
/* FIXME-BCP47: handle language tags! */
com::sun::star::lang::Locale aLocale = pMgr->aLocale; com::sun::star::lang::Locale aLocale = pMgr->aLocale;
if( !aLocale.Variant.isEmpty() ) if( !aLocale.Variant.isEmpty() )
aLocale.Variant = OUString(); aLocale.Variant = OUString();
...@@ -1595,6 +1598,7 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName, ...@@ -1595,6 +1598,7 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName,
OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() ); OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() );
/* FIXME-BCP47: handle language tags! */
if( aLocale.Language.isEmpty() ) if( aLocale.Language.isEmpty() )
aLocale = ResMgrContainer::get().getDefLocale(); aLocale = ResMgrContainer::get().getDefLocale();
...@@ -1615,6 +1619,7 @@ ResMgr* ResMgr::SearchCreateResMgr( ...@@ -1615,6 +1619,7 @@ ResMgr* ResMgr::SearchCreateResMgr(
OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() ); OUString aPrefix( pPrefixName, strlen( pPrefixName ), osl_getThreadTextEncoding() );
/* FIXME-BCP47: handle language tags! */
if( rLocale.Language.isEmpty() ) if( rLocale.Language.isEmpty() )
rLocale = ResMgrContainer::get().getDefLocale(); rLocale = ResMgrContainer::get().getDefLocale();
...@@ -1824,6 +1829,7 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName, ...@@ -1824,6 +1829,7 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName,
com::sun::star::lang::Locale aLocale( rLocale ); com::sun::star::lang::Locale aLocale( rLocale );
osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
/* FIXME-BCP47: handle language tags! */
if( aLocale.Language.isEmpty() ) if( aLocale.Language.isEmpty() )
aLocale = ResMgrContainer::get().getDefLocale(); aLocale = ResMgrContainer::get().getDefLocale();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment