wsd/FileServer.cpp | 5 -----
1 file changed, 5 deletions(-)
New commits:
commit a6e840a0ae67990b4986e986997db662bf0d1f47
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Jun 4 19:26:32 2018 +0200
Need a way to test the branding even in the debug mode.
Change-Id: Ia1d082a05393b298cd009a256b1a708e924097b9
Reviewed-on: https://gerrit.libreoffice.org/55290
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index cd49d28dd..d7fc0df7b 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -630,9 +630,6 @@ void FileServerRequestHandler::preprocessFile(const
HTTPRequest& request, Poco::
brandCSS = Poco::format(linkCSS, std::string(BRANDING_UNSUPPORTED));
brandJS = Poco::format(scriptJS, std::string(BRANDING_UNSUPPORTED));
}
-#elif ENABLE_DEBUG
- brandCSS = "";
- brandJS = "";
#endif
Poco::replaceInPlace(preprocess, std::string("<!--%BRANDING_CSS%-->"),
brandCSS);
@@ -810,8 +807,6 @@ void FileServerRequestHandler::preprocessAdminFile(const
HTTPRequest& request,co
brandJS = Poco::format(scriptJS, std::string(BRANDING_UNSUPPORTED));
brandFooter = Poco::format(footerPage, key.data(),
Poco::DateTimeFormatter::format(key.expiry(),
Poco::DateTimeFormat::RFC822_FORMAT));
}
-#elif ENABLE_DEBUG
- brandJS = "";
#endif
Poco::replaceInPlace(adminFile, std::string("<!--%BRANDING_JS%-->"),
brandJS);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
