svx/source/sidebar/line/LinePropertyPanel.cxx | 2 ++ svx/source/sidebar/line/LinePropertyPanelBase.cxx | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit f131e6ef72bcb778bef11a497777bef099d9c4d9 Author: Rishabh Kumar <[email protected]> Date: Wed May 25 17:19:56 2016 +0530 Disable line arrow heads when a shape is selected Change-Id: Ib2a6056f9739dad5c3b7567ded6c2ba3aca63247 Reviewed-on: https://gerrit.libreoffice.org/25447 Tested-by: Jenkins <[email protected]> Reviewed-by: Katarina Behrens <[email protected]> diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 9659357..9670e74 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -199,6 +199,8 @@ void LinePropertyPanel::HandleContextChange( { case CombinedEnumContext(Application_Calc, Context_DrawLine): case CombinedEnumContext(Application_DrawImpress, Context_DrawLine): + case CombinedEnumContext(Application_WriterVariants, Context_Draw): + // TODO : Implement DrawLine context in Writer bShowArrows = true; break; } diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 5bc9fb9..906a412 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -901,8 +901,8 @@ void LinePropertyPanelBase::ActivateControls() mpGridLineProps->Enable( bLineStyle ); mpBoxArrowProps->Enable( bLineStyle ); - mpLBStart->Enable( bLineStyle ); - mpLBEnd->Enable( bLineStyle ); + mpLBStart->Enable( bLineStyle && mbArrowSupported ); + mpLBEnd->Enable( bLineStyle && mbArrowSupported ); } void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit) @@ -913,8 +913,7 @@ void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit) void LinePropertyPanelBase::disableArrowHead() { mbArrowSupported = false; - mpLBStart->Hide(); - mpLBEnd->Hide(); + ActivateControls(); } }} // end of namespace svx::sidebar _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
