officecfg/registry/schema/org/openoffice/Inet.xcs              |   16 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs       |  134 --
 officecfg/registry/schema/org/openoffice/Office/Chart.xcs      |    2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs     |  248 -----
 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |    4 
 officecfg/registry/schema/org/openoffice/Office/Draw.xcs       |  120 --
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs    |  149 ---
 officecfg/registry/schema/org/openoffice/Office/Java.xcs       |   16 
 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |   40 
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs     |  447 
----------
 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs  |  106 --
 officecfg/registry/schema/org/openoffice/Setup.xcs             |    6 
 officecfg/registry/schema/org/openoffice/UserProfile.xcs       |   32 
 13 files changed, 1320 deletions(-)

New commits:
commit 16072fc3eaf222d59e7bf156174f49d829b79e86
Author:     Tor Lillqvist <[email protected]>
AuthorDate: Wed Dec 8 12:09:19 2021 +0200
Commit:     Tor Lillqvist <[email protected]>
CommitDate: Wed Dec 8 13:10:36 2021 +0100

    Bin pointless comments telling where some settings were in ancient times
    
    And some of the comments didn't even tell that, but were just idiotic
    copypasta, as in: <!-- OldLocation: --> .
    
    Change-Id: I71b889d1905f9291f920e8219f5648e63da3586e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126530
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <[email protected]>

diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs 
b/officecfg/registry/schema/org/openoffice/Inet.xcs
index 76d5d2ed0912..a236e0f92697 100644
--- a/officecfg/registry/schema/org/openoffice/Inet.xcs
+++ b/officecfg/registry/schema/org/openoffice/Inet.xcs
@@ -27,8 +27,6 @@
         <desc>Contains Internet-related configurations (servers, proxies, 
etc.).</desc>
       </info>
       <prop oor:name="ooInetNoProxy" oor:type="xs:string" oor:nillable="false">
-        <!-- OldPath: Inet/NoProxy -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Enumerates the names of servers that do not require any 
proxies.</desc>
@@ -37,8 +35,6 @@
         <!-- JB: Empty default inserted into empty property node. Remove if 
NIL was intended -->
       </prop>
       <prop oor:name="ooInetProxyType" oor:type="xs:int">
-        <!-- OldPath: Inet/ProxyType -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the type of proxy selection.</desc>
@@ -62,8 +58,6 @@
         </constraints>
       </prop>
       <prop oor:name="ooInetFTPProxyName" oor:type="xs:string" 
oor:nillable="false">
-        <!-- OldPath: Inet/FTPProxyName -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the name of the FTP proxy server.</desc>
@@ -72,8 +66,6 @@
         <!-- JB: Empty default inserted into empty property node. Remove if 
NIL was intended -->
       </prop>
       <prop oor:name="ooInetFTPProxyPort" oor:type="xs:int">
-        <!-- OldPath: Inet/FTPProxyPort -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the port of the FTP proxy server.</desc>
@@ -92,8 +84,6 @@
         </constraints>
       </prop>
       <prop oor:name="ooInetHTTPProxyName" oor:type="xs:string" 
oor:nillable="false">
-        <!-- OldPath: Inet/HTTPProxyName -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the name of the HTTP proxy server.</desc>
@@ -102,8 +92,6 @@
         <!-- JB: Empty default inserted into empty property node. Remove if 
NIL was intended -->
       </prop>
       <prop oor:name="ooInetHTTPProxyPort" oor:type="xs:int">
-        <!-- OldPath: Inet/HTTPProxyPort -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the port of the HTTP proxy server.</desc>
@@ -122,8 +110,6 @@
         </constraints>
       </prop>
       <prop oor:name="ooInetHTTPSProxyName" oor:type="xs:string" 
oor:nillable="false">
-        <!-- OldPath: Inet/HTTPSProxyName -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the name of the HTTPS proxy server.</desc>
@@ -132,8 +118,6 @@
         <!-- JB: Empty default inserted into empty property node. Remove if 
NIL was intended -->
       </prop>
       <prop oor:name="ooInetHTTPSProxyPort" oor:type="xs:int">
-        <!-- OldPath: Inet/HTTPSProxyPort -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Internet  Proxy -->
         <info>
           <desc>Specifies the port of the HTTPS proxy server.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 84545054859a..39a7ec03a703 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -68,8 +68,6 @@
   </templates>
   <component>
     <set oor:name="UnitConversion" oor:node-type="ConversionRule">
-      <!-- OldPath: UnitConversion -->
-      <!-- OldLocation: convert.ini -->
       <!-- UIHints: function CONVERT -->
       <info>
         <desc>Specifies the Euro currency conversion rates and possibly other 
unit conversion rules for the CONVERT function.</desc>
@@ -84,8 +82,6 @@
           <desc>Specifies which contents are displayed in a spreadsheet.</desc>
         </info>
         <prop oor:name="Formula" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Display -->
           <info>
             <desc>Indicates whether formulas instead of results are displayed 
in the cells.</desc>
@@ -94,8 +90,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="ZeroValue" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Display -->
           <info>
             <desc>Indicates whether numbers containing the 0 value are 
shown.</desc>
@@ -104,8 +98,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="NoteTag" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Display -->
           <info>
             <desc>Indicates whether comments are marked.</desc>
@@ -114,8 +106,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="ValueHighlighting" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Display -->
           <info>
             <desc>Indicates whether all values are highlighted in the sheet 
(text black, numbers blue, others green).</desc>
@@ -124,8 +114,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Anchor" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Display -->
           <info>
             <desc>Indicates whether anchor icons are displayed next to 
selected graphics in the document.</desc>
@@ -134,8 +122,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="TextOverflow" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Display -->
           <info>
             <desc>Indicates whether text overflow is marked via a small 
triangle.</desc>
@@ -144,8 +130,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="ObjectGraphic" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Objects -->
           <info>
             <desc>Indicates whether objects and graphics are shown, hidden or 
replaced by a placeholder.</desc>
@@ -171,8 +155,6 @@
           <value>0</value>
         </prop>
         <prop oor:name="Chart" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Objects -->
           <info>
             <desc>Indicates whether charts are shown, hidden or replaced by a 
placeholder.</desc>
@@ -198,8 +180,6 @@
           <value>0</value>
         </prop>
         <prop oor:name="DrawingObject" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Contents/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] 
Objects -->
           <info>
             <desc>Indicates whether drawing objects are shown, hidden or 
replaced by a placeholder.</desc>
@@ -230,8 +210,6 @@
           <desc>Contains settings that specify how contents are updated.</desc>
         </info>
         <prop oor:name="Link" oor:type="xs:int">
-          <!-- OldPath: Calc/Other/Update -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Spreadsheet  Other  [Section] 
Updating -->
           <info>
             <desc>Specifies if and how links are updated when loading a 
document.</desc>
@@ -267,8 +245,6 @@
           <desc>Contains settings that control visual aids.</desc>
         </info>
         <prop oor:name="GridLine" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Lines -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Lines -->
           <info>
             <desc>Specifies whether grid lines are displayed.</desc>
@@ -285,8 +261,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="GridLineColor" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Lines -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Lines -->
           <!--Default 12632256 = LightGray-->
           <info>
@@ -296,8 +270,6 @@
           <value>12632256</value>
         </prop>
         <prop oor:name="PageBreak" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Lines -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Lines -->
           <info>
             <desc>Specifies whether page breaks are displayed.</desc>
@@ -306,8 +278,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="Guide" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Lines -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Lines -->
           <info>
             <desc>Specifies whether helplines are displayed when moving 
