[Libreoffice-commits] core.git: chart2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Oct 14 13:04:12 UTC 2018
chart2/source/controller/dialogs/TextDirectionListBox.cxx | 2 +-
chart2/source/controller/dialogs/res_DataLabel.cxx | 2 +-
chart2/source/controller/dialogs/res_DataLabel.hxx | 2 +-
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 2 +-
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2 +-
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 2 +-
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 2 +-
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 2 +-
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 2 +-
chart2/source/controller/inc/TextDirectionListBox.hxx | 4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 7e85ee1e5fdf0c122f450155f49d9696aef17de0
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 13 21:26:16 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Oct 14 15:03:51 2018 +0200
rename SchTextDirectionListBox back to TextDirectionListBox
Change-Id: Ic2369630e66fa26e189fbbc374c5a60ce7fb8173
Reviewed-on: https://gerrit.libreoffice.org/61754
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 1114cd8b52f2..b26350942f03 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,7 +27,7 @@
namespace chart
{
-SchTextDirectionListBox::SchTextDirectionListBox(std::unique_ptr<weld::ComboBox> pControl)
+TextDirectionListBox::TextDirectionListBox(std::unique_ptr<weld::ComboBox> pControl)
: svx::SvxFrameDirectionListBox(std::move(pControl))
{
append(SvxFrameDirection::Horizontal_LR_TB, SchResId(STR_TEXT_DIRECTION_LTR));
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index e44a346a0a46..e77fb0644961 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -108,7 +108,7 @@ DataLabelResources::DataLabelResources(weld::Builder* pBuilder, weld::Window* pP
, m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL"))
, m_xNF_Degrees(pBuilder->weld_spin_button("NF_LABEL_DEGREES"))
, m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION"))
- , m_xLB_TextDirection(new SchTextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")))
+ , 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_aDC_Dial.SetText(m_xFT_Dial->get_label());
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 036441266cf6..c1bbaef60ae0 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -83,7 +83,7 @@ private:
std::unique_ptr<weld::Widget> m_xBxTextDirection;
- std::unique_ptr<SchTextDirectionListBox> m_xLB_TextDirection;
+ std::unique_ptr<TextDirectionListBox> m_xLB_TextDirection;
std::unique_ptr<weld::CustomWeld> m_xDC_Dial;
DECL_LINK(NumberFormatDialogHdl, weld::Button&, void );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index d6526884188d..477049d24a5e 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -53,7 +53,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet
, m_xNfRotate(m_xBuilder->weld_spin_button("OrientDegree"))
, m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
, m_xFtTextDirection(m_xBuilder->weld_label("textdirL"))
- , m_xLbTextDirection(new SchTextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
+ , m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
, m_xCtrlDial(new weld::CustomWeld(*m_xBuilder, "dialCtrl", m_aCtrlDial))
{
m_aCtrlDial.SetText(m_xFtABCD->get_label());
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 619e099bd889..cd5673b7cb98 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -55,7 +55,7 @@ private:
std::unique_ptr<weld::SpinButton> m_xNfRotate;
std::unique_ptr<weld::CheckButton> m_xCbStacked;
std::unique_ptr<weld::Label> m_xFtTextDirection;
- std::unique_ptr<SchTextDirectionListBox> m_xLbTextDirection;
+ std::unique_ptr<TextDirectionListBox> m_xLbTextDirection;
std::unique_ptr<weld::CustomWeld> m_xCtrlDial;
DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index a16aec38a439..ce44fc18229e 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -31,7 +31,7 @@ namespace chart
SchLegendPosTabPage::SchLegendPosTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
, m_aLegendPositionResources(*m_xBuilder)
- , m_xLbTextDirection(new SchTextDirectionListBox(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")))
+ , m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")))
{
}
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 77d1773cf598..7e0491bfdb7e 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -32,7 +32,7 @@ class SchLegendPosTabPage : public SfxTabPage
private:
SchLegendPositionResources m_aLegendPositionResources;
- std::unique_ptr<SchTextDirectionListBox> m_xLbTextDirection;
+ std::unique_ptr<TextDirectionListBox> m_xLbTextDirection;
public:
SchLegendPosTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 79c696968322..c6c64df00566 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -37,7 +37,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(TabPageParent pParent,
, m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
, m_xFtTextDirection(m_xBuilder->weld_label("textdirL"))
, m_xFtABCD(m_xBuilder->weld_label("labelABCD"))
- , m_xLbTextDirection(new SchTextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
+ , m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
, m_xCtrlDial(new weld::CustomWeld(*m_xBuilder, "dialCtrl", m_aCtrlDial))
{
m_aCtrlDial.SetLinkedField(m_xNfRotate.get());
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 7520a84eee4d..edcab4ce9118 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -37,7 +37,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xCbStacked;
std::unique_ptr<weld::Label> m_xFtTextDirection;
std::unique_ptr<weld::Label> m_xFtABCD;
- std::unique_ptr<SchTextDirectionListBox> m_xLbTextDirection;
+ std::unique_ptr<TextDirectionListBox> m_xLbTextDirection;
std::unique_ptr<weld::CustomWeld> m_xCtrlDial;
DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx
index 766c8a95c1fb..83c64b541370 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -27,10 +27,10 @@ namespace vcl { class Window; }
namespace chart
{
-class SchTextDirectionListBox : public svx::SvxFrameDirectionListBox
+class TextDirectionListBox : public svx::SvxFrameDirectionListBox
{
public:
- explicit SchTextDirectionListBox(std::unique_ptr<weld::ComboBox> pControl);
+ explicit TextDirectionListBox(std::unique_ptr<weld::ComboBox> pControl);
};
More information about the Libreoffice-commits
mailing list