sw/source/ui/config/optpage.cxx | 3 ---
sw/source/uibase/config/cfgitems.cxx | 4 ----
sw/source/uibase/inc/cfgitems.hxx | 1 -
sw/source/uibase/inc/optpage.hxx | 1 -
sw/uiconfig/swriter/ui/viewoptionspage.ui | 21 +++------------------
5 files changed, 3 insertions(+), 27 deletions(-)
New commits:
commit 468a740f0fe09f8939368eca3067b4101c84c057
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Tue Jan 7 14:55:14 2020 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Jan 8 10:06:58 2020 +0100
Resolves tdf#129793 - Remove "Field codes" option
var m_xFieldNameCB, elem m_bFieldName, ui fieldcode removed
Change-Id: I6711f9b8c4f84d6ef19bc295243df0341f8c4f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86350
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7f601ceabc8f..4f1a0c3bbf9c 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -105,7 +105,6 @@ SwContentOptPage::SwContentOptPage(weld::Container* pPage,
weld::DialogControlle
, m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
, m_xTableCB(m_xBuilder->weld_check_button("tables"))
, m_xDrwCB(m_xBuilder->weld_check_button("drawings"))
- , m_xFieldNameCB(m_xBuilder->weld_check_button("fieldcodes"))
, m_xPostItCB(m_xBuilder->weld_check_button("comments"))
, m_xSettingsFrame(m_xBuilder->weld_frame("settingsframe"))
, m_xSettingsLabel(m_xBuilder->weld_label("settingslabel"))
@@ -205,7 +204,6 @@ void SwContentOptPage::Reset(const SfxItemSet* rSet)
m_xTableCB->set_active(pElemAttr->m_bTable);
m_xGrfCB->set_active(pElemAttr->m_bGraphic);
m_xDrwCB->set_active(pElemAttr->m_bDrawing);
- m_xFieldNameCB->set_active(pElemAttr->m_bFieldName);
m_xPostItCB->set_active(pElemAttr->m_bNotes);
m_xCrossCB->set_active(pElemAttr->m_bCrosshair);
m_xVRulerCBox->set_active(pElemAttr->m_bVertRuler);
@@ -230,7 +228,6 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
aElem.m_bTable = m_xTableCB->get_active();
aElem.m_bGraphic = m_xGrfCB->get_active();
aElem.m_bDrawing = m_xDrwCB->get_active();
- aElem.m_bFieldName = m_xFieldNameCB->get_active();
aElem.m_bNotes = m_xPostItCB->get_active();
aElem.m_bCrosshair = m_xCrossCB->get_active();
aElem.m_bVertRuler = m_xVRulerCBox->get_active();
diff --git a/sw/source/uibase/config/cfgitems.cxx
b/sw/source/uibase/config/cfgitems.cxx
index 688216d4130e..5f283f520d44 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -89,7 +89,6 @@ SwElemItem::SwElemItem() :
m_bTable =
m_bGraphic =
m_bDrawing =
- m_bFieldName =
m_bNotes = false;
m_bShowInlineTooltips = true;
m_bFieldHiddenText =
@@ -106,7 +105,6 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt) :
m_bTable = rVOpt.IsTable();
m_bGraphic = rVOpt.IsGraphic();
m_bDrawing = rVOpt.IsDraw() && rVOpt.IsControl();
- m_bFieldName = rVOpt.IsFieldName();
m_bNotes = rVOpt.IsPostIts();
m_bShowInlineTooltips = rVOpt.IsShowInlineTooltips();
m_bFieldHiddenText = rVOpt.IsShowHiddenField();
@@ -131,7 +129,6 @@ bool SwElemItem::operator==( const SfxPoolItem& rAttr )
const
m_bTable == rItem.m_bTable &&
m_bGraphic == rItem.m_bGraphic &&
m_bDrawing == rItem.m_bDrawing &&
- m_bFieldName == rItem.m_bFieldName &&
m_bNotes == rItem.m_bNotes &&
m_bShowInlineTooltips == rItem.m_bShowInlineTooltips &&
m_bFieldHiddenText == rItem.m_bFieldHiddenText &&
@@ -148,7 +145,6 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
rVOpt.SetGraphic (m_bGraphic );
rVOpt.SetDraw (m_bDrawing );
rVOpt.SetControl (m_bDrawing );
- rVOpt.SetFieldName (m_bFieldName );
rVOpt.SetPostIts (m_bNotes );
rVOpt.SetShowInlineTooltips( m_bShowInlineTooltips );
rVOpt.SetShowHiddenField(m_bFieldHiddenText );
diff --git a/sw/source/uibase/inc/cfgitems.hxx
b/sw/source/uibase/inc/cfgitems.hxx
index 40f21ff6e98d..a800704e679f 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -74,7 +74,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
bool m_bTable :1;
bool m_bGraphic :1;
bool m_bDrawing :1;
- bool m_bFieldName :1;
bool m_bNotes :1;
bool m_bShowInlineTooltips :1;
bool m_bFieldHiddenText :1;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 0fb643768eeb..1f971b2378d3 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -45,7 +45,6 @@ class SwContentOptPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xGrfCB;
std::unique_ptr<weld::CheckButton> m_xTableCB;
std::unique_ptr<weld::CheckButton> m_xDrwCB;
- std::unique_ptr<weld::CheckButton> m_xFieldNameCB;
std::unique_ptr<weld::CheckButton> m_xPostItCB;
std::unique_ptr<weld::Frame> m_xSettingsFrame;
diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui
b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index 8ba0678ab3f6..cf6e782a2373 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -137,21 +137,6 @@
<property name="top_attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="fieldcodes">
- <property name="label" translatable="yes"
context="viewoptionspage|fieldcodes">_Field codes</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="comments">
<property name="label" translatable="yes"
context="viewoptionspage|comments">_Comments</property>
@@ -164,7 +149,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -179,7 +164,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -193,7 +178,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">5</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
