diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-24 23:47:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-24 23:57:43 +0200 |
| commit | d947fb8a6c69a9144ed2d00de4521e86925b0d48 (patch) | |
| tree | e48816e6a31b32ccb27ff022d55dc7d68de30a2e /desktop | |
| parent | 2727a29e57cdcd5dddc94a829194f88cfc2808ab (diff) | |
WaE: "defined but not used" for stuff bypassed for Android
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cf648b4b4fe4..91c7531ef0e5 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 72eb8f6dd299..6b1672dd68e1 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) { |