diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-10-16 14:34:43 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-10-16 16:26:55 +0200 |
| commit | ebd3d84ad58b31d325dbe17c35759d12ed7a4242 (patch) | |
| tree | 14ae0a0da34e09628f1534a73d1173dd047b7bf3 /chart2 | |
| parent | uitest: Rename the "SET" to "TYPE" for Edit boxes + implement the real "SET". (diff) | |
| download | core-ebd3d84ad58b31d325dbe17c35759d12ed7a4242.tar.gz core-ebd3d84ad58b31d325dbe17c35759d12ed7a4242.zip | |
lok: Make the chart (sub)title work even from the mobile-wizard.
Change-Id: Ic6346a403639e283ade47429f581f91e7a468f63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104436
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/sidebar/ChartElementsPanel.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 4026b22d9898..ce3827aa20e2 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -434,19 +434,23 @@ void ChartElementsPanel::updateData() bool hasTitle = isTitleVisisble(mxModel, TitleHelper::MAIN_TITLE); mpCBTitle->Check(hasTitle); - if (!mpEditTitle->HasFocus()) - { - mpEditTitle->SetText(TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::MAIN_TITLE, mxModel))); + + OUString title = mpEditTitle->GetText(); + OUString newTitle = TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::MAIN_TITLE, mxModel)); + if (title != newTitle) + mpEditTitle->SetText(newTitle); + if (mpEditTitle->IsEnabled() != hasTitle) mpEditTitle->Enable(hasTitle); - } bool hasSubtitle = isTitleVisisble(mxModel, TitleHelper::SUB_TITLE); mpCBSubtitle->Check(hasSubtitle); - if (!mpEditSubtitle->HasFocus()) - { - mpEditSubtitle->SetText(TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::SUB_TITLE, mxModel))); + + OUString subtitle = mpEditSubtitle->GetText(); + OUString newSubtitle = TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::SUB_TITLE, mxModel)); + if (subtitle != newSubtitle) + mpEditSubtitle->SetText(newSubtitle); + if (mpEditSubtitle->IsEnabled() != hasSubtitle) mpEditSubtitle->Enable(hasSubtitle); - } mpCBXAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::X_AXIS_TITLE)); mpCBYAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::Y_AXIS_TITLE)); |