objects.</desc>
@@ -316,8 +286,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="SimpleControlPoint" oor:type="xs:boolean">
-          <!-- OldPath: Calc/Layout/Lines -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Lines -->
           <info>
             <desc>Specifies whether control points are displayed simple or 
enhanced.</desc>
@@ -326,8 +294,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="LargeControlPoint" oor:type="xs:boolean">
-          <!-- OldPath: Calc/Layout/Lines -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Lines -->
           <info>
             <desc>Specifies whether control points are displayed as larger 
than the default size.</desc>
@@ -341,8 +307,6 @@
           <desc>Contains settings that control which windows are shown around 
the editing window.</desc>
         </info>
         <prop oor:name="ColumnRowHeader" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Window -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Window -->
           <info>
             <desc>Specifies whether row and column headers are 
displayed.</desc>
@@ -351,8 +315,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="HorizontalScroll" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Window -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Window -->
           <info>
             <desc>Specifies whether a horizontal scroll bar is 
displayed.</desc>
@@ -361,8 +323,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="VerticalScroll" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Window -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Window -->
           <info>
             <desc>Specifies whether a vertical scroll bar is displayed.</desc>
@@ -371,8 +331,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="SheetTab" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Window -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Window -->
           <info>
             <desc>Specifies whether sheet tabs are displayed.</desc>
@@ -381,8 +339,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="OutlineSymbol" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Layout/Window -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Window -->
           <info>
             <desc>Specifies whether outline symbols are displayed.</desc>
@@ -419,8 +375,6 @@
           <value>514</value>
         </prop>
         <prop oor:name="StatusbarFunction" oor:type="xs:int" 
oor:nillable="false">
-          <!-- OldPath: Calc/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: (Status Bar) -->
           <info>
             <desc>Selects a function that is calculated for the selected 
cells, and which shows the result in the status bar.</desc>
@@ -473,8 +427,6 @@
           <value>false</value>
         </prop>
         <group oor:name="TabStop">
-          <!-- OldPath: Calc/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Tab 
stops -->
           <info>
             <desc>Specifies the distance between tabulator stops in 1/100th 
millimeters.</desc>
@@ -496,8 +448,6 @@
           </prop>
         </group>
         <group oor:name="MeasureUnit">
-          <!-- OldPath: Calc/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] 
Measurement unit -->
           <info>
             <desc>Specifies the measurement unit to be used in the user 
interface.</desc>
@@ -576,8 +526,6 @@
           <desc>Specifies the zoom for new spreadsheet documents.</desc>
         </info>
         <prop oor:name="Type" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: (Status Bar) -->
           <info>
             <desc>Specifies the zoom type.</desc>
@@ -603,8 +551,6 @@
           <value>0</value>
         </prop>
         <prop oor:name="Value" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: (Status Bar) -->
           <info>
             <desc>Specifies the percentage value to which the view is 
scaled.</desc>
@@ -627,8 +573,6 @@
         <desc>Contains settings that affect cell input.</desc>
       </info>
       <prop oor:name="MoveSelection" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether pressing the Enter key should move the 
selection.</desc>
@@ -637,8 +581,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="MoveSelectionDirection" oor:type="xs:int" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies the direction where the selection is moved when 
pressing Enter, if moving is enabled.</desc>
@@ -669,8 +611,6 @@
         <value>0</value>
       </prop>
       <prop oor:name="SwitchToEditMode" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether the selected cell can be edited immediately 
after pressing the Enter key.</desc>
@@ -679,8 +619,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="ExpandFormatting" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether formatting a cell also affects subsequently 
entered cells.</desc>
@@ -689,8 +627,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="ShowReference" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether formula references from the input line are 
highlighted in color in the cell.</desc>
@@ -699,8 +635,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ExpandReference" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether references are expanded when inserting 
columns or rows next to, above or below the reference range.</desc>
@@ -709,8 +643,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="UpdateReferenceOnSort" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether references get updated when performing sort 
on a range of cells.</desc>
@@ -719,8 +651,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="HighlightSelection" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options -Spreadsheets - Input - [Section] Input 
-->
         <info>
           <desc>Specifies whether column and row headers are highlighted in 
the selected columns or rows.</desc>
@@ -729,8 +659,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="UseTabCol" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: only API (see UseTabCol) -->
         <info>
           <desc>Specifies whether pressing Enter will move the cursor to the 
column where it was before the Tab key was used to change columns.</desc>
@@ -771,8 +699,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="LastFunctions" oor:type="oor:int-list" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <info>
           <desc>Specifies the functions last used.</desc>
           <label>Last Used Functions</label>
@@ -807,8 +733,6 @@
         <value>224 226 222 223 6</value>
       </prop>
       <prop oor:name="AutoInput" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  Cell Contents  AutoInput -->
         <info>
           <desc>Specifies whether the AutoInput function is active.</desc>
@@ -817,8 +741,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="DetectiveAuto" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Calc/Input -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  Detective  AutoRefresh -->
         <info>
           <desc>Specifies whether all the Detective traces in the sheet are 
automatically refreshed when modifying a formula.</desc>
@@ -836,8 +758,6 @@
           <desc>Contains settings that control the behavior of the grid.</desc>
         </info>
         <prop oor:name="SnapToGrid" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Grid/Options -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Options 
-->
           <info>
             <desc>Specifies whether frames, drawing elements and form 
functions are only movable between grid points.</desc>
@@ -846,8 +766,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="SizeToGrid" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Grid/Options -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools  Options  Spreadsheet  Grid - [Section] Snap 
grid -->
           <info>
             <desc>Specifies whether the snap grid is matched with the main 
grid.</desc>
@@ -856,8 +774,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="VisibleGrid" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Grid/Options -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Options 
-->
           <info>
             <desc>Specifies whether the grid is displayed.</desc>
@@ -866,8 +782,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Synchronize" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Grid/Options -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Options 
-->
           <info>
             <desc>Specifies whether the current grid settings are changed 
symmetrically. The resolution and subdivision for the X/Y axes remain the 
same.</desc>
@@ -876,8 +790,6 @@
           <value>true</value>
         </prop>
         <group oor:name="XAxis">
-          <!-- OldPath: Calc/Grid/Options -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools  Options  Spreadsheet  Grid - [Section] Snap 
grid -->
           <!-- Notice: Default-value in  (nonmetric: 1270 1/100 mm)-->
           <info>
@@ -900,8 +812,6 @@
           </prop>
         </group>
         <group oor:name="YAxis">
-          <!-- OldPath: Calc/Grid/Options -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools  Options  Spreadsheet  Grid - [Section] Snap 
grid -->
           <!-- Notice: Default-value in nonmetric: 1270 1/100 mm-->
           <info>
@@ -929,8 +839,6 @@
           <desc>Specifies the grid's resolution.</desc>
         </info>
         <group oor:name="XAxis">
-          <!-- OldPath: Calc/Grid/Resolution -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Grid -->
           <!-- Notice: Default-value nonmetric 1270 1/100 mm) -->
           <info>
@@ -953,8 +861,6 @@
           </prop>
         </group>
         <group oor:name="YAxis">
-          <!-- OldPath: Calc/Grid/Resolution -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Grid -->
           <!-- Notice: Default-value  nonmetric 1270 1/100 mm) -->
           <info>
@@ -982,8 +888,6 @@
           <desc>Specifies how the grid is divided.</desc>
         </info>
         <prop oor:name="XAxis" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Grid/Subdivision -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Grid -->
           <info>
             <desc>Specifies the number of intervals between two grid points on 
