diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-27 10:54:39 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-27 12:07:27 +0100 |
| commit | 5bcd3335012c25edb03c858b3fb44ec26b0a25d4 (patch) | |
| tree | 97cbc1b23ccb4045871ed3764e911a8778df7b8a /desktop/source/lib | |
| parent | 1a7489039e8acbd9499276fdb6e747e11d3ecffe (diff) | |
revert the gyp-based nss build changes
https://lists.freedesktop.org/archives/libreoffice/2020-March/084769.html
etc.
This reverts commit c76fdcf1cfa1242e66b50ebe80d6eac1baae37a9.
This reverts commit 10f52ab4d27263439d59f55f40e88ad2fde0cf71.
This reverts commit eac806e8dcd9ee6439ac8695978ff6b62cc6b8d2.
This reverts commit d591a682e46ff352f06a61c024ef661dd17f4ea4.
This reverts commit 12235d3390a7fc5146bf65f9d6166034b8a048ee.
This reverts commit 23245f723fb29262b8543d6447d1b0bb69cb50fb.
This reverts commit 91658b402b66b67c785687d5b3a76e3183fe76bf.
This reverts commit 5feadfad0cc3be2680213d2e5f6f786b2f4cc74f.
This reverts commit fecca49c309fc723c524f12fa671114b316a5562.
This reverts commit c6a9454e744289cf2004b42b3c90854b2db8382b.
This reverts commit a1a62a70411cb6041b5930ead08280d5e1e7b5f9.
This reverts commit 8512f4ca090c85477a6670438aeefe7fdfcf8a98.
This reverts commit 532ffb7a297d55b495141ce33692df5d9917b54f.
Change-Id: Iaa48d692bea2ca2468cdd5f8ad26ad91c0c31dde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91199
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'desktop/source/lib')
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 7d8bed0bd81a..706d826d6722 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -164,8 +164,6 @@ #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; @@ -5689,12 +5687,6 @@ static void preloadData() SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM); (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. |