[Libreoffice-commits] .: desktop/source

[Tor Lillqvist]

 desktop/source/app/app.cxx         |    8 ++++++++
 desktop/source/app/userinstall.cxx |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit d947fb8a6c69a9144ed2d00de4521e86925b0d48
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Jan 24 23:47:03 2012 +0200

    WaE: "defined but not used" for stuff bypassed for Android

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cf648b4..91c7531 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -130,7 +130,10 @@ namespace desktop
 static oslSignalHandler pSignalHandler = 0;
 static sal_Bool _bCrashReporterEnabled = sal_True;
 
+#ifndef ANDROID
 static ::rtl::OUString getBrandSharePreregBundledPathURL();
+#endif
+
 // ----------------------------------------------------------------------------
 
 ResMgr* Desktop::GetDesktopResManager()
@@ -355,6 +358,8 @@ void ReplaceStringHookProc( UniString& rStr )
 static const char      pLastSyncFileName[]     = "lastsynchronized";
 static const sal_Int32 nStrLenLastSync         = 16;
 
+#ifndef ANDROID
+
 static bool needsSynchronization(
     ::rtl::OUString const & baseSynchronizedURL, ::rtl::OUString const & userSynchronizedURL )
 {
@@ -462,6 +467,9 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation()
 
     return aTmp.makeStringAndClear();
 }
+
+#endif
+
 //Checks if the argument src is the folder of the help or configuration
 //backend in the prereg folder
 static bool excludeTmpFilesAndFolders(const rtl::OUString & src)
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 72eb8f6..6b1672d 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -216,6 +216,7 @@ namespace desktop {
         return err;
     }
 
+#ifndef ANDROID
     static const char *pszSrcList[] = {
         "/presets",
         NULL
@@ -224,7 +225,7 @@ namespace desktop {
         "/user",
         NULL
     };
-
+#endif
 
     static UserInstall::UserInstallError create_user_install(OUString& aUserPath)
     {