the X axis.</desc>
@@ -992,8 +896,6 @@
           <value>1</value>
         </prop>
         <prop oor:name="YAxis" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Grid/Subdivision -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Grid - [Section] Grid -->
           <info>
             <desc>Specifies the number of intervals between two grid points on 
the Y axis.</desc>
@@ -1008,8 +910,6 @@
         <desc>Contains the sort list settings.</desc>
       </info>
       <prop oor:name="List" oor:type="oor:string-list" oor:nillable="false">
-        <!-- OldPath: Calc/Sort_Lists -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options  Spreadsheet  Sort lists  [List box] 
Lists -->
         <!-- Notice: Defaults: Week and month names from system language -->
         <info>
@@ -1357,8 +1257,6 @@
           <desc>Contains settings for iterative calculation of circular 
references.</desc>
         </info>
         <prop oor:name="Iteration" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Calculate/Iterative_References -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Section] 
Iterative references -->
           <info>
             <desc>Specifies whether iterative calculation is used for formulas 
with circular references.</desc>
@@ -1367,8 +1265,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Steps" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Calculate/Iterative_References -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Section] 
Iterative references -->
           <info>
             <desc>Specifies the maximum number of iteration steps.</desc>
@@ -1377,8 +1273,6 @@
           <value>100</value>
         </prop>
         <prop oor:name="MinimumChange" oor:type="xs:double" 
oor:nillable="false">
-          <!-- OldPath: Calc/Calculate/Iterative_References -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Section] 
Iterative references -->
           <info>
             <desc>Specifies the result change value below which iteration is 
stopped.</desc>
@@ -1392,8 +1286,6 @@
           <desc>Contains other calculation settings.</desc>
         </info>
         <prop oor:name="CaseSensitive" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Calculate -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Check box] 
Case sensitive -->
           <info>
             <desc>Specifies whether upper and lower case in texts are 
distinguished when comparing cell contents.</desc>
@@ -1402,8 +1294,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="Precision" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Calculate -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Check box] 
Precision as shown -->
           <info>
             <desc>Specifies whether the calculation uses the rounded values 
displayed in the sheet.</desc>
@@ -1412,8 +1302,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="SearchCriteria" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Calc/Calculate -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Check box] 
Search criteria = and &lt;&gt; must apply to whole cells -->
           <info>
             <desc>Specifies whether search criteria in formulas must match the 
whole of the cell contents.</desc>
@@ -1422,8 +1310,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="FindLabel" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Calc/Calculate -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Check box] 
Automatically find column and row labels -->
           <info>
             <desc>Specifies whether column and row labels are used to refer to 
the column area beneath the text cell or to the row area at the right of the 
text cell while running a search.</desc>
@@ -1432,8 +1318,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="DecimalPlaces" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Calculate -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Spreadsheet  Calculate  [Combo box] 
Decimal places -->
           <info>
             <desc>Specifies the number of decimals to be displayed for the 
Standard number format.</desc>
@@ -1722,8 +1606,6 @@
           <desc>Specifies the colors for revision marking.</desc>
         </info>
         <prop oor:name="Change" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Changes/Colors -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Spreadsheet  Changes  [Section] 
Colors for changes -->
           <!--Default -1 = Transparent-->
           <info>
@@ -1733,8 +1615,6 @@
           <value>-1</value>
         </prop>
         <prop oor:name="Deletion" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Changes/Colors -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Spreadsheet  Changes  [Section] 
Colors for changes -->
           <!--Default -1 = Transparent-->
           <info>
@@ -1744,8 +1624,6 @@
           <value>-1</value>
         </prop>
         <prop oor:name="Insertion" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Changes/Colors -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Spreadsheet  Changes  [Section] 
Colors for changes -->
           <!--Default -1 = Transparent-->
           <info>
@@ -1755,8 +1633,6 @@
           <value>-1</value>
         </prop>
         <prop oor:name="MovedEntry" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Calc/Changes/Colors -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Spreadsheet  Changes  [Section] 
Colors for changes -->
           <!--Default -1 = Transparent-->
           <info>
@@ -1788,8 +1664,6 @@
             <value>true</value>
           </prop>
           <prop oor:name="Load" oor:type="xs:boolean" oor:nillable="false">
-            <!-- OldPath: Filter/MS_Office/Basic/Excel -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Filter Settings  Microsoft Office  
[Section] Microsoft Excel 97/2000 -->
             <info>
               <desc>Indicates whether VBA macros are imported as 
comments.</desc>
@@ -1805,8 +1679,6 @@
             <value>true</value>
           </prop>
           <prop oor:name="Save" oor:type="xs:boolean" oor:nillable="false">
-            <!-- OldPath: Filter/MS_Office/Basic/Excel -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Filter Settings  Microsoft Office  
[Section] Microsoft Excel 97/2000 -->
             <info>
               <desc>Indicates whether the original VBA storage is preserved 
while editing.</desc>
@@ -1820,8 +1692,6 @@
             <desc>Contains settings for Lotus 1-2-3 import.</desc>
           </info>
           <prop oor:name="WK3" oor:type="xs:boolean" oor:nillable="false">
-            <!-- OldPath: Common -->
-            <!-- OldLocation: soffice.ini -->
             <info>
               <desc>Indicates whether the import of Lotus wk3 files is 
enabled.</desc>
               <label>Enable WK3 Filter</label>
@@ -1834,8 +1704,6 @@
             <desc>Contains settings for MS Excel import.</desc>
           </info>
           <prop oor:name="ColScale" oor:type="xs:double" oor:nillable="false">
-            <!-- OldPath: Common -->
-            <!-- OldLocation: soffice.ini -->
             <info>
               <desc>Specifies the factor for multiplying the column width when 
importing Excel documents from Biff 5 format.</desc>
               <label>Excel Column Width Scale</label>
@@ -1850,8 +1718,6 @@
             <value>1.0</value>
           </prop>
           <prop oor:name="RowScale" oor:type="xs:double" oor:nillable="false">
-            <!-- OldPath: Common -->
-            <!-- OldLocation: soffice.ini -->
             <info>
               <desc>Specifies the factor for multiplying the row height when 
importing Excel documents from Biff 5 format.</desc>
               <label>Excel Row Height Scale</label>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
index 2b1bdba503ad..ad4f30a490b5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Chart.xcs
@@ -28,8 +28,6 @@
         <desc>Specifies the colors for creating new charts.</desc>
       </info>
       <prop oor:name="Series" oor:type="oor:long-list" oor:nillable="false">
-        <!-- OldPath: Chart/Default_Colors -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options  Chart  Default colors  [Section] Chart 
colors -->
         <info>
           <desc>Specifies a list of color values to be used for the first n 
series, where n is the size of the list. For i &gt; n the color used is equal 
to entry number i modulo n in the list. You should keep the size of the list at 
12. Also note that the values are interpreted as unsigned 32bit values, 
although it is possible to get negative (signed) numbers in this list when 
being displayed in decimal.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index dac495521742..2f3846e4e8bf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1269,8 +1269,6 @@
         <desc>Contains miscellaneous settings for the auto correction.</desc>
       </info>
       <prop oor:name="UseReplacementTable" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Use replacement
              table -->
         <info>
@@ -1281,8 +1279,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="TwoCapitalsAtStart" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Correct TWo
              INitial Capitals -->
         <info>
@@ -1293,8 +1289,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="CapitalAtStartSentence" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Capitalize first
              letter of every sentence -->
         <info>
