From 23467fa5cfa2feffbeba2177c0d393f8ebe1a0a3 Mon Sep 17 00:00:00 2001
From: Katarina Behrens <Katarina.Behrens@cib.de>
Date: Wed, 18 Oct 2017 12:50:59 +0200
Subject: tdf#67770: Read/writer LastActiveDeck bits

Change-Id: Id5e3c3cb4144b9fc56ab5e4a4e49f1fc69e70023
Reviewed-on: https://gerrit.libreoffice.org/43493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
---
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu   | 5 -----
 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 6a7f5ad6da53..f65558a9b72d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -1549,10 +1549,5 @@
         </prop>
       </node>
     </node>
-    <prop oor:name="LastActiveDeck">
-      <value oor:separator=";">
-         any, PropertyDeck;
-      </value>
-    </prop>
   </node>
 </oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index 6c5fc3a17482..3258798d19fc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -245,7 +245,7 @@
           <desc>Contains all registered sidebar content panels.</desc>
         </info>
       </set>
-      <prop oor:name="LastActiveDeck" oor:type="oor:string-list">
+      <prop oor:name="LastActiveDeck" oor:type="oor:string-list" oor:nillable="false">
         <info>
 	  <desc>Contains IDs of the decks that were active last time the application was closed.
 	    Each entry is a string of 2 comma-separated values, application name and DeckID. Valid
@@ -255,6 +255,9 @@
 	    Impress, PropertyDeck;
 	  </desc>
 	</info>
+	<value>
+	  <it>any,PropertyDeck</it>
+	</value>
       </prop>
     </group>
   </component>
-- 
cgit