[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 6 12:21:35 UTC 2020


 svx/source/tbxctrls/tbcontrl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 977872353475dbe44b126cdf963fd6ff5cfe6734
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 6 10:56:41 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Aug 6 14:21:01 2020 +0200

    lok: Hide not working 'More Styles' option
    
    Option was shown in the sidebar style dropdown.
    
    Change-Id: Icd7b555d1c6c1a860454c4b367146a1ea9746b76
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100204
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 8f12f79818e85c31c1f752c200d9174093d0dfca)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100218

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6385517cc321..e49ac60442a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3140,7 +3140,8 @@ void SvxStyleToolBoxControl::FillStyleBox()
                 pBox->InsertEntry( pImpl->aClearForm, 0 );
                 pBox->SetSeparatorPos( 0 );
 
-                pBox->InsertEntry( pImpl->aMore );
+                if (!comphelper::LibreOfficeKit::isActive())
+                    pBox->InsertEntry( pImpl->aMore );
 
                 // enable sort again
                 nWinBits |= WB_SORT;


More information about the Libreoffice-commits mailing list