@@ -1305,8 +1299,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ChangeUnderlineWeight" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Automatic 
*bold*,
              /italic/, -strikeout- and _underline_ -->
         <info>
@@ -1318,8 +1310,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="SetInetAttribute" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - URL
              recognition -->
         <info>
@@ -1330,8 +1320,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ChangeOrdinalNumber" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Replace
              1st... -->
         <info>
@@ -1342,8 +1330,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ChangeDash" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Replace
              dashes -->
         <info>
@@ -1354,8 +1340,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="AddNonBreakingSpace" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Add non-breaking
              space -->
         <info>
@@ -1382,8 +1366,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="RemoveDoubleSpaces" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options  Ignore Double
              Spaces -->
         <info>
@@ -1403,8 +1385,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ReplaceSingleQuote" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Custom Quotes  Single
              quotes -->
         <info>
@@ -1414,8 +1394,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="SingleQuoteAtStart" oor:type="xs:int">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Custom Quotes  Single
              quotes -->
         <info>
@@ -1424,8 +1402,6 @@
         </info>
       </prop>
       <prop oor:name="SingleQuoteAtEnd" oor:type="xs:int">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Custom Quotes  Single
              quotes -->
         <info>
@@ -1434,8 +1410,6 @@
         </info>
       </prop>
       <prop oor:name="ReplaceDoubleQuote" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Custom Quotes  Double
              quotes -->
         <info>
@@ -1445,8 +1419,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="DoubleQuoteAtStart" oor:type="xs:int">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Custom Quotes  Double
              quotes -->
         <info>
@@ -1455,8 +1427,6 @@
         </info>
       </prop>
       <prop oor:name="DoubleQuoteAtEnd" oor:type="xs:int">
-        <!-- OldPath: AutoCorrect/Options/All -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools  AutoCorrect/AutoFormat  Custom Quotes  Double
              quotes -->
         <info>
@@ -1470,8 +1440,6 @@
           exceptions.</desc>
         </info>
         <prop oor:name="TwoCapitalsAtStart" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: AutoCorrect/Options/All -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - AutoCorrect/AutoFormat - Exceptions - Words 
with
                2 initial capitals or small initial -->
           <info>
@@ -1484,8 +1452,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="CapitalAtStartSentence" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: AutoCorrect/Options/All -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - AutoCorrect/AutoFormat - Exceptions -
                Abbreviation -->
           <info>
@@ -1508,8 +1474,6 @@
           engine.</desc>
         </info>
         <prop oor:name="OLE_Objects" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: soffice-WorkingSet -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: MaxOLEObjectsInDrawingEngineMemory -->
           <info>
             <desc>Determines the maximum number of OLE objects that can be held
@@ -1527,8 +1491,6 @@
           <desc>Specifies the cache related options for Writer.</desc>
         </info>
         <prop oor:name="OLE_Objects" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: soffice-WorkingSet -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: MaxOLEObjectsInSWMemory -->
           <info>
             <desc>Determines the maximum number of OLE objects that can be held
@@ -1615,8 +1577,6 @@
       </group>
     </group>
     <group oor:name="Path">
-      <!--OldLocation: soffice.ini -->
-      <!--OldPath: Directories and BackupDirectories -->
       <!-- UIHints: Tools - Options - General - Paths -->
       <info>
         <desc>Contains the current and default path settings used by the
@@ -2017,8 +1977,6 @@
           <desc>Contains settings for the font substitution.</desc>
         </info>
         <prop oor:name="Replacement" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: FontSubstitution -->
-          <!-- OldLocation: fntsubst.ini -->
           <!-- UIHints: Tools - Options - General - Font replacement -->
           <info>
             <desc>Determines if the list of font replacements is applied or
@@ -2028,8 +1986,6 @@
           <value>false</value>
         </prop>
         <set oor:name="FontPairs" oor:node-type="FontReplacement">
-          <!-- OldPath: FontSubstitution-->
-          <!-- OldLocation: fntsubst.ini-->
           <!-- UIHints: Tools - Options - General - Font replacement -->
           <info>
             <desc>Specifies a substitution of the requested font, even if this
@@ -2043,8 +1999,6 @@
           bar.</desc>
         </info>
         <prop oor:name="History" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Desktop/FontHistory -->
-          <!-- OldLocation: soffice.ini -->
           <!-- UIHints: Tools - Options - General - View -->
           <info>
             <desc>Contains the last five fonts, which are shown on the top of a
@@ -2054,8 +2008,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="ShowFontBoxWYSIWYG" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Desktop/ShowFontBoxWYSIWYG -->
-          <!-- OldLocation: soffice.ini -->
           <!-- UIHints: Tools - Options - General - View -->
           <info>
             <desc>Specifies that the names of the selectable fonts will be
@@ -2168,7 +2120,6 @@
       </prop>
     </group>
     <group oor:name="History">
-      <!-- OldLocation: soffice.ini -->
       <info>
         <desc>Contains history information.</desc>
       </info>
@@ -2273,8 +2224,6 @@
         <desc>Contains general settings about the saving process.</desc>
       </info>
       <prop oor:name="WorkingSet" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: General/Restore -->
-        <!-- OldLocation: soffice.cfg -->
         <!-- UIHints: Tools  Options - General  Save - [Section] Restore 
editing
              view - Open documents-->
         <info>
@@ -2300,7 +2249,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="UseUserData" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldLocation: soffice.ini -->
           <!-- UIHints: File - Save/Save As -->
           <info>
             <desc>Specifies if the user's name should be written into the
@@ -2310,8 +2258,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="AutoSave" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/Save/Documents -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save -->
           <info>
             <desc>Specifies whether all modified documents are automatically
@@ -2330,8 +2276,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="CreateBackup" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/Save/Documents -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save -->
           <info>
             <desc>Specifies whether to create a backup copy when a modified
@@ -2341,8 +2285,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="EditProperty" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/Save/Documents -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save -->
           <info>
             <desc>Specifies if the document properties dialog will be opened 
for
@@ -2352,8 +2294,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="AutoSavePrompt" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/Save/Documents -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save -->
           <info>
             <desc>Shows a prompt during AutoSave,even when the document has a
@@ -2363,8 +2303,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="AutoSaveTimeIntervall" oor:type="xs:int" 
oor:nillable="false">
-          <!-- OldPath: General/Save/Documents -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save -->
           <info>
             <desc>Specifies the AutoSave time interval in minutes.</desc>
@@ -2385,8 +2323,6 @@
           <value>10</value>
         </prop>
         <prop oor:name="ViewInfo" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/Restore -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Restore
                editing view - Document view-->
           <info>
@@ -2441,8 +2377,6 @@
           be saved.</desc>
         </info>
         <prop oor:name="Format" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: General/Save/Graphics -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save
                graphics -->
           <info>
@@ -2483,8 +2417,6 @@
           save.</desc>
         </info>
         <prop oor:name="FileSystem" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/Save/URL -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save URLs
                relative to -->
           <info>
@@ -2495,8 +2427,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="Internet" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/Save/URL -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Save - [Section] Save URLs
                relative to -->
           <info>
@@ -2649,8 +2579,6 @@
           <desc>Contains security settings regarding Basic scripts.</desc>
         </info>
         <prop oor:name="SecureURL" oor:type="oor:string-list" 
oor:nillable="false">
-          <!-- OldPath: Security/SecureURL -->
-          <!-- OldLocation: soffice.ini -->
           <!-- UIHints: Tools - Options - Browser -->
           <info>
             <desc>Lists all trustworthy URLs: file: All scripts from the local
