[Libreoffice-commits] core.git: sw/sdi sw/source

Mon Sep 3 21:39:40 UTC 2018

sw/sdi/_frmsh.sdi                 |    6 ++++++
 sw/source/uibase/shells/frmsh.cxx |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit 6c3d10d86e48e92ad963750ec5ba6e1049df2532
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Mon Sep 3 12:16:55 2018 +0300
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Mon Sep 3 23:39:20 2018 +0200

    Enable the align group button for frames
    
    Change-Id: I6ba8b5fe0d185817e61986c90f5264493b6d5339
    Reviewed-on: https://gerrit.libreoffice.org/59951
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 734b50c5ebc1..6d02c04efdeb 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -330,6 +330,12 @@ interface BaseTextFrame
         DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
     ]
 
+    SID_OBJECT_ALIGN
+    [
+        StateMethod = GetState ;
+        DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+    ]
+
     FN_FORMAT_FOOTNOTE_DLG // status()
     [
         ExecMethod = Execute;
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index b9c7b98a3f95..1f3a0d3424ca 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -735,6 +735,12 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                     rSet.Put(aSet.Get(GetPool().GetWhich(nWhich)));
                 }
                 break;
+                case SID_OBJECT_ALIGN:
+                {
+                    if ( bProtect )
+                        rSet.DisableItem( nWhich );
+                }
+                break;
                 case SID_OBJECT_ALIGN_LEFT   :
                 case SID_OBJECT_ALIGN_CENTER :
                 case SID_OBJECT_ALIGN_RIGHT  :
