Kaydet (Commit) d947fb8a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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

üst 2727a29e
...@@ -130,7 +130,10 @@ namespace desktop ...@@ -130,7 +130,10 @@ namespace desktop
static oslSignalHandler pSignalHandler = 0; static oslSignalHandler pSignalHandler = 0;
static sal_Bool _bCrashReporterEnabled = sal_True; static sal_Bool _bCrashReporterEnabled = sal_True;
#ifndef ANDROID
static ::rtl::OUString getBrandSharePreregBundledPathURL(); static ::rtl::OUString getBrandSharePreregBundledPathURL();
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
ResMgr* Desktop::GetDesktopResManager() ResMgr* Desktop::GetDesktopResManager()
...@@ -355,6 +358,8 @@ void ReplaceStringHookProc( UniString& rStr ) ...@@ -355,6 +358,8 @@ void ReplaceStringHookProc( UniString& rStr )
static const char pLastSyncFileName[] = "lastsynchronized"; static const char pLastSyncFileName[] = "lastsynchronized";
static const sal_Int32 nStrLenLastSync = 16; static const sal_Int32 nStrLenLastSync = 16;
#ifndef ANDROID
static bool needsSynchronization( static bool needsSynchronization(
::rtl::OUString const & baseSynchronizedURL, ::rtl::OUString const & userSynchronizedURL ) ::rtl::OUString const & baseSynchronizedURL, ::rtl::OUString const & userSynchronizedURL )
{ {
...@@ -462,6 +467,9 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation() ...@@ -462,6 +467,9 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation()
return aTmp.makeStringAndClear(); return aTmp.makeStringAndClear();
} }
#endif
//Checks if the argument src is the folder of the help or configuration //Checks if the argument src is the folder of the help or configuration
//backend in the prereg folder //backend in the prereg folder
static bool excludeTmpFilesAndFolders(const rtl::OUString & src) static bool excludeTmpFilesAndFolders(const rtl::OUString & src)
......
...@@ -216,6 +216,7 @@ namespace desktop { ...@@ -216,6 +216,7 @@ namespace desktop {
return err; return err;
} }
#ifndef ANDROID
static const char *pszSrcList[] = { static const char *pszSrcList[] = {
"/presets", "/presets",
NULL NULL
...@@ -224,7 +225,7 @@ namespace desktop { ...@@ -224,7 +225,7 @@ namespace desktop {
"/user", "/user",
NULL NULL
}; };
#endif
static UserInstall::UserInstallError create_user_install(OUString& aUserPath) static UserInstall::UserInstallError create_user_install(OUString& aUserPath)
{ {
......
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