diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 14:54:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:37:51 +0000 |
| commit | ac22bf0d8ad4ebc06772a5de07759c38e7c8df0a (patch) | |
| tree | 056cef8570467f3d06747dedb3d5460faedb71a8 | |
| parent | 4bd00a92087ff152ebe4a64edda0ca83545fa8d2 (diff) | |
avoid implicit cast
| -rw-r--r-- | unoxml/source/dom/characterdata.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index 060d33d3f546..0ee8bb4b65cd 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -80,7 +80,7 @@ namespace DOM { // get current data OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr)); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -142,7 +142,7 @@ namespace DOM { // get current data OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr)); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -172,7 +172,7 @@ namespace DOM { // get current data OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr)); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0){ DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -218,7 +218,7 @@ namespace DOM { // get current data OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr)); - OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8); + OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 1d07cb405928..ea3de1404bb7 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -325,7 +325,7 @@ void SectionPropertyMap::SetPageStyleName( bool bFirst, const ::rtl::OUString& for( sal_Int32 nStyle = 0; nStyle < rPageStyleNames.getLength(); ++nStyle) { if( pStyleNames[nStyle].getLength() > nDefaultLength && - !rtl_ustr_compare_WithLength( sDefaultStyle, nDefaultLength, pStyleNames[nStyle], nDefaultLength)) + !rtl_ustr_compare_WithLength( sDefaultStyle.getStr(), nDefaultLength, pStyleNames[nStyle].getStr(), nDefaultLength)) { sal_Int32 nIndex = pStyleNames[nStyle].copy( nDefaultLength ).toInt32(); if( nIndex > nMaxIndex) |