@@ -2664,8 +2592,6 @@
           <value/>
         </prop>
         <prop oor:name="OfficeBasic" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Security/StarBASIC -->
-          <!-- OldLocation: soffice.ini -->
           <!-- UIHints: Tools - Options - Browser -->
           <info>
             <desc>Determines how Office Basic scripts should be handled.</desc>
@@ -2860,8 +2786,6 @@
           displayed.</desc>
         </info>
         <prop oor:name="FullScreen" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: soffice-view/App-Window -->
-          <!-- OldLocation: soffice.ini -->
           <info>
             <desc>Specifies whether the application window should be opened in
             Fullscreen mode.</desc>
@@ -2869,8 +2793,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Preference" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: soffice-view/App-Window -->
-          <!-- OldLocation: soffice.ini -->
           <info>
             <desc>Specifies the preferred view of the application 
window.</desc>
           </info>
@@ -2900,8 +2822,6 @@
           be displayed.</desc>
         </info>
         <prop oor:name="ButtonLarge" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/View -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  View  [Section] Buttons -->
           <info>
             <desc>Specifies whether toolbar buttons should be drawn large or
@@ -2911,8 +2831,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="ButtonFlat" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/View -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  View  [Section] Buttons -->
           <info>
             <desc>Specifies whether toolbox buttons should be drawn with a flat
@@ -2922,8 +2840,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="MousePositioning" oor:type="xs:short" 
oor:nillable="false">
-          <!-- OldPath: General/View -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  View  [Section] Mouse
                positioning -->
           <info>
@@ -2951,7 +2867,6 @@
           <value>2</value>
         </prop>
         <prop oor:name="MiddleMouseButton" oor:type="xs:short" 
oor:nillable="false">
-          <!-- OldPath: General/View -->
           <!-- UIHints: Tools  Options - General  View  [Section] Middle mouse
                button -->
           <info>
@@ -2984,8 +2899,6 @@
           <desc>Contains menu view settings.</desc>
         </info>
         <prop oor:name="DontHideDisabledEntry" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Desktop/DontHideDisabledEntry -->
-          <!-- OldLocation: soffice.ini -->
           <!-- UIHints: Tools - Options - General - View -->
           <info>
             <desc>Shows all deactivated menu entries. Menu commands that are
@@ -3001,7 +2914,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="ShowIconsInMenues" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/View -->
           <!-- UIHints: Tools  Options - General  View  [Section] Options -->
           <info>
             <desc>Indicates whether icons in the office menus should be
@@ -3010,8 +2922,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="FollowMouse" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/View -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  View  [Section] Options -->
           <info>
             <desc>Specifies automatic selection while moving the mouse over a
@@ -3052,8 +2962,6 @@
           <desc>Contains settings for general windows used by the 
Office.</desc>
         </info>
         <prop oor:name="Drag" oor:type="xs:short" oor:nillable="false">
-          <!-- OldPath: General/View -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  View  [Section] Display -->
           <info>
             <desc>Specifies the representation of the window while
@@ -3080,8 +2988,6 @@
           <value>2</value>
         </prop>
         <prop oor:name="Key" oor:type="xs:int">
-          <!-- OldPath: soffice_View/Window -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: LM: Description is missing
                5962Window=V1,995/150/280/321,H,0,AL:(16,4,0/0/400/250)#100 -->
           <info>
@@ -3090,8 +2996,6 @@
           </info>
         </prop>
         <prop oor:name="Version" oor:type="xs:string" oor:nillable="false">
-          <!-- OldPath: soffice_View/Window -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: LM: Description is missing -->
           <info>
             <deprecated/>
@@ -3102,8 +3006,6 @@
                NIL was intended -->
         </prop>
         <prop oor:name="State" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: soffice_View/Window -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: LM: Description is missing -->
           <info>
             <deprecated/>
@@ -3112,8 +3014,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Flag" oor:type="xs:int">
-          <!-- OldPath: soffice_View/Window -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: LM: Description is missing -->
           <info>
             <deprecated/>
@@ -3153,8 +3053,6 @@
           </constraints>
         </prop>
         <prop oor:name="UserData" oor:type="xs:string" oor:nillable="false">
-          <!-- OldPath: soffice_View/Window -->
-          <!-- OldLocation: soffice.ini -->
           <!-- Notice: LM: Description is missing -->
           <info>
             <deprecated/>
@@ -3193,8 +3091,6 @@
         Office.</desc>
       </info>
       <prop oor:name="Steps" oor:type="xs:int" oor:nillable="false">
-        <!-- OldPath: General/Undo -->
-        <!-- OldLocation: soffice.cfg -->
         <!-- UIHints: Tools  Options - General  Save - [Section] Undo -->
         <info>
           <desc>Specifies how many operations can be undone in a row.</desc>
@@ -3224,8 +3120,6 @@
           <desc>Specifies options related to the installed languages.</desc>
         </info>
         <prop oor:name="Locales" oor:type="oor:string-list">
-          <!--OldPath: OfficeLanguage/[Code]=Installed -->
-          <!--OldLocation: soffice.ini -->
           <!--The string list has to be filled by the setup-->
           <info>
             <desc>Contains the installed Office languages for the menus and
@@ -3253,8 +3147,6 @@
           <desc>Contains settings for print specific warnings.</desc>
         </info>
         <prop oor:name="PaperSize" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/Print/Warning -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Print  [Section] Warnings -->
           <info>
             <desc>Specifies if a warning should be displayed in case the
@@ -3264,8 +3156,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="PaperOrientation" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: General/Print/Warning -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Print  [Section] Warnings -->
           <info>
             <desc>Specifies if a warning should be displayed in case the
@@ -3275,8 +3165,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="NotFound" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: General/Print/Warning -->
-          <!-- OldLocation: soffice.cfg -->
           <!-- UIHints: Tools  Options - General  Print  [Section] Warnings -->
           <info>
             <desc>Specifies if a warning should be displayed in case the 
printer
@@ -3558,8 +3446,6 @@
         applications binary files.</desc>
       </info>
       <prop oor:name="Writer" oor:type="xs:boolean">
-        <!-- OldPath: AddXMLToStorage_Writer -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: no -->
         <info>
           <desc>Defines if a XML package is added to the Writer binary
@@ -3567,8 +3453,6 @@
         </info>
       </prop>
       <prop oor:name="Calc" oor:type="xs:boolean">
-        <!-- OldPath: AddXMLToStorage_Calc -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: no -->
         <info>
           <desc>Defines if a XML package is added to the Calc binary
@@ -3576,8 +3460,6 @@
         </info>
       </prop>
       <prop oor:name="Impress" oor:type="xs:boolean">
-        <!-- OldPath: AddXMLToStorage_Impress -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: no -->
         <info>
           <desc>Defines if a XML package is added to the Impress binary
@@ -3585,8 +3467,6 @@
         </info>
       </prop>
       <prop oor:name="Draw" oor:type="xs:boolean">
-        <!-- OldPath: AddXMLToStorage_Draw -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: no -->
         <info>
           <desc>Defines if a XML package is added to the Draw binary
@@ -3717,7 +3597,6 @@
              was intended -->
       </prop>
       <prop oor:name="Tip" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Help menu-->
         <info>
           <desc>Activates the Tip help.</desc>
@@ -3726,7 +3605,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ExtendedTip" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Help menu-->
         <info>
           <desc>Activates the Extended help.</desc>
