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 /svx/source/gallery2 | |
| parent | add missing include (diff) | |
| download | core-fba911fea7b87e332b8db9e511b875feedbcb59c.tar.gz core-fba911fea7b87e332b8db9e511b875feedbcb59c.zip | |
gsl_getSystemTextEncoding -> osl_getThreadTextEncoding
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 50d398a43711..50781af7f183 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -197,7 +197,7 @@ public: // ----------- Gallery::Gallery( const String& rMultiPath ) -: nReadTextEncoding ( gsl_getSystemTextEncoding() ) +: nReadTextEncoding ( osl_getThreadTextEncoding() ) , nLastFileNumber ( 0 ) , bMultiPath ( sal_False ) { @@ -533,7 +533,7 @@ void Gallery::ImplWriteImportList() const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' ); const sal_uInt16 nId = 0x0004; - *pOStm << nInventor << nId << (sal_uInt32) aImportList.size() << (sal_uInt16) gsl_getSystemTextEncoding(); + *pOStm << nInventor << nId << (sal_uInt32) aImportList.size() << (sal_uInt16) osl_getThreadTextEncoding(); for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) *pOStm << *aImportList[ i ]; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 791a2a907c09..3147e3978f90 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1363,7 +1363,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const rOStm << (sal_uInt16) 0x0004; rOStm.WriteByteString(rtl::OUStringToOString(GetRealName(), RTL_TEXTENCODING_UTF8)); - rOStm << nCount << (sal_uInt16) gsl_getSystemTextEncoding(); + rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -1488,7 +1488,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; - aFileName = rtl::OStringToOUString(aTempFileName, gsl_getSystemTextEncoding()); + aFileName = rtl::OStringToOUString(aTempFileName, osl_getThreadTextEncoding()); if( bRel ) { |