[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - wsd/LOOLWSD.hpp
Andras Timar
andras.timar at collabora.com
Tue Feb 27 11:47:41 UTC 2018
wsd/LOOLWSD.hpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit dadaf95f08770208f084dce7b54fc251a4bdfe54
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Feb 16 17:23:25 2018 +0100
tdf#115595 open editable documents with upper case or mixed case file extensions in edit mode
Change-Id: I6ea60926ce0ec4d1323080ffec5152d2bbeefc31
Reviewed-on: https://gerrit.libreoffice.org/49867
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 6a914ecbb95e565de51e33e4daeab3c78baeab2b)
Reviewed-on: https://gerrit.libreoffice.org/50424
Reviewed-by: pranavk <pranavk at collabora.co.uk>
Tested-by: pranavk <pranavk at collabora.co.uk>
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 40a32b73..c16ecc37 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -10,6 +10,7 @@
#ifndef INCLUDED_LOOLWSD_HPP
#define INCLUDED_LOOLWSD_HPP
+#include <algorithm>
#include <atomic>
#include <map>
#include <set>
@@ -91,10 +92,12 @@ public:
return LOOLWSD::SSLTermination.get();
}
- /// Return truee iff extension is marked as view action in discovery.xml.
+ /// Return true iff extension is marked as view action in discovery.xml.
static bool IsViewFileExtension(const std::string& extension)
{
- return EditFileExtensions.find(extension) == EditFileExtensions.end();
+ std::string lowerCaseExtension = extension;
+ std::transform(lowerCaseExtension.begin(), lowerCaseExtension.end(), lowerCaseExtension.begin(), ::tolower);
+ return EditFileExtensions.find(lowerCaseExtension) == EditFileExtensions.end();
}
/// Returns the value of the specified application configuration,
More information about the Libreoffice-commits
mailing list