diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-11 21:38:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-12 09:36:20 +0200 |
| commit | 346b5cfd9078826f8705e226ad317b2e4c58162d (patch) | |
| tree | 150f002d8c5c7b27bd0e5ab4157818e22da0507f /cui | |
| parent | Silence -Werror=unused-parameter on Android (diff) | |
| download | core-346b5cfd9078826f8705e226ad317b2e4c58162d.tar.gz core-346b5cfd9078826f8705e226ad317b2e4c58162d.zip | |
Convert some rtl_uString -> OUString in jvmfwk
Change-Id: I08de5cab29dabc6fd824d5df8bac12c8520a05ae
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optjava.cxx | 9 | ||||
| -rw-r--r-- | cui/source/options/optjava.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index a0d4d8dabcc1..84c9fef6ca1b 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -140,7 +140,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& , m_pPathDlg(nullptr) #if HAVE_FEATURE_JAVA , m_parParameters(nullptr) - , m_pClassPath(nullptr) , m_nParamSize(0) #endif , m_aResetIdle("cui options SvxJavaOptionsPage Reset") @@ -347,7 +346,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) { m_pPathDlg = VclPtr<SvxJavaClassPathDlg>::Create( this ); javaFrameworkError eErr = jfw_getUserClassPath( &m_pClassPath ); - if ( JFW_E_NONE == eErr && m_pClassPath ) + if ( JFW_E_NONE == eErr ) { sClassPath = m_pClassPath; m_pPathDlg->SetClassPath( sClassPath ); @@ -538,7 +537,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) #if HAVE_FEATURE_JAVA bool bStartAgain = true; std::unique_ptr<JavaInfo> pInfo; - javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo ); + javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder, &pInfo ); if ( JFW_E_NONE == eErr && pInfo ) { sal_Int32 nPos = 0; @@ -568,7 +567,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) if ( !bFound ) { - jfw_addJRELocation( pInfo->sLocation.pData ); + jfw_addJRELocation( pInfo->sLocation ); AddJRE( pInfo.get() ); m_aAddedInfos.push_back( std::move(pInfo) ); nPos = m_pJavaList->GetEntryCount() - 1; @@ -650,7 +649,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) OUString sPath( m_pPathDlg->GetClassPath() ); if ( m_pPathDlg->GetOldPath() != sPath ) { - eErr = jfw_setUserClassPath( sPath.pData ); + eErr = jfw_setUserClassPath( sPath ); SAL_WARN_IF(JFW_E_NONE != eErr, "cui.options", "SvxJavaOptionsPage::FillItemSet(): error in jfw_setUserClassPath"); bModified = true; } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 6b301d2e229c..47fb0a85e32c 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -67,7 +67,7 @@ private: #if HAVE_FEATURE_JAVA std::vector<std::unique_ptr<JavaInfo>> m_parJavaInfo; rtl_uString** m_parParameters; - rtl_uString* m_pClassPath; + OUString m_pClassPath; sal_Int32 m_nParamSize; #endif OUString m_sInstallText; |