diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-10-25 15:26:18 +0200 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-10-27 14:19:17 +0200 |
commit | 142985383f9ccc321e3fa084ce81d3d436c85c45 (patch) | |
tree | 88ab961e451488998687f8ba783dc61f2a2bfb75 | |
parent | 3bb49555e9e3ea54a575ac8342ca3740aad51d74 (diff) |
tdf#120906 - Option to use Header/Footer not working correctly
Now with storage capabilities too
Change-Id: Iaf9050b38ce356d80c26f339caf61267c1fb3c3b
Reviewed-on: https://gerrit.libreoffice.org/62360
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 2 | ||||
-rw-r--r-- | sw/source/uibase/config/usrpref.cxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index f922e54e80ba..259c3d2f4cf3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1064,7 +1064,7 @@ <value>true</value> </prop> <prop oor:name="UseHeaderFooterMenu" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: Tools - Options - Text document - Contents - [Section] Display --> + <!-- UIHints: Insert - Header and Footer - [x] Use... --> <info> <desc>Enables the writer to use the advanced menu on headers/footers.</desc> <label>Use advanced header/footer menu</label> diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 68b4602b4f6f..f8a08ef6c83b 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -104,10 +104,10 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames() "Update/Link", // 16 "Update/Field", // 17 "Update/Chart", // 18 - "Display/ShowInlineTooltips" //19 - + "Display/ShowInlineTooltips", // 19 + "Display/UseHeaderFooterMenu" // 20 }; - const int nCount = bWeb ? 12 : 20; + const int nCount = bWeb ? 12 : 21; Sequence<OUString> aNames(nCount); OUString* pNames = aNames.getArray(); for(int i = 0; i < nCount; i++) @@ -167,6 +167,7 @@ void SwContentViewConfig::ImplCommit() case 17: bVal = rParent.IsUpdateFields(); break;// "Update/Field", case 18: bVal = rParent.IsUpdateCharts(); break;// "Update/Chart" case 19: bVal = rParent.IsShowInlineTooltips(); break;// "Display/ShowInlineTooltips" + case 20: bVal = rParent.IsUseHeaderFooterMenu(); break;// "Display/UseHeaderFooterMenu" } if(nProp != 16) pValues[nProp] <<= bVal; @@ -215,6 +216,7 @@ void SwContentViewConfig::Load() case 17: rParent.SetUpdateFields(bSet); break;// "Update/Field", case 18: rParent.SetUpdateCharts(bSet); break;// "Update/Chart" case 19: rParent.SetShowInlineTooltips(bSet); break;// "Display/ShowInlineTooltips" + case 20: rParent.SetUseHeaderFooterMenu(bSet); break;// "Display/UseHeaderFooterMenu" } } } |