diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 22:46:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-05 08:13:49 +0000 |
| commit | b619f4e67290c6c299e44927b1616a60b5dcf34d (patch) | |
| tree | f45a9b2e56f65195d5b173fd49a943b7918b588a | |
| parent | 07a4f761ddead5e1f2af96ab5793fcc94d1abcaa (diff) | |
fdo#52022: Simple/LargeControlPoints actually can have nil values
...in old LO 3.5 registrymodifications.xcu, which causes trouble when migrating
to >= LO 3.6, see <https://bugs.freedesktop.org/show_bug.cgi?id=52022#c23> for
all the details.
Change-Id: I8fa1e67998c9588b9d8bf3a3b52e4b0684d3d705
(cherry picked from commit a51833bf79eed21a7cddd6da45dc9d3dc07b4983)
Reviewed-on: https://gerrit.libreoffice.org/765
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
3 files changed, 6 insertions, 6 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 0f5898ea19e9..55ee57a88715 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -340,7 +340,7 @@ </info> <value>false</value> </prop> - <prop oor:name="SimpleControlPoint" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="SimpleControlPoint" oor:type="xs:boolean"> <!-- OldPath: Calc/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Lines --> @@ -351,7 +351,7 @@ </info> <value>false</value> </prop> - <prop oor:name="LargeControlPoint" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="LargeControlPoint" oor:type="xs:boolean"> <!-- OldPath: Calc/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Lines --> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index e79798885a83..8865f7401710 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1306,7 +1306,7 @@ </info> <value>false</value> </prop> - <prop oor:name="SimpleControlPoint" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="SimpleControlPoint" oor:type="xs:boolean"> <!-- OldPath: Writer/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines --> @@ -1317,7 +1317,7 @@ </info> <value>false</value> </prop> - <prop oor:name="LargeControlPoint" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="LargeControlPoint" oor:type="xs:boolean"> <!-- OldPath: Writer/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines --> diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index 79f581a42928..6b998699903d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -210,7 +210,7 @@ </info> <value>false</value> </prop> - <prop oor:name="SimpleControlPoint" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="SimpleControlPoint" oor:type="xs:boolean"> <!-- OldPath: HTML_Editor/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines --> @@ -221,7 +221,7 @@ </info> <value>false</value> </prop> - <prop oor:name="LargeControlPoint" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="LargeControlPoint" oor:type="xs:boolean"> <!-- OldPath: HTML_Editor/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines --> |