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

Jim Raykowski (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 1 05:38:08 UTC 2019


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

New commits:
commit 0cc2ec0f0f2380d2c5456a5b8c9bb1789e832cde
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sun Jul 28 18:41:43 2019 -0800
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Aug 1 07:37:34 2019 +0200

    tdf#126584 Disable styles next style edit style button
    
    ...on dialog opening for paragraph and page new style creation.
    
    Change-Id: I64dd51947261249293581c73bd1c410f3b54a592
    Reviewed-on: https://gerrit.libreoffice.org/76717
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 836ca6de1164..4b022a8eddc0 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -83,7 +83,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const Sf
     // this Page needs ExchangeSupport
     SetExchangeSupport();
 
-    if ( aFollow == aName )
+    if ( aFollow.isEmpty() || aFollow == aName )
         m_xEditStyleBtn->set_sensitive(false);
     else
         m_xEditStyleBtn->set_sensitive(true);
@@ -489,7 +489,10 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ )
             pStyle->SetFollow( aFollow );
 
         if ( aFollow.isEmpty() )
+        {
             m_xFollowLb->set_active_text( aName );
+            m_xEditStyleBtn->set_sensitive( false );
+        }
         else
             m_xFollowLb->set_active_text( aFollow );
     }


More information about the Libreoffice-commits mailing list