summaryrefslogtreecommitdiffstats
path: root/wsd/FileServer.cpp
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-03-15 17:27:04 +0100
committerJan Holesovsky <kendy@collabora.com>2019-03-15 17:27:04 +0100
commitb132738476fb9b7b793e888461d3ae35d1ff2caf (patch)
tree70815a42684c293b68c80692d3894f750ef245ed /wsd/FileServer.cpp
parentRevert "wsd: create a static function "parse"" (diff)
downloadonline-b132738476fb9b7b793e888461d3ae35d1ff2caf.tar.gz
online-b132738476fb9b7b793e888461d3ae35d1ff2caf.zip
Revert "wsd: tokenize symbol "_('') _("")""
This reverts commit 6144d55f44c2109d43bc45c408fe4d1ca8f42207.
Diffstat (limited to 'wsd/FileServer.cpp')
-rw-r--r--wsd/FileServer.cpp29
1 files changed, 1 insertions, 28 deletions
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 61259ac052..7c297deb19 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -567,7 +567,7 @@ constexpr char BRANDING[] = "branding";
constexpr char BRANDING_UNSUPPORTED[] = "branding-unsupported";
#endif
-void FileServerRequestHandler::getToken(std::istringstream& istr, std::string& token)
+void FileServerRequestHandler::getToken(std::istream& istr, std::string& token)
{
token.clear();
int chr = istr.get();
@@ -583,33 +583,6 @@ void FileServerRequestHandler::getToken(std::istringstream& istr, std::string& t
token += "%>";
istr.get();
}
- else if (chr == '_' && istr.peek() == '(')
- {
- token += "_(";
- istr.get();
- chr = istr.peek();
- switch (chr)
- {
- case '\"':
- chr = istr.get();
- token += (char) chr;
- break;
- case '\'':
- chr = istr.get();
- token += (char) chr;
- break;
- }
- }
- else if (chr == '"' && istr.peek() == ')')
- {
- token += "\")";
- istr.get();
- }
- else if (chr == '\'' && istr.peek() == ')')
- {
- token += "')";
- istr.get();
- }
else token += (char) chr;
}
}