Kaydet (Commit) 050447a3 authored tarafından Yousuf Philips's avatar Yousuf Philips

tdf#89543 Unhide arrow style drop downs

Change-Id: I44c2b93389b88c0c1821ac727b46275bce8b076d
Reviewed-on: https://gerrit.libreoffice.org/18290Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarYousuf Philips <philipz85@hotmail.com>
üst 09c3e186
...@@ -126,11 +126,9 @@ private: ...@@ -126,11 +126,9 @@ private:
//ui controls //ui controls
VclPtr<FixedText> mpFTWidth; VclPtr<FixedText> mpFTWidth;
VclPtr<ToolBox> mpTBWidth; VclPtr<ToolBox> mpTBWidth;
VclPtr<FixedText> mpFTStyle;
VclPtr<ListBox> mpLBStyle; VclPtr<ListBox> mpLBStyle;
VclPtr<FixedText> mpFTTransparency; VclPtr<FixedText> mpFTTransparency;
VclPtr<MetricField> mpMFTransparent; VclPtr<MetricField> mpMFTransparent;
VclPtr<FixedText> mpFTArrow;
VclPtr<ListBox> mpLBStart; VclPtr<ListBox> mpLBStart;
VclPtr<ListBox> mpLBEnd; VclPtr<ListBox> mpLBEnd;
VclPtr<FixedText> mpFTEdgeStyle; VclPtr<FixedText> mpFTEdgeStyle;
......
...@@ -166,11 +166,9 @@ LinePropertyPanelBase::LinePropertyPanelBase( ...@@ -166,11 +166,9 @@ LinePropertyPanelBase::LinePropertyPanelBase(
get(mpFTWidth, "widthlabel"); get(mpFTWidth, "widthlabel");
get(mpTBWidth, "width"); get(mpTBWidth, "width");
get(mpTBColor, "color"); get(mpTBColor, "color");
get(mpFTStyle, "stylelabel");
get(mpLBStyle, "linestyle"); get(mpLBStyle, "linestyle");
get(mpFTTransparency, "translabel"); get(mpFTTransparency, "translabel");
get(mpMFTransparent, "linetransparency"); get(mpMFTransparent, "linetransparency");
get(mpFTArrow, "arrowlabel");
get(mpLBStart, "beginarrowstyle"); get(mpLBStart, "beginarrowstyle");
get(mpLBEnd, "endarrowstyle"); get(mpLBEnd, "endarrowstyle");
get(mpFTEdgeStyle, "cornerlabel"); get(mpFTEdgeStyle, "cornerlabel");
...@@ -193,11 +191,9 @@ void LinePropertyPanelBase::dispose() ...@@ -193,11 +191,9 @@ void LinePropertyPanelBase::dispose()
mpFTWidth.clear(); mpFTWidth.clear();
mpTBWidth.clear(); mpTBWidth.clear();
mpTBColor.clear(); mpTBColor.clear();
mpFTStyle.clear();
mpLBStyle.clear(); mpLBStyle.clear();
mpFTTransparency.clear(); mpFTTransparency.clear();
mpMFTransparent.clear(); mpMFTransparent.clear();
mpFTArrow.clear();
mpLBStart.clear(); mpLBStart.clear();
mpLBEnd.clear(); mpLBEnd.clear();
mpFTEdgeStyle.clear(); mpFTEdgeStyle.clear();
...@@ -253,9 +249,7 @@ void LinePropertyPanelBase::Initialize() ...@@ -253,9 +249,7 @@ void LinePropertyPanelBase::Initialize()
mpMFTransparent->SetAccessibleName(OUString("Transparency")); //wj acc mpMFTransparent->SetAccessibleName(OUString("Transparency")); //wj acc
mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth); mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth);
mpLBStyle->SetAccessibleRelationLabeledBy(mpFTStyle);
mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTransparency); mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTransparency);
mpLBStart->SetAccessibleRelationLabeledBy(mpFTArrow);
mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd); mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd);
aLink = LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl ); aLink = LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl );
...@@ -275,12 +269,10 @@ void LinePropertyPanelBase::updateLineStyle(bool bDisabled, bool bSetOrDefault, ...@@ -275,12 +269,10 @@ void LinePropertyPanelBase::updateLineStyle(bool bDisabled, bool bSetOrDefault,
{ {
if(bDisabled) if(bDisabled)
{ {
mpFTStyle->Disable();
mpLBStyle->Disable(); mpLBStyle->Disable();
} }
else else
{ {
mpFTStyle->Enable();
mpLBStyle->Enable(); mpLBStyle->Enable();
} }
...@@ -303,12 +295,10 @@ void LinePropertyPanelBase::updateLineDash(bool bDisabled, bool bSetOrDefault, c ...@@ -303,12 +295,10 @@ void LinePropertyPanelBase::updateLineDash(bool bDisabled, bool bSetOrDefault, c
{ {
if(bDisabled) if(bDisabled)
{ {
mpFTStyle->Disable();
mpLBStyle->Disable(); mpLBStyle->Disable();
} }
else else
{ {
mpFTStyle->Enable();
mpLBStyle->Enable(); mpLBStyle->Enable();
} }
...@@ -389,12 +379,10 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault, ...@@ -389,12 +379,10 @@ void LinePropertyPanelBase::updateLineStart(bool bDisabled, bool bSetOrDefault,
{ {
if(bDisabled) if(bDisabled)
{ {
mpFTArrow->Disable();
mpLBStart->Disable(); mpLBStart->Disable();
} }
else else
{ {
mpFTArrow->Enable();
mpLBStart->Enable(); mpLBStart->Enable();
} }
...@@ -417,12 +405,10 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault, ...@@ -417,12 +405,10 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, bool bSetOrDefault,
{ {
if(bDisabled) if(bDisabled)
{ {
mpFTArrow->Disable();
mpLBEnd->Disable(); mpLBEnd->Disable();
} }
else else
{ {
mpFTArrow->Enable();
mpLBEnd->Enable(); mpLBEnd->Enable();
} }
...@@ -925,6 +911,8 @@ void LinePropertyPanelBase::ActivateControls() ...@@ -925,6 +911,8 @@ void LinePropertyPanelBase::ActivateControls()
mpGridLineProps->Enable( bLineStyle ); mpGridLineProps->Enable( bLineStyle );
mpBoxArrowProps->Enable( bLineStyle ); mpBoxArrowProps->Enable( bLineStyle );
mpLBStart->Enable( bLineStyle );
mpLBEnd->Enable( bLineStyle );
} }
void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit) void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit)
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment