summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2020-10-16 14:34:43 +0200
committerJan Holesovsky <kendy@collabora.com>2020-11-18 19:52:08 +0100
commitc5bd74c0ace401812be416a295c71a6604f8240d (patch)
tree390ce98216e8de4045e979cd347fdc1be6205f3c /chart2
parent935c558a8d2edccca341515509a7e577aac58dc1 (diff)
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> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105617 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/sidebar/ChartElementsPanel.cxx20
1 files changed, 12 insertions, 8 deletions
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 68175acd46d2..a4771b76ee0c 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -427,19 +427,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));