diff options
author | Joachim Lingner <jl@openoffice.org> | 2011-02-24 15:28:48 +0100 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2011-02-24 15:28:48 +0100 |
commit | fd2597bbeb3f9ef2a803615ff4df1aea10242283 (patch) | |
tree | 29737587a1b60cf0499fcecda8c7f236b14a3d42 /desktop/source | |
parent | 7eb98986f55c1eda30442a2fae60bc422f47861d (diff) |
jl164 #i109096# libxml2 fails when using long paths on windows
Diffstat (limited to 'desktop/source')
-rwxr-xr-x | desktop/source/deployment/manager/dp_manager.cxx | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 0339cf599b34..89ab4d0b7199 100755 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -637,29 +637,12 @@ OUString PackageManagerImpl::insertToActivationLayer( ::ucbhelper::Content sourceContent(sourceContent_); Reference<XCommandEnvironment> xCmdEnv( sourceContent.getCommandEnvironment() ); - OUString destFolder; - OUString tempEntry; - // if (::osl::File::createTempFile( - // m_activePackages_expanded.getLength() == 0 - // ? 0 : &m_activePackages_expanded, - // 0, &tempEntry ) != ::osl::File::E_None) - // throw RuntimeException( - // OUSTR("::osl::File::createTempFile() failed!"), 0 ); - //::utl::TempFile::SetTempNameBaseDirectory(m_activePackages_expanded); + String baseDir(m_activePackages_expanded); ::utl::TempFile aTemp(&baseDir, sal_False); - if (m_activePackages_expanded.getLength() == 0) { -// destFolder = tempEntry; - destFolder = aTemp.GetFileName(); - } - else { -// tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 ); - // tweak user|share to macrofied url: -// destFolder = makeURL( m_activePackages, tempEntry ); - tempEntry = aTemp.GetURL(); - tempEntry = tempEntry.copy(tempEntry.lastIndexOf('/') + 1); - destFolder = makeURL( m_activePackages, tempEntry); - } + OUString tempEntry = aTemp.GetURL(); + tempEntry = tempEntry.copy(tempEntry.lastIndexOf('/') + 1); + OUString destFolder = makeURL( m_activePackages, tempEntry); destFolder += OUSTR("_"); // prepare activation folder: |