[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - cui/source distro-configs/CPLinux-MPL.conf

[Andras Timar (via logerrit)]

 cui/source/tabpages/tpbitmap.cxx |    3 +
 distro-configs/CPLinux-MPL.conf  |   62 ---------------------------------------
 2 files changed, 3 insertions(+), 62 deletions(-)

New commits:
commit ad27462a68837253863a02c19713cc0fe76a5178
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sat Mar 30 17:34:09 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 16 21:21:32 2019 +0200

    tdf#124361 hide Add / Import button in Online
    
    Change-Id: I6c8fb30fc1b8e0e6467a428f65838084fc08ca1e
    Reviewed-on: https://gerrit.libreoffice.org/69967
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/78990
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 78f795ee0cf8..7dd325d9a37f 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -44,6 +44,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <o3tl/make_unique.hxx>
 #include <sal/log.hxx>
+#include <comphelper/lok.hxx>
 
 using namespace com::sun::star;
 
@@ -114,6 +115,8 @@ SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInA
     m_xPositionOffY->connect_value_changed(aLink);
     m_xTileOffset->connect_value_changed( LINK( this, SvxBitmapTabPage, ModifyTileOffsetHdl ) );
     m_xBtnImport->connect_clicked( LINK(this, SvxBitmapTabPage, ClickImportHdl) );
+    if (comphelper::LibreOfficeKit::isActive())
+        m_xBtnImport->hide();
 
     // Calculate size of display boxes
     Size aSize = getDrawPreviewOptimalSize(this);
commit e3d8a63adfdd9926ebdb59adf6af043b5b1ec4a7
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Sep 16 12:03:51 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 16 21:21:20 2019 +0200

    [cp] CPLinux-MPL.conf is not needed any more
    
    Change-Id: Ic16414f4eaf32afff1bc80f55cbd2580d4a25eda
    Reviewed-on: https://gerrit.libreoffice.org/78987
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/distro-configs/CPLinux-MPL.conf b/distro-configs/CPLinux-MPL.conf
deleted file mode 100644
index 4106eadd0bd5..000000000000
--- a/distro-configs/CPLinux-MPL.conf
+++ /dev/null
@@ -1,62 +0,0 @@
---enable-mpl-subset
---with-vendor=Collabora
---with-branding=icon-themes/galaxy/brand_cp
---with-system-dicts
---with-myspell-dicts
---with-system-zlib
---disable-poppler
---without-system-cairo
---with-system-openssl
---with-system-libpng
---with-system-libxml
---with-system-jpeg
---with-system-expat
---with-system-curl
---with-system-icu
---with-system-nss
---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=colibre
---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
---disable-randr
---disable-ext-numbertext
---disable-ext-ct2n
---enable-epm
---enable-python=internal
---disable-online-update
---disable-dconf
---enable-mergelibs
---with-package-format=deb
---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
---with-webdav=serf
---disable-lotuswordpro
---disable-lpsolve