@@ -3815,8 +3693,6 @@
         bitmaps.</desc>
       </info>
       <prop oor:name="ColorCount" oor:type="xs:short" oor:nillable="false">
-        <!-- OldPath: Draw_Impress/Vectorize -->
-        <!-- OldLocation: drawing.cfg -->
         <!-- UIHints: Select bitmap =&gt; context menu  convert  To polygon -->
         <info>
           <desc>Specifies the number of colors that are used to create a vector
@@ -3840,8 +3716,6 @@
         <value>8</value>
       </prop>
       <prop oor:name="PointReduce" oor:type="xs:short" oor:nillable="false">
-        <!-- OldPath: Draw_Impress/Vectorize -->
-        <!-- OldLocation: drawing.cfg -->
         <!-- UIHints: Select bitmap =&gt; context menu  convert  To polygon -->
         <info>
           <desc>Specifies the number of pixels that you want to combine as a
@@ -3865,8 +3739,6 @@
         <value>0</value>
       </prop>
       <prop oor:name="FillHole" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Draw_Impress/Vectorize -->
-        <!-- OldLocation: drawing.cfg -->
         <!-- UIHints: Select bitmap => context menu  convert  To polygon -->
         <info>
           <desc>Indicates whether to create a tiled background before
@@ -3876,8 +3748,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="TileExtent" oor:type="xs:short" oor:nillable="false">
-        <!-- OldPath: Draw_Impress/Vectorize -->
-        <!-- OldLocation: drawing.cfg -->
         <!-- UIHints: Select bitmap => context menu  convert  To polygon -->
         <info>
           <desc>Specifies the extent of background tiles that are used for
@@ -3904,8 +3774,6 @@
         <desc>Specifies settings for the date formats used.</desc>
       </info>
       <prop oor:name="TwoDigitYear" oor:type="xs:int" oor:nillable="false">
-        <!-- OldPath: General/Other -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options - General - Other - Year (two digits) -->
         <info>
           <desc>Specifies the first year that can be entered using
@@ -4084,8 +3952,6 @@
               dialog.</desc>
             </info>
             <prop oor:name="Resolution" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: PCD-IMPORT-RESOLUTION -->
-              <!-- OldLocation: fltopt.ini -->
               <info>
                 <desc>Specifies import resolution of PCD graphics.</desc>
                 <label>Resolution - Base16 / Base4 / Base</label>
@@ -4254,7 +4120,6 @@
               dialog.</desc>
             </info>
             <prop oor:name="Color" oor:type="xs:int" oor:nillable="false">
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog]
                    BMP Options -->
               <info>
@@ -4307,8 +4172,6 @@
               <value>0</value>
             </prop>
             <prop oor:name="RLE_Coding" oor:type="xs:boolean" 
oor:nillable="false">
-              <!-- OldPath: BMP-RLE_CODING -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  BMP-MS Windows - [dialog]
                    BMP Options -->
               <info>
@@ -4320,7 +4183,6 @@
             </prop>
           </group>
           <group oor:name="EPS">
-            <!-- OldLocation: fltopt.ini -->
             <!-- UIHints: File  Export  Filetype File  Export  Filetype
                  EPS-Encapsulated Postscript -->
             <info>
@@ -4457,8 +4319,6 @@
               export dialog.</desc>
             </info>
             <prop oor:name="Interlaced" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: GIF-EXPORT-INTERLACED -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  GIF-Graphics Interchange 
-->
               <info>
                 <desc>Specifies if graphics should be exported using interlace.
@@ -4481,8 +4341,6 @@
               <value>1</value>
             </prop>
             <prop oor:name="Translucent" oor:type="xs:int" 
oor:nillable="false">
-              <!-- OldPath: GIF-EXPORT-TRANSLUCENT -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  GIF-Graphics Interchange 
-->
               <info>
                 <desc>Specifies if the graphic background is stored as
@@ -4509,8 +4367,6 @@
               Experts Group export dialog.</desc>
             </info>
             <prop oor:name="Quality" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: JPG-EXPORT-QUALITY -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  JPG-JPEG -->
               <info>
                 <desc>Specifies quality of the JPG export. A higher value
@@ -4535,8 +4391,6 @@
               <value>75</value>
             </prop>
             <prop oor:name="ColorMode" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: JPG_EXPORT_COLORMODE -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  JPG-JPEG -->
               <info>
                 <desc>Specifies if graphics are exported using true color or
@@ -4563,8 +4417,6 @@
               export dialog.</desc>
             </info>
             <prop oor:name="FileFormat" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: PBM-EXPORT-FORMAT -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  PBM-Portable Bitmap -->
               <info>
                 <desc>Specifies if graphics are exported to binary- or ASCII
@@ -4591,8 +4443,6 @@
               export dialog.</desc>
             </info>
             <prop oor:name="FileFormat" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: PGM-EXPORT-FORMAT -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  PGM-Portable Graymap -->
               <info>
                 <desc>Specifies if graphics are exported to a binary- or ASCII
@@ -4619,8 +4469,6 @@
               export dialog.</desc>
             </info>
             <prop oor:name="FileFormat" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: PPM-EXPORT-FORMAT -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  PPM-Portable Pixelmap -->
               <info>
                 <desc>Specifies if graphics are exported to a binary- or ASCII
@@ -4647,8 +4495,6 @@
               Graphic export dialog.</desc>
             </info>
             <prop oor:name="Compression" oor:type="xs:int" 
oor:nillable="false">
-              <!-- OldPath: PNG-EXPORT-COMPRESSION -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  PNG-Portable Network
                    Graphic -->
               <info>
@@ -4675,8 +4521,6 @@
               <value>6</value>
             </prop>
             <prop oor:name="Interlaced" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: PNG-EXPORT-INTERLACED -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  PNG-Portable Network
                    Graphic -->
               <info>
@@ -4700,8 +4544,6 @@
               <value>1</value>
             </prop>
             <prop oor:name="Translucent" oor:type="xs:int" 
oor:nillable="false">
-              <!-- OldPath: PNG-EXPORT-TRANSLUCENT -->
-              <!-- OldLocation: fltopt.ini -->
               <!-- UIHints: File  Export  Filetype  PNG-Portable Network 
Graphics -->
               <info>
                 <desc>Specifies if the graphic background is stored as
@@ -4770,8 +4612,6 @@
             <value>false</value>
           </prop>
           <prop oor:name="UnknownTag" oor:type="xs:boolean" 
oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Import -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Import -->
             <info>
               <desc>Specifies if unknown tags should be imported as
@@ -4781,8 +4621,6 @@
             <value>false</value>
           </prop>
           <prop oor:name="FontSetting" oor:type="xs:boolean" 
oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Import -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Import -->
             <info>
               <desc>Specifies if font settings should be ignored when
@@ -4796,8 +4634,6 @@
               <desc>Specifies font size for HTML.</desc>
             </info>
             <prop oor:name="Size_1" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4807,8 +4643,6 @@
               <value>7</value>
             </prop>
             <prop oor:name="Size_2" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4818,8 +4652,6 @@
               <value>10</value>
             </prop>
             <prop oor:name="Size_3" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4829,8 +4661,6 @@
               <value>12</value>
             </prop>
             <prop oor:name="Size_4" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4840,8 +4670,6 @@
               <value>14</value>
             </prop>
             <prop oor:name="Size_5" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4851,8 +4679,6 @@
               <value>18</value>
             </prop>
             <prop oor:name="Size_6" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4862,8 +4688,6 @@
               <value>24</value>
             </prop>
             <prop oor:name="Size_7" oor:type="xs:int" oor:nillable="false">
