diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-03-26 14:55:56 +0200 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-03-28 19:50:10 +0200 |
| commit | b57e8b5e531408236af5e3be69b9190c646a6eab (patch) | |
| tree | f79022e0ec0a12e969001031ed9b119b4920864f /sw | |
| parent | 6d4bb4dd4ef425a429c929e7d953cf9b54a74576 (diff) | |
tdf#116407 - option "Border" for new table redundant
Function removed
Change-Id: I2346a0ba91afb72c7c68a6d50fc103d0409ae374
Reviewed-on: https://gerrit.libreoffice.org/51896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/table/convert.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/convert.hxx | 1 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/converttexttable.ui | 19 |
3 files changed, 2 insertions, 22 deletions
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 8374e5865f04..e5c8f9ffdefe 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -75,8 +75,6 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim, } sal_uInt16 nInsMode = 0; - if (m_xBorderCB->get_active()) - nInsMode |= tabopts::DEFAULT_BORDER; if (m_xHeaderCB->get_active()) nInsMode |= tabopts::HEADLINE; if (m_xRepeatHeaderCB->get_sensitive() && m_xRepeatHeaderCB->get_active()) @@ -107,7 +105,6 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) , m_xRepeatRows(m_xBuilder->weld_container("repeatrows")) , m_xRepeatHeaderNF(m_xBuilder->weld_spin_button("repeatheadersb")) , m_xDontSplitCB(m_xBuilder->weld_check_button("dontsplitcb")) - , m_xBorderCB(m_xBuilder->weld_check_button("bordercb")) , m_xAutoFormatBtn(m_xBuilder->weld_button("autofmt")) , sConvertTextTable(SwResId(STR_CONVERT_TEXT_TABLE)) , pShell(&rView.GetWrtShell()) @@ -166,7 +163,6 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) m_xHeaderCB->set_active(0 != (nInsTableFlags & tabopts::HEADLINE)); m_xRepeatHeaderCB->set_active(aInsOpts.mnRowsToRepeat > 0); m_xDontSplitCB->set_active(0 == (nInsTableFlags & tabopts::SPLIT_LAYOUT)); - m_xBorderCB->set_active(0!= (nInsTableFlags & tabopts::DEFAULT_BORDER)); m_xHeaderCB->connect_clicked(LINK(this, SwConvertTableDlg, CheckBoxHdl)); m_xRepeatHeaderCB->connect_clicked(LINK(this, SwConvertTableDlg, ReapeatHeaderCheckBoxHdl)); diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 9dfefc5fa642..90d1cfebf715 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -45,7 +45,6 @@ class SwConvertTableDlg : public weld::GenericDialogController std::unique_ptr<weld::SpinButton> m_xRepeatHeaderNF; std::unique_ptr<weld::CheckButton> m_xDontSplitCB; - std::unique_ptr<weld::CheckButton> m_xBorderCB; std::unique_ptr<weld::Button> m_xAutoFormatBtn; OUString sConvertTextTable; diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui index 08c2d89e81d9..eefb08de62e9 100644 --- a/sw/uiconfig/swriter/ui/converttexttable.ui +++ b/sw/uiconfig/swriter/ui/converttexttable.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.2 --> +<!-- Generated with glade 3.20.4 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustment1"> @@ -293,21 +293,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="bordercb"> - <property name="label" translatable="yes" context="converttexttable|bordercb">Border</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> <object class="GtkGrid" id="repeatrows"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -366,7 +351,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">4</property> </packing> </child> </object> |