path: root/desktop/source
diff options
authorMiklos Vajna <>2020-03-25 18:59:51 +0100
committerMiklos Vajna <>2020-03-25 20:32:15 +0100
commit10f52ab4d27263439d59f55f40e88ad2fde0cf71 (patch)
tree399d8c3d09c056f0cff937238a7616a7c66aac78 /desktop/source
parent200fbb32c9d620e52c30f0016f11d595c1614185 (diff)
nss: fix this up to work with Online again
Regression from commit 8512f4ca090c85477a6670438aeefe7fdfcf8a98 (build nss using their new build system (gyp/ninja-based), 2020-02-19), the problem was that for some reason nss was pre-loaded in the past in some magic way, but after that commit we need to do this explicitly. Additionally, if the core.git build is a debug one, we now get an nss assert that checks if there was a fork between loading and using nss. I don't think that was enabled before, so just patch that out to fix the build breakage on the online.git side. online.git's unit-password-protected now passes again with this. Change-Id: I56c0019c446b4cabbb73141bbff80e8d8ffdb54c Reviewed-on: Tested-by: Jenkins Reviewed-by: Miklos Vajna <>
Diffstat (limited to 'desktop/source')
1 files changed, 8 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 706d826d6722..7d8bed0bd81a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -164,6 +164,8 @@
#include "lokinteractionhandler.hxx"
#include "lokclipboard.hxx"
#include <officecfg/Office/Impress.hxx>
+#include <comphelper/hash.hxx>
+#include <comphelper/storagehelper.hxx>
using namespace css;
using namespace vcl;
@@ -5687,6 +5689,12 @@ static void preloadData()
(void)LanguageTag::isValidBcp47("foo", nullptr);
+ std::cerr << "Preload nss\n";
+ {
+ comphelper::Hash aHash(comphelper::HashType::SHA256);
+ comphelper::OStorageHelper::CreatePackageEncryptionData("x");
+ }
std::cerr << "Preload fonts\n";
// Initialize fonts.