Kaydet (Commit) b813ff29 authored tarafından Michael Meeks's avatar Michael Meeks

android: disable create_user_install's copyFile goodness

osl_copyFile is not implemented for android yet, and we can pre-can this dir.
üst ebe3e061
......@@ -159,7 +159,6 @@ namespace desktop {
static osl::FileBase::RC copy_recursive( const rtl::OUString& srcUnqPath, const rtl::OUString& dstUnqPath)
{
FileBase::RC err;
DirectoryItem aDirItem;
DirectoryItem::get(srcUnqPath, aDirItem);
......@@ -207,6 +206,13 @@ namespace desktop {
// copy single file - foldback
err = File::copy( srcUnqPath,dstUnqPath );
}
#ifdef ANDROID
fprintf (stderr, "copy_recursive '%s' to '%s' returns (%d)0x%x\n",
rtl::OUStringToOString(srcUnqPath, RTL_TEXTENCODING_UTF8).getStr(),
rtl::OUStringToOString(dstUnqPath, RTL_TEXTENCODING_UTF8).getStr(),
(int)err, (int)err);
#endif
return err;
}
......@@ -235,6 +241,9 @@ namespace desktop {
File::setAttributes(aUserPath, osl_File_Attribute_OwnWrite| osl_File_Attribute_OwnRead| osl_File_Attribute_OwnExe);
#endif
#ifndef ANDROID
// as of now osl_copyFile does not work on Android => don't do this.
// copy data from shared data directory of base installation
for (sal_Int32 i=0; pszSrcList[i]!=NULL && pszDstList[i]!=NULL; i++)
{
......@@ -251,6 +260,7 @@ namespace desktop {
return UserInstall::E_Creation;
}
}
#endif
try
{
OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment