diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-26 20:57:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-01 18:04:46 +0200 |
| commit | d2f1cd004310b9ea6654d17fddc11cb08e884c90 (patch) | |
| tree | 2d2ad2d4afa5e2eb1c62a8e7ee1ac7bd0bf4f791 /chart2 | |
| parent | 96dc14a041ea803f0d194a47a8f3d62f6cfa37be (diff) | |
weld EditControl for browsebox
Change-Id: I8f21c12f7ee10e1b9ba883a8ff01bb5252429f09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 15 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.hxx | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 0aaccdea65cf..a693b142d6d0 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -498,7 +498,7 @@ DataBrowser::DataBrowser(const css::uno::Reference<css::awt::XWindow> &rParent, m_bIsReadOnly( false ), m_bDataValid( true ), m_aNumberEditField( VclPtr<FormattedField>::Create( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ) ), - m_aTextEditField( VclPtr<Edit>::Create( & EditBrowseBox::GetDataWindow(), WB_NOBORDER ) ), + m_aTextEditField(VclPtr<EditControl>::Create(&EditBrowseBox::GetDataWindow())), m_pColumnsWin(pColumns), m_pColorsWin(pColors), m_rNumberEditController( new ::svt::FormattedFieldCellController( m_aNumberEditField.get() )), @@ -1128,8 +1128,9 @@ void DataBrowser::InitController( if( rController == m_rTextEditController ) { OUString aText( GetCellText( nRow, nCol ) ); - m_aTextEditField->SetText( aText ); - m_aTextEditField->SetSelection( ::Selection( 0, aText.getLength() )); + weld::Entry& rEntry = m_aTextEditField->get_widget(); + rEntry.set_text(aText); + rEntry.select_region(0, -1); } else if( rController == m_rNumberEditController ) { @@ -1210,7 +1211,8 @@ bool DataBrowser::SaveModified() break; case DataBrowserModel::TEXTORDATE: { - OUString aText( m_aTextEditField->GetText() ); + weld::Entry& rEntry = m_aTextEditField->get_widget(); + OUString aText(rEntry.get_text()); double fValue = 0.0; bChangeValid = false; if( isDateTimeString( aText, fValue ) ) @@ -1221,7 +1223,8 @@ bool DataBrowser::SaveModified() break; case DataBrowserModel::TEXT: { - OUString aText( m_aTextEditField->GetText()); + weld::Entry& rEntry = m_aTextEditField->get_widget(); + OUString aText(rEntry.get_text()); bChangeValid = m_apDataBrowserModel->setCellText( nCol, nRow, aText ); } break; @@ -1233,7 +1236,7 @@ bool DataBrowser::SaveModified() RowModified( GetCurRow(), GetCurColumnId()); ::svt::CellController* pCtrl = GetController( GetCurRow(), GetCurColumnId()); if( pCtrl ) - pCtrl->ClearModified(); + pCtrl->SaveValue(); } return bChangeValid; diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 8e6372b0b833..7f213382cf81 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -161,7 +161,7 @@ private: bool m_bDataValid; VclPtr<FormattedField> m_aNumberEditField; - VclPtr<Edit> m_aTextEditField; + VclPtr<svt::EditControl> m_aTextEditField; weld::Container* m_pColumnsWin; weld::Container* m_pColorsWin; |