[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - desktop/source sfx2/source
Thorsten Behrens
thorsten.behrens at cib.de
Wed Jan 18 09:18:49 UTC 2017
desktop/source/app/crashreport.cxx | 1 +
sfx2/source/appl/appserv.cxx | 1 +
2 files changed, 2 insertions(+)
New commits:
commit 1675d2e8dea37d02d8b706a3f0ec46340e214b2f
Author: Thorsten Behrens <thorsten.behrens at cib.de>
Date: Wed Jan 18 10:02:07 2017 +0100
Fixup profile safemode backports
Change-Id: I374b6a65aace6f8874bbba12f6abd3ebb9172995
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 9359113..64cbd10 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -101,6 +101,7 @@ OUString getCrashDirectory()
if (!aCrashURL.endsWith("/"))
aCrashURL += "/";
osl::FileBase::RC rc = osl::Directory::create(aCrashURL);
+ (void)rc;
osl::FileBase::getSystemPathFromFileURL(aCrashURL, aCrashPath);
return aCrashPath;
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b003969..d70af85 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -284,6 +284,7 @@ namespace
uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
css::task::OfficeRestartManager::get(xContext)->requestRestart(
css::uno::Reference< css::task::XInteractionHandler >());
+ return 0;
}
}
More information about the Libreoffice-commits
mailing list