-              <!-- OldPath: Browser/HTML/Font_Sizes -->
-              <!-- OldLocation: soffice.cfg -->
               <!-- UIHints: Tools  Options - Browser  HTML [Section] Font
                    sizes -->
               <info>
@@ -4879,8 +4703,6 @@
             <desc>Contains settings for HTML export.</desc>
           </info>
           <prop oor:name="Browser" oor:type="xs:int" oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Export -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Export -->
             <info>
               <desc>Specifies the browser for which the HTML export should be
@@ -4917,8 +4739,6 @@
             <value>4</value>
           </prop>
           <prop oor:name="Basic" oor:type="xs:boolean" oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Export -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Export -->
             <info>
               <desc>Specifies if Office Basic instructions are considered when
@@ -4928,8 +4748,6 @@
             <value>false</value>
           </prop>
           <prop oor:name="PrintLayout" oor:type="xs:boolean" 
oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Export -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Export -->
             <info>
               <desc>Specifies if the print layout of the current document 
should
@@ -4939,8 +4757,6 @@
             <value>false</value>
           </prop>
           <prop oor:name="LocalGraphic" oor:type="xs:boolean" 
oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Export -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Export -->
             <info>
               <desc>Specifies whether images are copied to the Internet server 
when
@@ -4950,8 +4766,6 @@
             <value>true</value>
           </prop>
           <prop oor:name="Warning" oor:type="xs:boolean" oor:nillable="false">
-            <!-- OldPath: Browser/HTML/Export -->
-            <!-- OldLocation: soffice.cfg -->
             <!-- UIHints: Tools  Options - Browser  HTML [Section] Export -->
             <info>
               <desc>Specifies if a warning should be displayed to point out 
that
@@ -5570,8 +5384,6 @@
         </value>
       </prop>
       <prop oor:name="PluginsEnabled" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: ? -->
-        <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools  Options  Browser  Other  Plug-Ins  Enable -->
         <info>
           <desc>Enables/Disables Plugins.</desc>
@@ -6029,8 +5841,6 @@
         <desc>Contains layout specific settings for Asian languages.</desc>
       </info>
       <prop oor:name="IsKerningWesternTextOnly" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Tools  Options  Asian typography  Asian layout Kerning
              Western text only -->
         <info>
@@ -6041,8 +5851,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="CompressCharacterDistance" oor:type="xs:short" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Tools  Options  Asian typography  Asian layout Character
              distance  -->
         <info>
@@ -6067,8 +5875,6 @@
         <desc>Contains all options for search.</desc>
       </info>
       <prop oor:name="IsWholeWordsOnly" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search for whole words only.</desc>
@@ -6076,8 +5882,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsBackwards" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search backwards.</desc>
@@ -6085,8 +5889,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsUseWildcard" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search with the use of wildcards.</desc>
@@ -6094,8 +5896,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsUseRegularExpression" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search with the use of regular expressions.</desc>
@@ -6103,8 +5903,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsSearchForStyles" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search for styles only.</desc>
@@ -6112,8 +5910,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsSimilaritySearch" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search with similarity.</desc>
@@ -6121,8 +5917,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsMatchCase" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search as case sensitive.</desc>
@@ -6130,8 +5924,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsIgnoreDiacritics_CTL" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search ignores diacritics, not only CTL 
though.</desc>
@@ -6139,8 +5931,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="IsIgnoreKashida_CTL" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search with the use of CTL option.</desc>
@@ -6148,8 +5938,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="IsUseAsianOptions" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Edit/Find and Replace -->
         <info>
           <desc>Specifies search with the use of Asian options.</desc>
@@ -6196,8 +5984,6 @@
           <desc>Contains search options for the Japanese language.</desc>
         </info>
         <prop oor:name="IsMatchFullHalfWidthForms" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Does not distinguish between full-width and half-width
@@ -6206,8 +5992,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatchHiraganaKatakana" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Does not distinguish between hiragana and katakana
@@ -6216,8 +6000,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatchContractions" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between characters
@@ -6226,8 +6008,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatchMinusDashCho-on" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between minus signs,
@@ -6236,8 +6016,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatchRepeatCharMarks" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between repeat
@@ -6246,8 +6024,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatchVariantFormKanji" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between standard and
@@ -6256,8 +6032,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatchOldKanaForms" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between standard and
@@ -6266,8 +6040,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_DiZi_DuZu" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Di' and 'Zi'
@@ -6276,8 +6048,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_BaVa_HaFa" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Ba' and 'Va'
@@ -6286,8 +6056,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_TsiThiChi_DhiZi" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Tsi', 'Thi'
@@ -6296,8 +6064,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_HyuIyu_ByuVyu" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Hyu' and
@@ -6306,8 +6072,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_SeShe_ZeJe" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Se' and 
'She'
@@ -6316,8 +6080,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_IaIya" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Ia' and
@@ -6326,8 +6088,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsMatch_KiKu" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between 'Ki' and
@@ -6336,8 +6096,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsIgnorePunctuation" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between punctuation
@@ -6346,8 +6104,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsIgnoreWhitespace" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between characters
@@ -6357,8 +6113,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsIgnoreProlongedSoundMark" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between prolonged
@@ -6367,8 +6121,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="IsIgnoreMiddleDot" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: -->
-          <!-- OldLocation: -->
           <!-- UIHints: Tools/Options/"Asian typography"-"Japanese Find" -->
           <info>
             <desc>Specifies search without distinguishing between normal dots
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs 
b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index 786b0b4a9b09..dca06b247faa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -328,15 +328,11 @@
         <value>true</value>
       </prop>
       <node-ref oor:name="CurrentDataSource" oor:node-type="DataSource">
-        <!-- OldPath: Bibliography/BibliographyCurrent-->
-        <!-- OldLocation: Soffice.ini-->
         <info>
           <desc>Determines the current data source for the bibliography.</desc>
         </info>
       </node-ref>
       <set oor:name="DataSourceHistory" oor:node-type="DataSource">
-        <!--OldPath: Bibliography/Bibliography-->
-        <!--OldLocation: Soffice.ini-->
         <info>
           <desc>Specifies the data source that can be used as a 
bibliography.</desc>
         </info>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index 5e8128120770..91dce3db345d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -32,8 +32,6 @@
           <desc>Defines the general properties of the graphical object 
representation of screen displays.</desc>
         </info>
         <prop oor:name="Ruler" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Layout/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Display 
-->
           <info>
             <desc>Indicates whether to show the rulers at the left and at the 
top of the working area.</desc>
@@ -42,8 +40,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="Helpline" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Layout/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Display 
-->
           <info>
             <desc>Indicates whether to show help lines that can be created by 
dragging them from the rulers.</desc>
@@ -52,8 +48,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Guide" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Layout/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Display 
-->
           <info>
             <desc>Indicates whether to show help lines when moving an 
object.</desc>
@@ -62,8 +56,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Bezier" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Layout/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Display 
-->
           <info>
             <desc>Indicates whether to show all control points in the Bezier 
curve editor.</desc>
@@ -72,8 +64,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Contour" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Layout/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Display 
-->
           <info>
             <desc>Indicates whether to show the outline of all moved objects 
when moving more than one object at a time.</desc>
@@ -87,8 +77,6 @@
           <desc>Defines other properties regarding device independent 
graphical object representation.</desc>
         </info>
         <group oor:name="TabStop">
-          <!-- OldPath: Draw/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Tab 
stops -->
           <!-- Notice: Default-Nonmetric Value: 1270 1/100 mm-->
           <info>
