diff options
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 4094600bb5f3..518a1a955045 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -30,7 +30,7 @@ #include <string.h> -#include "boost/scoped_array.hpp" +#include <memory> #include "config_options.h" #include "osl/diagnose.h" #include "rtl/ustring.hxx" @@ -787,7 +787,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #endif } - boost::scoped_array<JavaVMOption> sarOptions(new JavaVMOption[options.size()]); + std::unique_ptr<JavaVMOption[]> sarOptions(new JavaVMOption[options.size()]); for (std::vector<Option>::size_type i = 0; i != options.size(); ++i) { SAL_INFO( "jfw", diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 66bfde5f02e6..a22b7e04a8ce 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -34,7 +34,7 @@ #include "salhelper/linkhelper.hxx" #include "salhelper/thread.hxx" #include "boost/noncopyable.hpp" -#include "boost/scoped_array.hpp" +#include <memory> #include "com/sun/star/uno/Sequence.hxx" #include <utility> #include <algorithm> @@ -325,7 +325,7 @@ FileHandleReader::readLine(OString * pLine) class AsynchReader: public salhelper::Thread { size_t m_nDataSize; - boost::scoped_array<sal_Char> m_arData; + std::unique_ptr<sal_Char[]> m_arData; bool m_bError; bool m_bDone; @@ -385,7 +385,7 @@ void AsynchReader::execute() else if (nRead <= BUFFER_SIZE) { //Save the data we have in m_arData into a temporary array - boost::scoped_array<sal_Char> arTmp( new sal_Char[m_nDataSize]); + std::unique_ptr<sal_Char[]> arTmp( new sal_Char[m_nDataSize]); memcpy(arTmp.get(), m_arData.get(), m_nDataSize); //Enlarge m_arData to hold the newly read data m_arData.reset(new sal_Char[(size_t)(m_nDataSize + nRead)]); @@ -1212,21 +1212,21 @@ void addJavaInfosDirScan( OUString excMessage = "[Java framework] sunjavaplugin: " "Error in function addJavaInfosDirScan in util.cxx."; int cJavaNames= sizeof(g_arJavaNames) / sizeof(char*); - boost::scoped_array<OUString> sarJavaNames(new OUString[cJavaNames]); + std::unique_ptr<OUString[]> sarJavaNames(new OUString[cJavaNames]); OUString *arNames = sarJavaNames.get(); for(int i= 0; i < cJavaNames; i++) arNames[i] = OUString(g_arJavaNames[i], strlen(g_arJavaNames[i]), RTL_TEXTENCODING_UTF8); int cSearchPaths= sizeof(g_arSearchPaths) / sizeof(char*); - boost::scoped_array<OUString> sarPathNames(new OUString[cSearchPaths]); + std::unique_ptr<OUString[]> sarPathNames(new OUString[cSearchPaths]); OUString *arPaths = sarPathNames.get(); for(int c = 0; c < cSearchPaths; c++) arPaths[c] = OUString(g_arSearchPaths[c], strlen(g_arSearchPaths[c]), RTL_TEXTENCODING_UTF8); int cCollectDirs = sizeof(g_arCollectDirs) / sizeof(char*); - boost::scoped_array<OUString> sarCollectDirs(new OUString[cCollectDirs]); + std::unique_ptr<OUString[]> sarCollectDirs(new OUString[cCollectDirs]); OUString *arCollectDirs = sarCollectDirs.get(); for(int d = 0; d < cCollectDirs; d++) arCollectDirs[d] = OUString(g_arCollectDirs[d], strlen(g_arCollectDirs[d]), |