summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 09:46:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 09:56:51 +0100
commitc1a4554c67fc975ead3f79b3511a76617e4615b3 (patch)
treede4da1c1ee26954ee76d2ffe8061ba86f44e5547 /jvmfwk
parent02b24d77476f93887691dde564351d6f8b770b8f (diff)
sal_Char->char in idlc..linguistic
Change-Id: Ib30fe34123ad7e5d892e8db9c742e08c4ca8fcd2 Reviewed-on: https://gerrit.libreoffice.org/85477 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/inc/libxmlutil.hxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx10
-rw-r--r--jvmfwk/source/elements.cxx2
-rw-r--r--jvmfwk/source/framework.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/inc/libxmlutil.hxx b/jvmfwk/inc/libxmlutil.hxx
index 8e6f9afaadbd..31332f3cea57 100644
--- a/jvmfwk/inc/libxmlutil.hxx
+++ b/jvmfwk/inc/libxmlutil.hxx
@@ -89,7 +89,7 @@ public:
CXmlCharPtr & operator = (xmlChar* pObj);
operator xmlChar* () const { return _object;}
operator OUString ();
- operator OString () { return reinterpret_cast<sal_Char*>(_object);}
+ operator OString () { return reinterpret_cast<char*>(_object);}
};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 937500fe2467..579be1ea71e8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -201,7 +201,7 @@ public:
private:
enum { BUFFER_SIZE = 1024 };
- sal_Char m_aBuffer[BUFFER_SIZE];
+ char m_aBuffer[BUFFER_SIZE];
FileHandleGuard m_aGuard;
int m_nSize;
int m_nIndex;
@@ -271,7 +271,7 @@ namespace {
class AsynchReader: public salhelper::Thread
{
size_t m_nDataSize;
- std::unique_ptr<sal_Char[]> m_arData;
+ std::unique_ptr<char[]> m_arData;
FileHandleGuard m_aGuard;
@@ -306,7 +306,7 @@ OString AsynchReader::getData()
void AsynchReader::execute()
{
const sal_uInt64 BUFFER_SIZE = 4096;
- sal_Char aBuffer[BUFFER_SIZE];
+ char aBuffer[BUFFER_SIZE];
while (true)
{
sal_uInt64 nRead;
@@ -330,12 +330,12 @@ void AsynchReader::execute()
else if (nRead <= BUFFER_SIZE)
{
//Save the data we have in m_arData into a temporary array
- std::unique_ptr<sal_Char[]> arTmp( new sal_Char[m_nDataSize]);
+ std::unique_ptr<char[]> arTmp( new char[m_nDataSize]);
if (m_nDataSize != 0) {
memcpy(arTmp.get(), m_arData.get(), m_nDataSize);
}
//Enlarge m_arData to hold the newly read data
- m_arData.reset(new sal_Char[static_cast<size_t>(m_nDataSize + nRead)]);
+ m_arData.reset(new char[static_cast<size_t>(m_nDataSize + nRead)]);
//Copy back the data that was already in m_arData
memcpy(m_arData.get(), arTmp.get(), m_nDataSize);
//Add the newly read data to m_arData
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 69688df85295..807a65a3a154 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -72,7 +72,7 @@ static OString getElement(OString const & docPath,
JFW_E_ERROR,
"[Java framework] Error in function getElement (elements.cxx)");
}
- sValue = reinterpret_cast<sal_Char*>(pathObj->nodesetval->nodeTab[0]->content);
+ sValue = reinterpret_cast<char*>(pathObj->nodesetval->nodeTab[0]->content);
return sValue;
}
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 32120308f932..60d7dd796c20 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -246,7 +246,7 @@ javaFrameworkError jfw_startVM(
//add the options set by options dialog
for (auto const & vmParam : vmParams)
{
- arOpt[index].optionString = const_cast<sal_Char*>(vmParam.getStr());
+ arOpt[index].optionString = const_cast<char*>(vmParam.getStr());
arOpt[index].extraInfo = nullptr;
index ++;
}