summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-11-24 12:06:54 +0100
committerDavid Tardon <dtardon@redhat.com>2011-11-25 09:07:49 +0100
commitfba911fea7b87e332b8db9e511b875feedbcb59c (patch)
tree55e119a74d03fe61c4c7181dd295ed8cfa3d2427 /svx
parent20c8eb409e2b48d57f392c146f7414bab3551664 (diff)
gsl_getSystemTextEncoding -> osl_getThreadTextEncoding
Diffstat (limited to 'svx')
-rw-r--r--svx/source/gallery2/gallery1.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx4
-rw-r--r--svx/source/svdraw/svdibrow.cxx8
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdotxln.cxx2
-rw-r--r--svx/source/svdraw/svdouno.cxx2
-rw-r--r--svx/source/xoutdev/xpool.cxx2
7 files changed, 12 insertions, 12 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 )
{
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 3db4a25fd613..a84e92305241 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -256,7 +256,7 @@ void _SdrItemBrowserControl::ImpCtor()
bShowWhichIds = sal_True; // not implemented yet
bShowRealValues = sal_True; // not implemented yet
- rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
+ rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding();
InsertDataColumn(
ITEMBROWSER_WHICHCOL_ID,
@@ -329,7 +329,7 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
}
else
{
- rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
+ rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding();
sRet = XubString("???", aTextEncoding);
switch (_nColId)
@@ -927,7 +927,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
{
SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
if (pSet!=NULL) {
- rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
+ rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding();
sal_uInt16 nEntryNum=0;
SfxWhichIter aIter(*pSet);
const SfxItemPool* pPool=pSet->GetPool();
@@ -1074,7 +1074,7 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits):
aBrowse(this)
{
SetOutputSizePixel(aBrowse.GetSizePixel());
- SetText(String("Joe's ItemBrowser", gsl_getSystemTextEncoding()));
+ SetText(String("Joe's ItemBrowser", osl_getThreadTextEncoding()));
aBrowse.Show();
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index fdc87e5554c9..8bbb2c540dce 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -305,7 +305,7 @@ SdrModel::~SdrModel()
{
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"Im Dtor des SdrModel steht noch ein offenes Undo rum: \""));
- aStr.append(rtl::OUStringToOString(pAktUndoGroup->GetComment(), gsl_getSystemTextEncoding()))
+ aStr.append(rtl::OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding()))
.append('\"');
OSL_FAIL(aStr.getStr());
}
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 2d2d7256eeee..52ec7335590d 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -142,7 +142,7 @@ SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const
void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet)
{
if(eCharSet == RTL_TEXTENCODING_DONTKNOW)
- eCharSet = gsl_getSystemTextEncoding();
+ eCharSet = osl_getThreadTextEncoding();
ImpSdrObjTextLinkUserData* pData=GetLinkUserData();
if (pData!=NULL) {
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index d6bc6d54f1bc..ddccbe2a35c3 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -546,7 +546,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >&
uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY);
if (xSet.is())
{
- uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", gsl_getSystemTextEncoding())) );
+ uno::Any aValue( xSet->getPropertyValue(String("DefaultControl", osl_getThreadTextEncoding())) );
::rtl::OUString aStr;
if( aValue >>= aStr )
aUnoControlTypeName = String(aStr);
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index a8c0e5c47a81..c7795dc4b7c3 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -47,7 +47,7 @@ XOutdevItemPool::XOutdevItemPool(
sal_uInt16 nAttrStart,
sal_uInt16 nAttrEnd,
sal_Bool bLoadRefCounts)
-: SfxItemPool(String("XOutdevItemPool", gsl_getSystemTextEncoding()), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
+: SfxItemPool(String("XOutdevItemPool", osl_getThreadTextEncoding()), nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
{
// prepare some defaults
const XubString aNullStr;