diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 10:47:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-24 11:03:58 +0100 |
| commit | a2f1be46f29dad0923bee8a93ab1aecdbccb332b (patch) | |
| tree | 0902027d570b4ae6dcc6105392188dc7b229cebc /vcl/ios | |
| parent | aba8e26120a6cabe65d43a3f089ee802cfbbe338 (diff) | |
sal_Char->char in vcl
Change-Id: I4359b7042f98586e2c9f5529d83d769cdf3d033c
Reviewed-on: https://gerrit.libreoffice.org/85775
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/ios')
| -rw-r--r-- | vcl/ios/DataFlavorMapping.cxx | 4 | ||||
| -rw-r--r-- | vcl/ios/HtmlFmtFlt.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx index 2978e64afa4e..88b0e6199818 100644 --- a/vcl/ios/DataFlavorMapping.cxx +++ b/vcl/ios/DataFlavorMapping.cxx @@ -227,8 +227,8 @@ Any UniDataProvider::getOOoData() if (mSystemData) { - oOOData <<= OUString(static_cast<const sal_Char*>([mSystemData bytes]), - [mSystemData length], RTL_TEXTENCODING_UTF8); + oOOData <<= OUString(static_cast<const char*>([mSystemData bytes]), [mSystemData length], + RTL_TEXTENCODING_UTF8); } else { diff --git a/vcl/ios/HtmlFmtFlt.cxx b/vcl/ios/HtmlFmtFlt.cxx index 2f3c57f98452..4f90ced3bc1a 100644 --- a/vcl/ios/HtmlFmtFlt.cxx +++ b/vcl/ios/HtmlFmtFlt.cxx @@ -93,8 +93,8 @@ Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8> const& aText std::string dummyHtmlHeader = GetHtmlFormatHeader(0, 0, 0, 0); size_t lHtmlFormatHeader = dummyHtmlHeader.length(); - std::string textHtml(reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()), - reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + std::string textHtml(reinterpret_cast<const char*>(aTextHtml.getConstArray()), + reinterpret_cast<const char*>(aTextHtml.getConstArray()) + aTextHtml.getLength()); std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader @@ -129,9 +129,9 @@ Sequence<sal_Int8> HTMLFormatToTextHtml(const Sequence<sal_Int8>& aHTMLFormat) assert(isHTMLFormat(aHTMLFormat) && "No HTML Format provided"); Sequence<sal_Int8>& nonconstHTMLFormatRef = const_cast<Sequence<sal_Int8>&>(aHTMLFormat); - sal_Char* dataStart = reinterpret_cast<sal_Char*>(nonconstHTMLFormatRef.getArray()); - sal_Char* dataEnd = dataStart + nonconstHTMLFormatRef.getLength() - 1; - const sal_Char* htmlStartTag = strcasestr(dataStart, HtmlStartTag); + char* dataStart = reinterpret_cast<char*>(nonconstHTMLFormatRef.getArray()); + char* dataEnd = dataStart + nonconstHTMLFormatRef.getLength() - 1; + const char* htmlStartTag = strcasestr(dataStart, HtmlStartTag); assert(htmlStartTag && "Seems to be no HTML at all"); @@ -165,7 +165,7 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence) return rtl_str_compareIgnoreAsciiCase_WithLength( HtmlFormatStart, HtmlFormatStartLen, - reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) + reinterpret_cast<const char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) == 0; } |