diff options
author | David Tardon <dtardon@redhat.com> | 2011-11-24 12:06:54 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-11-25 09:07:49 +0100 |
commit | fba911fea7b87e332b8db9e511b875feedbcb59c (patch) | |
tree | 55e119a74d03fe61c4c7181dd295ed8cfa3d2427 /extensions | |
parent | 20c8eb409e2b48d57f392c146f7414bab3551664 (diff) |
gsl_getSystemTextEncoding -> osl_getThreadTextEncoding
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/base/context.cxx | 4 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 2 | ||||
-rw-r--r-- | extensions/source/scanner/grid.cxx | 4 | ||||
-rw-r--r-- | extensions/source/scanner/sane.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 9fddfd0635e0..7db3aaf69868 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -228,7 +228,7 @@ namespace dbp catch(Exception&) { OSL_FAIL( ( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") - += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), osl_getThreadTextEncoding()) += ::rtl::OString("!") ).getStr() ); } } diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 2be54b8132d1..9497c540badd 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -111,7 +111,7 @@ Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::crea XPluginContext_Impl::XPluginContext_Impl( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) : m_xSMgr( rSMgr ), - m_aEncoding( gsl_getSystemTextEncoding() ) + m_aEncoding( osl_getThreadTextEncoding() ) { } @@ -285,7 +285,7 @@ FileSink::FileSink( const Reference< ::com::sun::star::lang::XMultiServiceFactor { DirEntry aEntry; m_aFileName = aEntry.TempName().GetFull(); - ::rtl::OString aFile = ::rtl::OUStringToOString( m_aFileName, gsl_getSystemTextEncoding() ); + ::rtl::OString aFile = ::rtl::OUStringToOString( m_aFileName, osl_getThreadTextEncoding() ); fp = fopen( aFile.getStr() , "wb" ); Reference< ::com::sun::star::io::XActiveDataControl > xControl( source, UNO_QUERY ); diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 18e16414d770..0f99e887e48b 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -121,7 +121,7 @@ XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiSe PluginControl_Impl(), m_xSMgr( rSMgr ), m_pPluginComm( NULL ), - m_aEncoding( gsl_getSystemTextEncoding() ), + m_aEncoding( osl_getThreadTextEncoding() ), m_pArgv( NULL ), m_pArgn( NULL ), m_nArgs( 0 ), diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index d0b76ce4c0e6..946ccc5b0ccd 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -350,7 +350,7 @@ void GridWindow::drawGrid() // draw tickmarks Point aPt = transform( fX, m_fMinY ); std::sprintf( pBuf, "%g", fX ); - String aMark( pBuf, gsl_getSystemTextEncoding() ); + String aMark( pBuf, osl_getThreadTextEncoding() ); Size aTextSize( GetTextWidth( aMark ), GetTextHeight() ); aPt.X() -= aTextSize.Width()/2; aPt.Y() += aTextSize.Height()/2; @@ -363,7 +363,7 @@ void GridWindow::drawGrid() // draw tickmarks Point aPt = transform( m_fMinX, fY ); std::sprintf( pBuf, "%g", fY ); - String aMark( pBuf, gsl_getSystemTextEncoding() ); + String aMark( pBuf, osl_getThreadTextEncoding() ); Size aTextSize( GetTextWidth( aMark ), GetTextHeight() ); aPt.X() -= aTextSize.Width() + 2; aPt.Y() -= aTextSize.Height()/2; diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 48eae47edc91..23841a812cff 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -990,7 +990,7 @@ String Sane::GetOptionUnitName( int n ) if( nUnitAsSize > SAL_N_ELEMENTS( ppUnits ) ) aText = String::CreateFromAscii( "[unknown units]" ); else - aText = String( ppUnits[ nUnit ], gsl_getSystemTextEncoding() ); + aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() ); return aText; } |