[Libreoffice-commits] core.git: sfx2/source

Jim Raykowski (via logerrit) logerrit at kemper.freedesktop.org
Sat Aug 3 18:42:03 UTC 2019


 sfx2/source/dialog/mgetempl.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 30c551416d23ff09b8bfe09b69059c052c25c4e6
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Thu Aug 1 08:57:08 2019 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Sat Aug 3 20:40:53 2019 +0200

    tdf#120286 Disable edit style if inherit from is disabled or None
    
    Change-Id: Ia08adef09292d330d570a5a931d83317ffa7c3f2
    Reviewed-on: https://gerrit.libreoffice.org/76825
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 4b022a8eddc0..817174cf1b99 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -505,7 +505,10 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ )
             pStyle->SetParent( aParent );
 
         if ( aParent.isEmpty() )
+        {
             m_xBaseLb->set_active_text( SfxResId(STR_NONE) );
+            m_xEditLinkStyleBtn->set_sensitive( false );
+        }
         else
             m_xBaseLb->set_active_text( aParent );
 
@@ -516,6 +519,8 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ )
             m_xBaseLb->set_sensitive(false);
         }
     }
+    else
+        m_xEditLinkStyleBtn->set_sensitive( false );
 
     if (m_xFilterLb->get_sensitive())
     {


More information about the Libreoffice-commits mailing list