[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - distro-configs/CPLinux-LOKit.conf sc/source

[Caolán McNamara]

 distro-configs/CPLinux-LOKit.conf |   54 ++++++++++++++++++++++++++++++++++++++
 sc/source/core/tool/interpr7.cxx  |    9 ++++++
 2 files changed, 63 insertions(+)

New commits:
commit c6c3ed3c750a3c71cb57909c60773fde2c43cd2a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 10 14:27:35 2018 +0000

    limit WEBSERVICE to http[s] protocols
    
    and like excel...
    
    'For protocols that aren’t supported, such as ftp:// or file://, WEBSERVICE
    returns the #VALUE! error value.'
    
    Change-Id: I0e9c6fd3426fad56a199eafac48de9b0f23914b3

diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 48a34b3ece36..9112c24e7584 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -14,6 +14,7 @@
 #include <rtl/strbuf.hxx>
 #include <formula/errorcodes.hxx>
 #include <svtools/miscopt.hxx>
+#include <tools/urlobj.hxx>
 
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
@@ -247,6 +248,14 @@ void ScInterpreter::ScWebservice()
             return;
         }
 
+        INetURLObject aObj(aURI, INetProtocol::File);
+        INetProtocol eProtocol = aObj.GetProtocol();
+        if (eProtocol != INetProtocol::Http && eProtocol != INetProtocol::Https)
+        {
+            PushError( FormulaError::NoValue );
+            return;
+        }
+
         uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess( ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ), uno::UNO_QUERY );
         if(!xFileAccess.is())
         {
commit 85b62c90fed055fa72bad2a8640f466d37050354
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jan 11 15:15:08 2018 +0100

    configuration for Online, 1st cut
    
    Change-Id: I05adbf36b6879a93adf08ca99d5d9e00c09e4e94

diff --git a/distro-configs/CPLinux-LOKit.conf b/distro-configs/CPLinux-LOKit.conf
new file mode 100644
index 000000000000..05e089dc7abc
--- /dev/null
+++ b/distro-configs/CPLinux-LOKit.conf
@@ -0,0 +1,54 @@
+--with-vendor=Collabora
+--with-branding=icon-themes/galaxy/brand_cp
+--with-system-dicts
+--with-myspell-dicts
+--with-system-zlib
+--without-system-cairo
+--without-system-poppler
+--without-system-openssl
+--without-system-libpng
+--without-system-libxml
+--without-system-jpeg
+--without-system-jars
+--without-system-postgresql
+--without-java
+--without-junit
+--without-help
+--with-linker-hash-style=both
+--with-fonts
+--enable-noto-font
+--with-galleries=no
+--with-theme=tango
+--with-external-thes-dir=/usr/share/mythes
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-dict-dir=/usr/share/hunspell
+--disable-dbus
+--enable-extension-integration
+--disable-odk
+--disable-kde4
+--disable-gtk3
+--disable-gtk
+--disable-gstreamer-0-10
+--disable-gstreamer-1-0
+--disable-evolution2
+--disable-gio
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--disable-ext-wiki-publisher
+--disable-report-builder
+--disable-ext-nlpsolver
+--disable-sdremote
+--disable-sdremote-bluetooth
+--disable-postgresql-sdbc
+--disable-firebird-sdbc
+--enable-ext-numbertext
+--disable-ext-ct2n
+--enable-epm
+--enable-python=internal
+--disable-online-update
+--disable-dconf
+--enable-mergelibs
+--with-package-format=deb rpm
+--enable-release-build
+--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
+--enable-symbols