From d157c1bd70d630a58db33910d550bb8dee9fe62e Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Date: Thu, 8 Jul 2021 05:50:25 +0200
Subject: tdf#126665 Remember last used file picker directory

This introduces internal tracking of last used directories.
Each caller of the file picker can pass a "context". The selected
directory will then be saved & restored when opening the file picker
with the same context again.

After ffa636ba74b04b3258ec9a696bc4eac33581fa24 , the Windows file picker
no longer tracks the last used directory itself.
This is a replacement and an improvement at the same time, since there is not
one global last used directory, but one per context.

Change-Id: I10650cfb9359922690954fa65c89b4e47477e2c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118597
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
---
 .../registry/schema/org/openoffice/Office/Common.xcs      | 15 +++++++++++++++
 .../registry/schema/org/openoffice/Office/Impress.xcs     | 14 --------------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'officecfg/registry/schema/org/openoffice')

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 56954ead6ffb..b5cc8182eb46 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -844,6 +844,16 @@
         <value/>
       </prop>
     </group>
+    <group oor:name="LastDirectory">
+      <info>
+        <desc>Stores the last selected directory for the filepicker for different contexts.</desc>
+      </info>
+      <prop oor:name="LastPath" oor:type="xs:string" oor:nillable="false">
+        <info>
+          <desc>The last used path for this context (context is the name of the parent node)</desc>
+        </info>
+      </prop>
+    </group>
   </templates>
   <component>
     <group oor:name="VCL">
@@ -5898,6 +5908,11 @@
           <desc>URL of the last used service in the remote file picker.</desc>
         </info>
       </prop>
+      <set oor:name="FilePickerLastDirectory" oor:node-type="LastDirectory">
+        <info>
+          <desc>Contains the last used directory for the filepicker for various contexts</desc>
+        </info>
+      </set>
       <prop oor:name="CmisServersUrls" oor:type="oor:string-list" oor:nillable="false">
         <info>
           <desc>List of sample URLs of the CMIS servers in the place edition dialog.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index d8edf33b8c12..83d43c360a83 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1644,19 +1644,5 @@
         <value>$(work)</value>
       </prop>
     </group>
-    <group oor:name="Sound">
-      <info>
-        <desc>Contains configuration items for Sound related functions.</desc>
-      </info>
-      <prop oor:name="Path" oor:type="xs:string" oor:nillable="false">
-        <info>
-          <desc>
-            Access path, where sounds were loaded last time.
-            The default is work directory.
-          </desc>
-        </info>
-        <value>$(work)</value>
-      </prop>
-    </group>
   </component>
 </oor:component-schema>
-- 
cgit