summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRishabh Kumar <kris.kr296@gmail.com>2016-05-25 17:19:56 +0530
committerKatarina Behrens <Katarina.Behrens@cib.de>2016-05-25 16:42:54 +0000
commitf131e6ef72bcb778bef11a497777bef099d9c4d9 (patch)
tree987a014c979309ce4f563274f2eb2a36e3038f75
parent80502737b2ac722d4adfd4e89d3dc46799ded97e (diff)
Disable line arrow heads when a shape is selected
Change-Id: Ib2a6056f9739dad5c3b7567ded6c2ba3aca63247 Reviewed-on: https://gerrit.libreoffice.org/25447 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanelBase.cxx7
2 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 9659357b2936..9670e74a1aa9 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 5bc9fb98ce46..906a4128e458 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