[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sd/source

[Ilhan Yesil]

 sd/source/ui/view/drtxtob.cxx |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit edeed0680b99e4c35b528cd2a249168cbbc04770
Author: Ilhan Yesil <ilhanyesil at gmx.de>
Date:   Mon May 28 11:05:30 2018 +0200

    tdf#117847 Impress: Deselected alignment remained checked
    
    The state of the attributes for alignment are now read and set
    correctly.
    
    Reviewed-on: https://gerrit.libreoffice.org/54907
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 07610feeeff47fc5bbe057c91c50ffae54a41c85)
    
    Conflicts:
            sd/source/ui/view/drtxtob.cxx
    
    Change-Id: I65047dac341729154ded0d5b01ace1207893a5ba
    Reviewed-on: https://gerrit.libreoffice.org/55083
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 25e0e44f39ab..55c5d34c0087 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -481,16 +481,27 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
         {
             case SVX_ADJUST_LEFT:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) );
+                rSet.Put( SfxBoolItem(SID_ATTR_PARA_ADJUST_CENTER, false ) );
+                rSet.Put( SfxBoolItem(SID_ATTR_PARA_ADJUST_RIGHT, false ) );
+                rSet.Put( SfxBoolItem(SID_ATTR_PARA_ADJUST_BLOCK, false ) );
             break;
             case SVX_ADJUST_CENTER:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) );
-            break;
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) );
+                break;
             case SVX_ADJUST_RIGHT:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, false ) );
             break;
             case SVX_ADJUST_BLOCK:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) );
-            break;
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, false ) );
             default:
             break;
         }