summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-01-24 14:28:16 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-01-24 18:11:32 +0000
commitb813ff2971ecdfd18962cec0cdf87d3ea2942a81 (patch)
treee9a5d136a2173a40b038dda60864320d8e538ee4
parentebe3e061ac80584b5ff9b6b190b1fe2a78b73c99 (diff)
android: disable create_user_install's copyFile goodness
osl_copyFile is not implemented for android yet, and we can pre-can this dir.
-rw-r--r--desktop/source/app/userinstall.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index f91eb1fb7bad..72eb8f6dd299 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -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,7 +241,10 @@ namespace desktop {
File::setAttributes(aUserPath, osl_File_Attribute_OwnWrite| osl_File_Attribute_OwnRead| osl_File_Attribute_OwnExe);
#endif
- // copy data from shared data directory of base installation
+#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++)
{
rc = copy_recursive(
@@ -251,6 +260,7 @@ namespace desktop {
return UserInstall::E_Creation;
}
}
+#endif
try
{
OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));