diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-17 10:32:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-17 22:06:55 +0100 |
| commit | 83057749a921286add0b7e588f67cd3522125665 (patch) | |
| tree | 44196c674bedaa29fbe08642339db6f606ea0925 /chart2/source/controller/dialogs/res_DataLabel.cxx | |
| parent | can restore this test again (diff) | |
| download | core-83057749a921286add0b7e588f67cd3522125665.tar.gz core-83057749a921286add0b7e588f67cd3522125665.zip | |
Resolves: tdf#130045 dial control frame not hidden along with the control
Change-Id: Idcdf3d748849fbe1ba1a6cce278373e349ba1e5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86967
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller/dialogs/res_DataLabel.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/res_DataLabel.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 69ed9f478746..9c5e4617f662 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -109,9 +109,10 @@ DataLabelResources::DataLabelResources(weld::Builder* pBuilder, weld::Window* pP , m_xNF_Degrees(pBuilder->weld_metric_spin_button("NF_LABEL_DEGREES", FieldUnit::DEGREE)) , m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION")) , m_xLB_TextDirection(new TextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR"))) - , m_xDC_Dial(new weld::CustomWeld(*pBuilder, "CT_DIAL", m_aDC_Dial)) + , m_xDC_Dial(new svx::DialControl(pBuilder->weld_scrolled_window("anglepreview"))) + , m_xDC_DialWin(new weld::CustomWeld(*pBuilder, "CT_DIAL", *m_xDC_Dial)) { - m_aDC_Dial.SetText(m_xFT_Dial->get_label()); + m_xDC_Dial->SetText(m_xFT_Dial->get_label()); //fill label placement list std::map< sal_Int32, OUString > aPlacementToStringMap; @@ -153,7 +154,7 @@ DataLabelResources::DataLabelResources(weld::Builder* pBuilder, weld::Window* pP m_xCBPercent->set_sensitive(false); } - m_aDC_Dial.SetLinkedField(m_xNF_Degrees.get()); + m_xDC_Dial->SetLinkedField(m_xNF_Degrees.get()); } DataLabelResources::~DataLabelResources() @@ -293,9 +294,9 @@ void DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const if (m_xLB_TextDirection->get_active() != -1) rOutAttrs->Put( SvxFrameDirectionItem( m_xLB_TextDirection->get_active_id(), EE_PARA_WRITINGDIR ) ); - if( m_aDC_Dial.IsVisible() ) + if( m_xDC_Dial->IsVisible() ) { - sal_Int32 nDegrees = m_aDC_Dial.GetRotation(); + sal_Int32 nDegrees = m_xDC_Dial->GetRotation(); rOutAttrs->Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); } } @@ -345,10 +346,10 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs) if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, true, &pPoolItem ) == SfxItemState::SET ) { sal_Int32 nDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); - m_aDC_Dial.SetRotation( nDegrees ); + m_xDC_Dial->SetRotation( nDegrees ); } else - m_aDC_Dial.SetRotation( 0 ); + m_xDC_Dial->SetRotation( 0 ); EnableControls(); } |