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 /lotuswordpro/source | |
parent | 20c8eb409e2b48d57f392c146f7414bab3551664 (diff) |
gsl_getSystemTextEncoding -> osl_getThreadTextEncoding
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/lwpatomholder.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpdrawobj.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwptblformula.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpatomholder.cxx b/lotuswordpro/source/filter/lwpatomholder.cxx index de680fe9350a..922ef6550c83 100644 --- a/lotuswordpro/source/filter/lwpatomholder.cxx +++ b/lotuswordpro/source/filter/lwpatomholder.cxx @@ -82,7 +82,7 @@ void LwpAtomHolder::Read(LwpObjectStream *pStrm) } m_nAtom = m_nAssocAtom = len; - //rtl_TextEncoding rEncode = gsl_getSystemTextEncoding(); + //rtl_TextEncoding rEncode = osl_getThreadTextEncoding(); rtl_TextEncoding rEncode = RTL_TEXTENCODING_MS_1252; len = LwpTools::QuickReadUnicode(pStrm, m_String, diskSize-sizeof(diskSize), rEncode); } diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 745990244ff9..e0eeea1e95aa 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1084,7 +1084,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const rtl::OUString& rStyleName ) rtl_TextEncoding aEncoding; if (!m_aTextRec.nTextCharacterSet) { - aEncoding = gsl_getSystemTextEncoding(); + aEncoding = osl_getThreadTextEncoding(); } else { @@ -1283,7 +1283,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const rtl::OUString& rStyleName) rtl_TextEncoding aEncoding; if (!m_aTextArtRec.nTextCharacterSet) { - aEncoding = gsl_getSystemTextEncoding(); + aEncoding = osl_getThreadTextEncoding(); } else { diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index f836c7afc723..d77dbcb863fe 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -724,7 +724,7 @@ void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont) { pEquData[nIndex] = pGrafData[nBegin + nIndex]; } - pXFNotePara->Add(rtl::OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), gsl_getSystemTextEncoding())); + pXFNotePara->Add(rtl::OUString((sal_Char*)pEquData, (nEnd - nBegin + 1), osl_getThreadTextEncoding())); delete [] pEquData; } pXFNote->Add(pXFNotePara); diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index 23c207b2aa2b..0647a1d4142e 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -125,7 +125,7 @@ sal_Bool LwpFormulaInfo::ReadText() *(pBuf.get()+nStrLen)='\0'; String aText; aText += String::CreateFromAscii("\""); - aText.Append(String(pBuf.get(),nStrLen,gsl_getSystemTextEncoding())); + aText.Append(String(pBuf.get(),nStrLen,osl_getThreadTextEncoding())); aText += String::CreateFromAscii("\""); m_aStack.push_back(new LwpFormulaText(aText)); |