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/osx | |
| 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/osx')
| -rw-r--r-- | vcl/osx/DataFlavorMapping.cxx | 2 | ||||
| -rw-r--r-- | vcl/osx/HtmlFmtFlt.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index c63bc3321d16..dfba27d20e31 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -226,7 +226,7 @@ Any UniDataProvider::getOOoData() if (mSystemData) { - oOOData <<= OUString(static_cast<const sal_Char*>([mSystemData bytes]), + oOOData <<= OUString(static_cast<const char*>([mSystemData bytes]), [mSystemData length], RTL_TEXTENCODING_UTF8); } diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index e6abfed4fc62..940bf90cbb87 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -90,8 +90,8 @@ Sequence<sal_Int8> TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml) size_t lHtmlFormatHeader = dummyHtmlHeader.length(); std::string textHtml( - reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()), - reinterpret_cast<const sal_Char*>(aTextHtml.getConstArray()) + aTextHtml.getLength()); + reinterpret_cast<const char*>(aTextHtml.getConstArray()), + reinterpret_cast<const char*>(aTextHtml.getConstArray()) + aTextHtml.getLength()); std::string::size_type nStartHtml = textHtml.find(TAG_HTML) + lHtmlFormatHeader - 1; // we start one before '<HTML>' Word 2000 does also so std::string::size_type nEndHtml = textHtml.find(TAG_END_HTML) + lHtmlFormatHeader + TAG_END_HTML.length() + 1; // our SOffice 5.2 wants 2 behind </HTML>? @@ -122,9 +122,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"); @@ -158,7 +158,7 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence) return rtl_str_compareIgnoreAsciiCase_WithLength(HtmlFormatStart, HtmlFormatStartLen, - reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()), + reinterpret_cast<const char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) == 0; } |