@@ -111,8 +99,6 @@
           </prop>
         </group>
         <group oor:name="MeasureUnit">
-          <!-- OldPath: Draw/Layout -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Drawing - Layout - [Section] Meas. 
units -->
           <info>
             <desc>Contains the specification of distances and sizes.</desc>
@@ -197,8 +183,6 @@
           <desc>Contains the specification of how to display the content of 
Draw documents on screen.</desc>
         </info>
         <prop oor:name="PicturePlaceholder" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Drawing - Contents - [Section] 
Alternative display -->
           <info>
             <desc>Indicates whether to show only outlines of graphical 
objects.</desc>
@@ -207,8 +191,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="ContourMode" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Drawing - Contents - [Section] 
Alternative display -->
           <info>
             <desc>Indicates whether to show only outlines of draw 
objects.</desc>
@@ -217,8 +199,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="TextPlaceholder" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Drawing - Contents - [Section] 
Alternative display -->
           <info>
             <desc>Indicates whether to use placeholders for text in draw 
objects.</desc>
@@ -227,8 +207,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="LineContour" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Contents/Display -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options  Drawing - Contents - [Section] 
Alternative display -->
           <info>
             <desc>Indicates whether to show only hairlines instead of an 
object's linestyle.</desc>
@@ -243,8 +221,6 @@
         <desc>Contains a collection of configuration items for the Draw 
application that do not fit into another category.</desc>
       </info>
       <prop oor:name="BackgroundCache" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options - Draw - Other  [Section] Other -->
         <info>
           <desc>Indicates whether to store master pages in a cache to speed up 
drawing.</desc>
@@ -253,8 +229,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="CopyWhileMoving" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options - Draw - Other  [Section] Other -->
         <info>
           <desc>Indicates whether moving while holding the Control key makes a 
copy of the moved object.</desc>
@@ -263,8 +237,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ObjectMoveable" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options - Draw - Other  [Section] Other -->
         <info>
           <desc>Indicates whether objects can still be moved while in rotating 
mode.</desc>
@@ -273,8 +245,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="NoDistort" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: Soffice.cfg -->
         <!-- UIHints: Tools - Options - Draw - Other  [Section] Other -->
         <info>
           <desc>Indicates whether objects that are placed on a circle keep 
their original form, i.e. may be moved and rotated but not resized or otherwise 
distorted.</desc>
@@ -283,8 +253,6 @@
         <value>false</value>
       </prop>
       <prop oor:name="DclickTextedit" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: soffice.cfg -->
         <!-- UIHints: Option Bar -->
         <info>
           <desc>Indicates whether a double-click on a text object changes 
activates the edit mode.</desc>
@@ -293,8 +261,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="RotateClick" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: soffice.cfg -->
         <!-- UIHints: Option Bar -->
         <info>
           <desc>Indicates whether a double-click on an object activates the 
rotation mode.</desc>
@@ -303,8 +269,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="Preview" oor:type="xs:double" oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: soffice.cfg -->
         <!-- UIHints: Menu: view - preview mode -->
         <info>
           <desc>Specifies the color quality of the preview: 0 - Color, 868 - 
Grayscale, 5381 - Black/White.</desc>
@@ -337,8 +301,6 @@
         <value>true</value>
       </prop>
       <prop oor:name="ModifyWithAttributes" oor:type="xs:boolean" 
oor:nillable="false">
-        <!-- OldPath: Draw/Other -->
-        <!-- OldLocation: soffice.cfg -->
         <!-- UIHints: Optionbar -->
         <info>
           <desc>Indicates whether the object creation and modification will be 
visualized using the full object attribute set or wireframe.</desc>
@@ -351,8 +313,6 @@
           <desc>Defines text editing related configuration items.</desc>
         </info>
         <prop oor:name="QuickEditing" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Other/Text_Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Other  [Section] Text objects 
-->
           <info>
             <desc>Indicates whether a simple click on a text object changes it 
to edit mode.</desc>
@@ -361,8 +321,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="Selectable" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Other/Text_Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Other  [Section] Text objects 
-->
           <info>
             <desc>Indicates whether a text frame can only be selected by 
clicking on the text or by clicking somewhere in the frame.</desc>
@@ -376,8 +334,6 @@
           <desc>Contains a specification of how to morph between objects (e.g. 
how many steps and whether to regard the object's attributes).</desc>
         </info>
         <prop oor:name="Steps" oor:type="xs:short" oor:nillable="false">
-          <!-- OldPath: Draw/Cross_fading -->
-          <!-- OldLocation: drawing.cfg -->
           <!-- UIHints: Select two objects =&gt; Edit  Cross-fade -->
           <info>
             <desc>Specifies the number of intermediate morphing steps between 
two objects.</desc>
@@ -398,8 +354,6 @@
           <value>16</value>
         </prop>
         <prop oor:name="Orientation" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Cross_fading -->
-          <!-- OldLocation: drawing.cfg -->
           <!-- UIHints: Select two objects =&gt; Edit  Cross-fade -->
           <info>
             <desc>Indicates whether two objects to be morphed shall have the 
same orientation.</desc>
@@ -408,8 +362,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="Attributes" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Cross_fading -->
-          <!-- OldLocation: drawing.cfg -->
           <!-- UIHints: Select two objects =&gt; Edit  Cross-fade -->
           <info>
             <desc>Indicates whether to consider objects' attributes (e.g. 
colors) when morphing one object into another.</desc>
@@ -419,8 +371,6 @@
         </prop>
       </group>
       <group oor:name="DefaultObjectSize">
-        <!-- OldPath: -->
-        <!-- OldLocation: -->
         <!-- UIHints: Default size for newly created objects when using 
CTRL-Return or CTRL-Click -->
         <info>
           <desc>Defines the default size of newly created objects using 
CTRL-Return or CTRL-Click at an object-creating Button</desc>
@@ -465,8 +415,6 @@
           <desc>Contains the specification of how to force object positions 
and sizes to predefined locations in relation to other objects.</desc>
         </info>
         <prop oor:name="Grid" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Snap/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap to -->
           <info>
             <desc>Indicates whether to snap an object when moved to the next 
grid point.</desc>
@@ -475,8 +423,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="SnapLine" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Snap/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap to -->
           <info>
             <desc>Indicates whether to snap at snap lines.</desc>
@@ -485,8 +431,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="PageMargin" oor:type="xs:boolean" oor:nillable="false">
-          <!-- OldPath: Draw/Snap/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap to -->
           <info>
             <desc>Indicates whether the outline of an object is justified with 
adjacent page margins.</desc>
@@ -495,8 +439,6 @@
           <value>true</value>
         </prop>
         <prop oor:name="ObjectFrame" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Snap/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap to -->
           <info>
             <desc>Indicates whether to justify the outline of an object to 
that of an adjacent object.</desc>
@@ -505,8 +447,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="ObjectPoint" oor:type="xs:boolean" 
oor:nillable="false">
-          <!-- OldPath: Draw/Snap/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap to -->
           <info>
             <desc>Indicates whether to snap corner points of adjacent 
objects.</desc>
@@ -515,8 +455,6 @@
           <value>false</value>
         </prop>
         <prop oor:name="Range" oor:type="xs:int" oor:nillable="false">
-          <!-- OldPath: Draw/Snap/Objects -->
-          <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap to -->
           <info>
             <desc>Specifies the maximal range in pixel along the coordinate 
axes at which snapping becomes active.</desc>

... etc. - the rest is truncated

Reply via email to