odk: update DevGuide wiki links after import into TDF wiki

Change-Id: I5a698250db7e822f8d95ff43d87705df05f91c47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132784
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>

3 files changed, 2910 insertions, 2905 deletions

diff --git a/odk/docs/idl/generated_idl_chapter_refs.idl b/odk/docs/idl/generated_idl_chapter_refs.idl
index 1e9d2169a2e7..451d40d0c9cf 100644
--- a/odk/docs/idl/generated_idl_chapter_refs.idl
+++ b/odk/docs/idl/generated_idl_chapter_refs.idl
@@ -5,10 +5,11 @@
 module com {
 module sun {
 module star {
-module sheet {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Database_Operations">Spreadsheets - Database Operations</a><br>
-service DatabaseRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XCharacterClassification_2">Office Development - Implementing a New Locale - XCharacterClassification</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XCharacterClassification">Office Development - Overview and Using the API - XCharacterClassification</a><br>
+interface XCharacterClassification {}
 };
 };
 };
@@ -18,10 +19,16 @@ service DatabaseRanges {}
 module com {
 module sun {
 module star {
-module script {
+module uno {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-service InvocationAdapterFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Service_Manager_and_Component_Context">Professional UNO - Service Manager and Component Context</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#Getting_Started">First Steps - First Contact - Getting Started</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager">Professional UNO - Java - Getting a Service Manager</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections">Professional UNO - C++ - Establishing Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections">Professional UNO - UNO Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Transparent_Use_of_Office_UNO_Components_2">Professional UNO - C++ - Transparent Use of Office UNO Components</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Transparent_Use_of_Office_UNO_Components">Professional UNO - Java - Transparent Use of Office UNO Components</a><br>
+interface XComponentContext {}
 };
 };
 };
@@ -31,10 +38,10 @@ service InvocationAdapterFactory {}
 module com {
 module sun {
 module star {
-module table {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Columns_and_Rows">Spreadsheets - Columns and Rows</a><br>
-service TableColumns {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Service_Manager_and_Component_Context">Professional UNO - Service Manager and Component Context</a><br>
+interface XMultiServiceFactory {}
 };
 };
 };
@@ -44,10 +51,16 @@ service TableColumns {}
 module com {
 module sun {
 module star {
-module sdbc {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Update">Database - Update</a><br>
-interface XRowUpdate {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Service_Manager_and_Component_Context">Professional UNO - Service Manager and Component Context</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#Getting_Started">First Steps - First Contact - Getting Started</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager">Professional UNO - Java - Getting a Service Manager</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections">Professional UNO - C++ - Establishing Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections">Professional UNO - UNO Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Transparent_Use_of_Office_UNO_Components_2">Professional UNO - C++ - Transparent Use of Office UNO Components</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Transparent_Use_of_Office_UNO_Components">Professional UNO - Java - Transparent Use of Office UNO Components</a><br>
+interface XMultiComponentFactory {}
 };
 };
 };
@@ -57,10 +70,17 @@ interface XRowUpdate {}
 module com {
 module sun {
 module star {
-module text {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Indexes_and_Index_Marks#Index_marks">Text - Indexes and Index Marks - Index marks</a><br>
-interface XDocumentIndexMark {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Service_Manager_and_Component_Context">Professional UNO - Service Manager and Component Context</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#Getting_Started">First Steps - First Contact - Getting Started</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Instantiation">Professional UNO - Bridge - The Service Manager Component - Instantiation</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Instantiating_UNO_Services">Professional UNO - Basic - Instantiating UNO Services</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager">Professional UNO - Java - Getting a Service Manager</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#Bootstrapping">Advanced UNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - Bootstrapping</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections">Professional UNO - C++ - Establishing Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections">Professional UNO - UNO Interprocess Connections</a><br>
+service ServiceManager {}
 };
 };
 };
@@ -70,10 +90,10 @@ interface XDocumentIndexMark {}
 module com {
 module sun {
 module star {
-module sheet {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Data_Consolidation">Spreadsheets - Other Table Operations - Data Consolidation</a><br>
-interface XConsolidatable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XNumberFormatCode">Office Development - Overview and Using the API - XNumberFormatCode</a><br>
+interface XNumberFormatCode {}
 };
 };
 };
@@ -83,11 +103,14 @@ interface XConsolidatable {}
 module com {
 module sun {
 module star {
-module awt {
+module uno {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Models_and_Views_for_Form_Controls">Forms - Models and Views for Form Controls</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models">Forms - Control Models</a><br>
-service UnoControlModel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exception_Handling_in_C.2B.2B">Professional UNO - C++ - Exception Handling in C++</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exception_Handling_2">Professional UNO - Basic - Exception Handling</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Mapping_of_Exception_Types">Professional UNO - Java - Mapping of Exception Types</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exceptions_and_Errorcodes">Professional UNO - Bridge - Exceptions and Errorcodes</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exception_Handling">Professional UNO - Exception Handling</a><br>
+exception Exception {}
 };
 };
 };
@@ -97,12 +120,14 @@ service UnoControlModel {}
 module com {
 module sun {
 module star {
-module form {
-module binding {
+module uno {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Value_Bindings">Forms - Value Bindings</a><br>
-interface XBindableValue {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exception_Handling_in_C.2B.2B">Professional UNO - C++ - Exception Handling in C++</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exception_Handling_2">Professional UNO - Basic - Exception Handling</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Mapping_of_Exception_Types">Professional UNO - Java - Mapping of Exception Types</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exceptions_and_Errorcodes">Professional UNO - Bridge - Exceptions and Errorcodes</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exception_Handling">Professional UNO - Exception Handling</a><br>
+exception RuntimeException {}
 };
 };
 };
@@ -112,12 +137,10 @@ interface XBindableValue {}
 module com {
 module sun {
 module star {
-module lang {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Event_Model">ProUNO - Event Model</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Automation_Objects_with_UNO_Interfaces">ProUNO - Bridge - Automation Objects with UNO Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Listeners">ProUNO - Basic - Listeners</a><br>
-interface XEventListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Data_Access">Charts - Data Access</a><br>
+interface XChartDataArray {}
 };
 };
 };
@@ -127,10 +150,10 @@ interface XEventListener {}
 module com {
 module sun {
 module star {
-module sdbc {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connection_Pooling">Database - Connection Pooling</a><br>
-interface XPooledConnection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Data_Access">Charts - Data Access</a><br>
+interface XChartData {}
 };
 };
 };
@@ -140,10 +163,11 @@ interface XPooledConnection {}
 module com {
 module sun {
 module star {
-module util {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Protecting_Spreadsheets">Spreadsheets - Protecting Spreadsheets</a><br>
-interface XProtectable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Data_Access">Charts - Data Access</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
+service ChartDataArray {}
 };
 };
 };
@@ -153,10 +177,11 @@ interface XProtectable {}
 module com {
 module sun {
 module star {
-module form {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Parameters">Forms - Parameters</a><br>
-interface XDatabaseParameterListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Data_Access">Charts - Data Access</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
+service ChartData {}
 };
 };
 };
@@ -166,10 +191,11 @@ interface XDatabaseParameterListener {}
 module com {
 module sun {
 module star {
-module text {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Indexes_and_Index_Marks">Text - Indexes and Index Marks</a><br>
-service BaseIndex {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XBreakIterator">Office Development - Implementing a New Locale - XBreakIterator</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XBreakIterator">Office Development - Overview and Using the API - XBreakIterator</a><br>
+interface XBreakIterator {}
 };
 };
 };
@@ -179,10 +205,10 @@ service BaseIndex {}
 module com {
 module sun {
 module star {
-module sdbc {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connection_Service">Database - Connection Service</a><br>
-service Connection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Named_Ranges">Spreadsheet Documents - Named Ranges</a><br>
+interface XNamedRanges {}
 };
 };
 };
@@ -192,11 +218,10 @@ service Connection {}
 module com {
 module sun {
 module star {
-module sheet {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview">Spreadsheets - Spreadsheet Services - Overview</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cells">Spreadsheets - Cells</a><br>
-service SheetCell {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Events">Office Development - Document Events</a><br>
+struct EventObject {}
 };
 };
 };
@@ -208,8 +233,10 @@ module sun {
 module star {
 module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events">OfficeDev - Document Events</a><br>
-struct EventObject {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Events">Office Development - Document Events</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XEventBroadcaster">Office Development - Component - Models - XEventBroadcaster</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Desktop">Office Development - Using the Desktop</a><br>
+interface XEventBroadcaster {}
 };
 };
 };
@@ -219,10 +246,11 @@ struct EventObject {}
 module com {
 module sun {
 module star {
-module ucb {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Folders#Accessing_the_Children_of_a_Folder">UCB - Folders - Accessing the Children of a Folder</a><br>
-struct OpenCommandArgument2 {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Events">Office Development - Document Events</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Events_and_Other_Notifications">Database Access - Events and Other Notifications</a><br>
+struct EventObject {}
 };
 };
 };
@@ -232,11 +260,10 @@ struct OpenCommandArgument2 {}
 module com {
 module sun {
 module star {
-module script {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Scripting_Existing_UNO_Objects">AdvUNO - XInvocation Bridge - Scripting Existing UNO Objects</a><br>
-service Invocation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Events">Office Development - Document Events</a><br>
+service Events {}
 };
 };
 };
@@ -246,10 +273,12 @@ service Invocation {}
 module com {
 module sun {
 module star {
-module chart {
+module configuration {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/3-D_Charts">Charts - 3-D Charts</a><br>
-service Chart3DBarProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Disabling_Commands_at_Runtime">Writing UNO Components - Disable Commands - Disabling Commands at Runtime</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Configuration_Management#Object_Model">Configuration Management - Object Model</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Configuration_Management#Updating_Configuration_Data">Configuration Management - Updating Configuration Data</a><br>
+service ConfigurationUpdateAccess {}
 };
 };
 };
@@ -259,10 +288,12 @@ service Chart3DBarProperties {}
 module com {
 module sun {
 module star {
-module style {
+module configuration {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Page_Layout">Text - Page Layout</a><br>
-service PageProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Disabling_Commands_at_Runtime">Writing UNO Components - Disable Commands - Disabling Commands at Runtime</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Configuration_Management#Connecting_to_a_Data_Source">Configuration Management - Connecting to a Data Source</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Configuration_Management#Object_Model">Configuration Management - Object Model</a><br>
+service ConfigurationProvider {}
 };
 };
 };
@@ -272,10 +303,10 @@ service PageProperties {}
 module com {
 module sun {
 module star {
-module container {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Collections_and_Containers">ProUNO - Collections and Containers</a><br>
-interface XNameAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Disabling_Commands_at_Runtime">Writing UNO Components - Disable Commands - Disabling Commands at Runtime</a><br>
+interface XChangesBatch {}
 };
 };
 };
@@ -285,17 +316,14 @@ interface XNameAccess {}
 module com {
 module sun {
 module star {
-module lang {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Service_Manager_and_Component_Context">ProUNO - Service Manager and Component Context</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact#Getting_Started">FirstSteps - First Contact - Getting Started</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/The_Service_Manager_Component#Instantiation">ProUNO - Bridge - The Service Manager Component - Instantiation</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Instantiating_UNO_Services">ProUNO - Basic - Instantiating UNO Services</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager">ProUNO - Java - Getting a Service Manager</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/Implementing_UNO_Language_Bindings#Bootstrapping">AdvUNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - Bootstrapping</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections">ProUNO - C++ - Establishing Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections">ProUNO - UNO Interprocess Connections</a><br>
-service ServiceManager {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Creating_and_Loading_Text_Documents">Text Documents - Handling Text Document Files - Creating and Loading Text Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Loading_Documents">Office Development - Handling Documents - Loading Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Desktop">Office Development - Using the Desktop</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Creating_and_Loading_Spreadsheet_Documents">Spreadsheet Documents - Handling Spreadsheet Documents Files - Creating and Loading Spreadsheet Documents</a><br>
+interface XComponentLoader {}
 };
 };
 };
@@ -307,8 +335,8 @@ module sun {
 module star {
 module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-service ImportFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Redline">Text Documents - Redline</a><br>
+interface XRedlinesSupplier {}
 };
 };
 };
@@ -318,10 +346,11 @@ service ImportFilter {}
 module com {
 module sun {
 module star {
-module drawing {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/General_Drawing_Properties">Drawings - General Drawing Properties</a><br>
-service FillProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XCalendar">Office Development - Implementing a New Locale - XCalendar</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XCalendar">Office Development - Overview and Using the API - XCalendar</a><br>
+interface XCalendar {}
 };
 };
 };
@@ -331,10 +360,10 @@ service FillProperties {}
 module com {
 module sun {
 module star {
-module sdbc {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Using_DBMS_Features#Transaction_Handling">Database - Using DBMS Features - Transaction Handling</a><br>
-constants TransactionIsolation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Querying_for_Cells_with_Specific_Properties">Spreadsheet Documents - Querying for Cells with Specific Properties</a><br>
+interface XCellRangesQuery {}
 };
 };
 };
@@ -344,10 +373,10 @@ constants TransactionIsolation {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Reference_Marks">Text - Reference Marks</a><br>
-service ReferenceMark {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Querying_for_Cells_with_Specific_Properties">Spreadsheet Documents - Querying for Cells with Specific Properties</a><br>
+interface XFormulaQuery {}
 };
 };
 };
@@ -357,11 +386,10 @@ service ReferenceMark {}
 module com {
 module sun {
 module star {
-module sdb {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Result_Sets">Database - Result Sets</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Clones_of_the_RowSet_Service">Database - Clones of the RowSet Service</a><br>
-service ResultSet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Querying_for_Cells_with_Specific_Properties">Spreadsheet Documents - Querying for Cells with Specific Properties</a><br>
+service SheetRangesQuery {}
 };
 };
 };
@@ -371,11 +399,10 @@ service ResultSet {}
 module com {
 module sun {
 module star {
-module uno {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XAggregation">WritingUNO - XAggregation</a><br>
-interface XAggregation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Column_and_Row_Access">Spreadsheet Documents - Column and Row Access</a><br>
+interface XColumnRowRange {}
 };
 };
 };
@@ -385,10 +412,10 @@ interface XAggregation {}
 module com {
 module sun {
 module star {
-module sheet {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Function_Handling#Information_about_Functions">Spreadsheets - Function Handling - Information about Functions</a><br>
-service FunctionDescriptions {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Path_Settings">Office Development - Path Settings</a><br>
+service PathSettings {}
 };
 };
 };
@@ -398,10 +425,14 @@ service FunctionDescriptions {}
 module com {
 module sun {
 module star {
-module text {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Indexes_and_Index_Marks">Text - Indexes and Index Marks</a><br>
-interface XDocumentIndex {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Lifetime_of_UNO_objects">Professional UNO - Lifetime of UNO objects</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Closing_Documents">Office Development - Closing Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XComponent">Writing UNO Components - XComponent</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Component_Framework">Office Development - Using the Component Framework</a><br>
+interface XComponent {}
 };
 };
 };
@@ -411,10 +442,14 @@ interface XDocumentIndex {}
 module com {
 module sun {
 module star {
-module util {
+module uno {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Navigating#Search_and_Replace">Text - Navigating - Search and Replace</a><br>
-interface XSearchable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Lifetime_of_UNO_objects">Professional UNO - Lifetime of UNO objects</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#Using_Interfaces">First Steps - Using Services - Using Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Using_UNO_Interfaces">Professional UNO - Using UNO Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XInterface">Writing UNO Components - XInterface</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+interface XInterface {}
 };
 };
 };
@@ -424,10 +459,13 @@ interface XSearchable {}
 module com {
 module sun {
 module star {
-module container {
+module uno {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-interface XChild {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Lifetime_of_UNO_objects">Professional UNO - Lifetime of UNO objects</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XWeak">Writing UNO Components - XWeak</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Using_Weak_References">Professional UNO - C++ - Using Weak References</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+interface XWeak {}
 };
 };
 };
@@ -437,10 +475,10 @@ interface XChild {}
 module com {
 module sun {
 module star {
-module ucb {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Executing_Content_Commands">UCB - Executing Content Commands</a><br>
-struct Command {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Java_Window_Integration">Office Development - Java Window Integration</a><br>
+interface XToolkit {}
 };
 };
 };
@@ -450,10 +488,10 @@ struct Command {}
 module com {
 module sun {
 module star {
-module sheet {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Compatibility_Names">Spreadsheets - Compatibility Names</a><br>
-interface XCompatibilityNames {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Java_Window_Integration">Office Development - Java Window Integration</a><br>
+service Toolkit {}
 };
 };
 };
@@ -463,10 +501,13 @@ interface XCompatibilityNames {}
 module com {
 module sun {
 module star {
-module style {
-/// @enum BreakType
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Java_Window_Integration">Office Development - Java Window Integration</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Window_Interfaces">Office Development - Component - Window Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Windows">Office Development - Windows</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/JavaBean_for_Office_Components#OfficeWindow_Interface">JavaBean for Office Components - OfficeWindow Interface</a><br>
+interface XWindowPeer {}
 };
 };
 };
@@ -476,10 +517,10 @@ module style {
 module com {
 module sun {
 module star {
-module chart {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Data_Access">Charts - Data Access</a><br>
-interface XChartData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Shape_Objects_in_Text">Text Documents - Shape Objects in Text</a><br>
+service TextEmbeddedObject {}
 };
 };
 };
@@ -489,10 +530,10 @@ interface XChartData {}
 module com {
 module sun {
 module star {
-module drawing {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/General_Drawing_Properties">Drawings - General Drawing Properties</a><br>
-service LineProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Shape_Objects_in_Text">Text Documents - Shape Objects in Text</a><br>
+service BaseFrame {}
 };
 };
 };
@@ -502,11 +543,11 @@ service LineProperties {}
 module com {
 module sun {
 module star {
-module i18n {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XNativeNumberSupplier">OfficeDev - Overview and Using the API - XNativeNumberSupplier</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XNativeNumberSupplier">OfficeDev - Implementing a New Locale - XNativeNumberSupplier</a><br>
-interface XNativeNumberSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Shape_Objects_in_Text">Text Documents - Shape Objects in Text</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service Shape {}
 };
 };
 };
@@ -516,10 +557,10 @@ interface XNativeNumberSupplier {}
 module com {
 module sun {
 module star {
-module reflection {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-interface XTypeDescription {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Shape_Objects_in_Text">Text Documents - Shape Objects in Text</a><br>
+service TextGraphicObject {}
 };
 };
 };
@@ -529,10 +570,10 @@ interface XTypeDescription {}
 module com {
 module sun {
 module star {
-module drawing {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Bezier_Shapes">Drawings - Bezier Shapes</a><br>
-service PolyPolygonBezierDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Shape_Objects_in_Text">Text Documents - Shape Objects in Text</a><br>
+service TextFrame {}
 };
 };
 };
@@ -542,10 +583,11 @@ service PolyPolygonBezierDescriptor {}
 module com {
 module sun {
 module star {
-module bridge {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Opening_a_Connection">ProUNO - Opening a Connection</a><br>
-interface XBridgeFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Automatic_Key_Generation">Forms - Automatic Key Generation</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Events_and_Other_Notifications">Database Access - Events and Other Notifications</a><br>
+interface XRowSetApproveBroadcaster {}
 };
 };
 };
@@ -555,11 +597,12 @@ interface XBridgeFactory {}
 module com {
 module sun {
 module star {
-module container {
+module bridge {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Iterating_over_Text">Text - Iterating over Text</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Service_Manager#XContentEnumerationAccess_Interface">ProUNO - Service Manager - XContentEnumerationAccess Interface</a><br>
-interface XContentEnumerationAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager">Professional UNO - Java - Getting a Service Manager</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections">Professional UNO - C++ - Establishing Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections">Professional UNO - UNO Interprocess Connections</a><br>
+interface XUnoUrlResolver {}
 };
 };
 };
@@ -569,13 +612,13 @@ interface XContentEnumerationAccess {}
 module com {
 module sun {
 module star {
-module drawing {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#Document_Specific_Controller_Services">OfficeDev - Component - Controllers - Document Specific Controller Services</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Zooming">Drawings - Zooming</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Other_Drawing_Specific_View_Settings">Drawings - Other Drawing Specific View Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Setting_the_Current_Page">Drawings - Setting the Current Page</a><br>
-service DrawingDocumentDrawView {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager">Professional UNO - Java - Getting a Service Manager</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections">Professional UNO - C++ - Establishing Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#Failed_Connections">First Steps - First Contact - Getting Started - Failed Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections">Professional UNO - UNO Interprocess Connections</a><br>
+exception DisposedException {}
 };
 };
 };
@@ -585,12 +628,13 @@ service DrawingDocumentDrawView {}
 module com {
 module sun {
 module star {
-module form {
-module binding {
+module bridge {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/External_List_Sources">Forms - External List Sources</a><br>
-interface XListEntrySource {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager">Professional UNO - Java - Getting a Service Manager</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#Bootstrapping">Advanced UNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - Bootstrapping</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections">Professional UNO - C++ - Establishing Interprocess Connections</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections">Professional UNO - UNO Interprocess Connections</a><br>
+service UnoUrlResolver {}
 };
 };
 };
@@ -600,10 +644,16 @@ interface XListEntrySource {}
 module com {
 module sun {
 module star {
-module form {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Parameters">Forms - Parameters</a><br>
-interface XDatabaseParameterBroadcaster {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_DCP_Contents">Appendix C. Universal Content Providers - The WebDAV Content Provider - Creation of New DCP Contents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_FTP_Content">Appendix C. Universal Content Providers - The FTP Content Provider - Creation of New FTP Content</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_HCP_Content">Appendix C. Universal Content Providers - The Hierarchy Content Provider - Creation of New HCP Content</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Creating">Universal Content Broker - Creating</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_File_Contents">Appendix C. Universal Content Providers - The File Content Provider - Creation of New File Contents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_PCP_Contents">Appendix C. Universal Content Providers - The Package Content Provider - Creation of New PCP Contents</a><br>
+interface XContentCreator {}
 };
 };
 };
@@ -613,10 +663,10 @@ interface XDatabaseParameterBroadcaster {}
 module com {
 module sun {
 module star {
-module i18n {
-/// @enum TransliterationModules
+module xml {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XTransliteration">OfficeDev - Implementing a New Locale - XTransliteration</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Writing_the_Filtering_Component">Office Development - Writing the Filtering Component</a><br>
+service ImportFilter {}
 };
 };
 };
@@ -626,12 +676,10 @@ module i18n {
 module com {
 module sun {
 module star {
-module form {
-module binding {
+module xml {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/External_List_Sources">Forms - External List Sources</a><br>
-interface XListEntrySink {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Writing_the_Filtering_Component">Office Development - Writing the Filtering Component</a><br>
+service ExportFilter {}
 };
 };
 };
@@ -641,10 +689,13 @@ interface XListEntrySink {}
 module com {
 module sun {
 module star {
-module style {
+module xml {
+module sax {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service CharacterPropertiesAsian {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Writing_the_Filtering_Component">Office Development - Writing the Filtering Component</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XDocumentHandler">Office Development - Writing the Filtering Component - XDocumentHandler</a><br>
+interface XDocumentHandler {}
+};
 };
 };
 };
@@ -654,11 +705,10 @@ service CharacterPropertiesAsian {}
 module com {
 module sun {
 module star {
-module sdbc {
+module xml {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/XDatabaseMetaData_Interface">Database - XDatabaseMetaData Interface</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Database_Design#Retrieving_Information_about_a_Database">Database - Database Design - Retrieving Information about a Database</a><br>
-interface XDatabaseMetaData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Writing_the_Filtering_Component">Office Development - Writing the Filtering Component</a><br>
+service XMLImportFilter {}
 };
 };
 };
@@ -668,12 +718,10 @@ interface XDatabaseMetaData {}
 module com {
 module sun {
 module star {
-module awt {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Window_Interfaces">OfficeDev - Component - Window Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frames#Linking_Components_and_Windows">OfficeDev - Frames - Linking Components and Windows</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Windows">OfficeDev - Windows</a><br>
-interface XTopWindow {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Implementation">Writing UNO Components - Implementation</a><br>
+service ProtocolHandler {}
 };
 };
 };
@@ -683,10 +731,11 @@ interface XTopWindow {}
 module com {
 module sun {
 module star {
-module sheet {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Querying_for_Cells_with_Specific_Properties">Spreadsheets - Querying for Cells with Specific Properties</a><br>
-service SheetRangesQuery {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Implementation">Writing UNO Components - Implementation</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Dispatch_Framework">Office Development - Dispatch Framework</a><br>
+interface XDispatchProvider {}
 };
 };
 };
@@ -696,10 +745,11 @@ service SheetRangesQuery {}
 module com {
 module sun {
 module star {
-module sheet {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Fill_Series">Spreadsheets - Fill Series</a><br>
-interface XCellSeries {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps#Using_Properties">First Steps - Using Services - Using Properties</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Properties">Professional UNO - Properties</a><br>
+interface XPropertySet {}
 };
 };
 };
@@ -709,16 +759,13 @@ interface XCellSeries {}
 module com {
 module sun {
 module star {
-module ucb {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixC/The_WebDAV_Content_Provider#Creation_of_New_DCP_Contents">AppendixC - The WebDAV Content Provider - Creation of New DCP Contents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixC/The_FTP_Content_Provider#Creation_of_New_FTP_Content">AppendixC - The FTP Content Provider - Creation of New FTP Content</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixC/The_Hierarchy_Content_Provider#Creation_of_New_HCP_Content">AppendixC - The Hierarchy Content Provider - Creation of New HCP Content</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Creating">UCB - Creating</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixC/The_File_Content_Provider#Creation_of_New_File_Contents">AppendixC - The File Content Provider - Creation of New File Contents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixC/The_Package_Content_Provider#Creation_of_New_PCP_Contents">AppendixC - The Package Content Provider - Creation of New PCP Contents</a><br>
-interface XContentCreator {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Storing">Drawings and Presentations - Storing</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Storing_Documents">Office Development - Storing Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Storing">Spreadsheet Documents - Saving Spreadsheet Documents - Storing</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Storing">Text Documents - Saving Text Documents - Storing</a><br>
+interface XStorable {}
 };
 };
 };
@@ -728,10 +775,10 @@ interface XContentCreator {}
 module com {
 module sun {
 module star {
-module container {
+module uno {
+/// @enum TypeClass
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Collections_and_Containers">ProUNO - Collections and Containers</a><br>
-interface XNameContainer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Data_Types">Professional UNO - Data Types</a><br>
 };
 };
 };
@@ -741,10 +788,10 @@ interface XNameContainer {}
 module com {
 module sun {
 module star {
-module sdb {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/The_DataSource_Service">Database - The DataSource Service</a><br>
-service DataSource {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+interface XContent {}
 };
 };
 };
@@ -754,10 +801,10 @@ service DataSource {}
 module com {
 module sun {
 module star {
-module sheet {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Function_Handling#Recently_Used_Functions">Spreadsheets - Function Handling - Recently Used Functions</a><br>
-service RecentFunctions {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+service Content {}
 };
 };
 };
@@ -767,10 +814,10 @@ service RecentFunctions {}
 module com {
 module sun {
 module star {
-module sheet {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Absolute_Address">Spreadsheets - Absolute Address</a><br>
-interface XCellRangeAddressable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+interface XChild {}
 };
 };
 };
@@ -780,10 +827,10 @@ interface XCellRangeAddressable {}
 module com {
 module sun {
 module star {
-module task {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Jobs/Implementation">WritingUNO - Jobs - Implementation</a><br>
-interface XAsyncJob {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+interface XPropertyContainer {}
 };
 };
 };
@@ -793,13 +840,10 @@ interface XAsyncJob {}
 module com {
 module sun {
 module star {
-module form {
-module component {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/HTML_Forms">Forms - HTML Forms</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models_Forms">Forms - Control Models Forms</a><br>
-service HTMLForm {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+interface XCommandProcessor2 {}
 };
 };
 };
@@ -809,10 +853,11 @@ service HTMLForm {}
 module com {
 module sun {
 module star {
-module sheet {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Equally_Formatted_Cell_Ranges#Cell_Format_Ranges">Spreadsheets - Equally Formatted Cell Ranges - Cell Format Ranges</a><br>
-service CellFormatRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces">Universal Content Broker - Services and Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Executing_Content_Commands">Universal Content Broker - Executing Content Commands</a><br>
+interface XCommandProcessor {}
 };
 };
 };
@@ -822,10 +867,11 @@ service CellFormatRanges {}
 module com {
 module sun {
 module star {
-module sdb {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Tables_and_Columns">Database - Tables and Columns</a><br>
-service Column {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Frame_Creation">Office Development - Creating Frames Manually - Frame Creation</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linking_Components_and_Windows">Office Development - Frames - Linking Components and Windows</a><br>
+service Frame {}
 };
 };
 };
@@ -835,10 +881,14 @@ service Column {}
 module com {
 module sun {
 module star {
-module beans {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Properties">ProUNO - Properties</a><br>
-interface XMultiPropertySet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Frame_Creation">Office Development - Creating Frames Manually - Frame Creation</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linking_Components_and_Windows">Office Development - Frames - Linking Components and Windows</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Frame_Setup">Office Development - Component - Frames - XFrame - Frame Setup</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Getting_Frames%2C_Controllers_and_Models_from_Each_Other">Office Development - Component - Getting Frames, Controllers and Models from Each Other</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Frame-Controller-Model_Paradigm_in_LibreOffice">Office Development - Frame-Controller-Model Paradigm in LibreOffice</a><br>
+interface XFrame {}
 };
 };
 };
@@ -848,10 +898,12 @@ interface XMultiPropertySet {}
 module com {
 module sun {
 module star {
-module sdb {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Forms_and_Reports">Database - Forms and Reports</a><br>
-interface XFormDocumentsSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XViewDataSupplier">Office Development - Component - Models - XViewDataSupplier</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Other_Drawing_Specific_View_Settings">Drawings and Presentations - Other Drawing Specific View Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Document_Controller">Text Documents - Text Document Controller</a><br>
+interface XViewDataSupplier {}
 };
 };
 };
@@ -861,10 +913,10 @@ interface XFormDocumentsSupplier {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Column_Service">Database - Column Service</a><br>
-service KeyColumn {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Accessing_a_UCB_Content">Universal Content Broker - Accessing a UCB Content</a><br>
+interface XContentProvider {}
 };
 };
 };
@@ -874,10 +926,10 @@ service KeyColumn {}
 module com {
 module sun {
 module star {
-module sdb {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Events_and_Other_Notifications">Database - Events and Other Notifications</a><br>
-interface XRowSetApproveListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Accessing_a_UCB_Content">Universal Content Broker - Accessing a UCB Content</a><br>
+interface XContentIdentifierFactory {}
 };
 };
 };
@@ -887,13 +939,11 @@ interface XRowSetApproveListener {}
 module com {
 module sun {
 module star {
-module frame {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#Document_Specific_Controller_Services">OfficeDev - Component - Controllers - Document Specific Controller Services</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#XController">OfficeDev - Component - Controllers - XController</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Document_Controller">Text - Text Document Controller</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Controllers">OfficeDev - Controllers</a><br>
-service Controller {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XTextConversion">Office Development - Implementing a New Locale - XTextConversion</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XTextConversion">Office Development - Overview and Using the API - XTextConversion</a><br>
+interface XTextConversion {}
 };
 };
 };
@@ -903,10 +953,10 @@ service Controller {}
 module com {
 module sun {
 module star {
-module sdbc {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Creating_Statements">Database - Creating Statements</a><br>
-service Statement {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#3-D_Charts">Charts - 3-D Charts</a><br>
+service Dim3DDiagram {}
 };
 };
 };
@@ -916,11 +966,10 @@ service Statement {}
 module com {
 module sun {
 module star {
-module sheet {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#Document_Specific_Controller_Services">OfficeDev - Component - Controllers - Document Specific Controller Services</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Document_Controller#Spreadsheet_View">Spreadsheets - Spreadsheet Document Controller - Spreadsheet View</a><br>
-service SpreadsheetView {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#3-D_Charts">Charts - 3-D Charts</a><br>
+service Chart3DBarProperties {}
 };
 };
 };
@@ -930,10 +979,13 @@ service SpreadsheetView {}
 module com {
 module sun {
 module star {
-module text {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Fields">Text - Text Fields</a><br>
-interface XTextField {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Specific_Controller_Services">Office Development - Component - Controllers - Document Specific Controller Services</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XController">Office Development - Component - Controllers - XController</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Document_Controller">Text Documents - Text Document Controller</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Controllers">Office Development - Controllers</a><br>
+service Controller {}
 };
 };
 };
@@ -943,10 +995,10 @@ interface XTextField {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Data_Consolidation">Spreadsheets - Other Table Operations - Data Consolidation</a><br>
-interface XConsolidationDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Specific_Controller_Services">Office Development - Component - Controllers - Document Specific Controller Services</a><br>
+service DataSourceBrowser {}
 };
 };
 };
@@ -956,10 +1008,10 @@ interface XConsolidationDescriptor {}
 module com {
 module sun {
 module star {
-module reflection {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Exceptions_and_Errorcodes">ProUNO - Bridge - Exceptions and Errorcodes</a><br>
-exception InvocationTargetException {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Specific_Controller_Services">Office Development - Component - Controllers - Document Specific Controller Services</a><br>
+service TextDocumentView {}
 };
 };
 };
@@ -969,11 +1021,13 @@ exception InvocationTargetException {}
 module com {
 module sun {
 module star {
-module text {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Iterating_over_Text">Text - Iterating over Text</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service TextPortion {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Specific_Controller_Services">Office Development - Component - Controllers - Document Specific Controller Services</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Zooming">Drawings and Presentations - Zooming</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Other_Drawing_Specific_View_Settings">Drawings and Presentations - Other Drawing Specific View Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Setting_the_Current_Page">Drawings and Presentations - Setting the Current Page</a><br>
+service DrawingDocumentDrawView {}
 };
 };
 };
@@ -983,11 +1037,11 @@ service TextPortion {}
 module com {
 module sun {
 module star {
-module i18n {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XIndexEntrySupplier">OfficeDev - Overview and Using the API - XIndexEntrySupplier</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XIndexEntrySupplier">OfficeDev - Implementing a New Locale - XIndexEntrySupplier</a><br>
-interface XIndexEntrySupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Document_Specific_Controller_Services">Office Development - Component - Controllers - Document Specific Controller Services</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_View">Spreadsheet Documents - Spreadsheet Document Controller - Spreadsheet View</a><br>
+service SpreadsheetView {}
 };
 };
 };
@@ -999,8 +1053,8 @@ module sun {
 module star {
 module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Ruby">Text - Ruby</a><br>
-interface XRubySelection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Locating_Text_Contents">Text Documents - Navigating - Locating Text Contents</a><br>
+interface XTextContent {}
 };
 };
 };
@@ -1012,8 +1066,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Filtering">Spreadsheets - Filtering</a><br>
-interface XSheetFilterable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Handling_Array_Formulas">Spreadsheet Documents - Handling Array Formulas</a><br>
+interface XArrayFormulaRange {}
 };
 };
 };
@@ -1023,14 +1077,11 @@ interface XSheetFilterable {}
 module com {
 module sun {
 module star {
-module frame {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Handling_Text_Document_Files#Creating_and_Loading_Text_Documents">Text - Handling Text Document Files - Creating and Loading Text Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Handling_Documents#Loading_Documents">OfficeDev - Handling Documents - Loading Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Desktop">OfficeDev - Using the Desktop</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Handling_Spreadsheet_Documents_Files#Creating_and_Loading_Spreadsheet_Documents">Spreadsheets - Handling Spreadsheet Documents Files - Creating and Loading Spreadsheet Documents</a><br>
-interface XComponentLoader {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Models_and_Views_for_Form_Controls">Forms - Models and Views for Form Controls</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models">Forms - Control Models</a><br>
+service UnoControlModel {}
 };
 };
 };
@@ -1040,10 +1091,10 @@ interface XComponentLoader {}
 module com {
 module sun {
 module star {
-module document {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events">OfficeDev - Document Events</a><br>
-service Events {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Models_and_Views_for_Form_Controls">Forms - Models and Views for Form Controls</a><br>
+service UnoControl {}
 };
 };
 };
@@ -1053,10 +1104,12 @@ service Events {}
 module com {
 module sun {
 module star {
-module script {
+module datatransfer {
+module clipboard {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Exceptions_and_Errorcodes">ProUNO - Bridge - Exceptions and Errorcodes</a><br>
-exception CannotConvertException {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Clipboard">Office Development - Common Application Features - Clipboard</a><br>
+service SystemClipboard {}
+};
 };
 };
 };
@@ -1066,16 +1119,12 @@ exception CannotConvertException {}
 module com {
 module sun {
 module star {
-module uno {
+module datatransfer {
+module clipboard {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Service_Manager_and_Component_Context">ProUNO - Service Manager and Component Context</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact#Getting_Started">FirstSteps - First Contact - Getting Started</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager">ProUNO - Java - Getting a Service Manager</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections">ProUNO - C++ - Establishing Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections">ProUNO - UNO Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Transparent_Use_of_Office_UNO_Components">ProUNO - C++ - Transparent Use of Office UNO Components</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Transparent_Use_of_Office_UNO_Components">ProUNO - Java - Transparent Use of Office UNO Components</a><br>
-interface XComponentContext {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Clipboard">Office Development - Common Application Features - Clipboard</a><br>
+interface XClipboard {}
+};
 };
 };
 };
@@ -1085,11 +1134,10 @@ interface XComponentContext {}
 module com {
 module sun {
 module star {
-module text {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Shape_Objects_in_Text">Text - Shape Objects in Text</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service Shape {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models_and_Shapes">Forms - Control Models and Shapes</a><br>
+service ControlShape {}
 };
 };
 };
@@ -1099,10 +1147,10 @@ service Shape {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Filtering">Spreadsheets - Filtering</a><br>
-service SheetFilterDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Driver_Specifics">Database Access - Driver Specifics - Driver Specifics</a><br>
+service Driver {}
 };
 };
 };
@@ -1112,10 +1160,10 @@ service SheetFilterDescriptor {}
 module com {
 module sun {
 module star {
-module ucb {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-interface XContent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#How_Add-Ins_Work">Charts - How Add-Ins Work</a><br>
+interface XRefreshable {}
 };
 };
 };
@@ -1125,10 +1173,11 @@ interface XContent {}
 module com {
 module sun {
 module star {
-module awt {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Java_Window_Integration">OfficeDev - Java Window Integration</a><br>
-interface XToolkit {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XLocaleData">Office Development - Overview and Using the API - XLocaleData</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XLocaleData">Office Development - Implementing a New Locale - XLocaleData</a><br>
+interface XLocaleData {}
 };
 };
 };
@@ -1138,10 +1187,10 @@ interface XToolkit {}
 module com {
 module sun {
 module star {
-module linguistic2 {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Linguistics">OfficeDev - Linguistics</a><br>
-service Thesaurus {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Link_Targets">Text Documents - Link Targets</a><br>
+interface XLinkTargetSupplier {}
 };
 };
 };
@@ -1151,10 +1200,10 @@ service Thesaurus {}
 module com {
 module sun {
 module star {
-module sdb {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Queries">Database - Queries</a><br>
-service QueryDefinition {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Recently_Used_Functions">Spreadsheet Documents - Function Handling - Recently Used Functions</a><br>
+service RecentFunctions {}
 };
 };
 };
@@ -1164,10 +1213,10 @@ service QueryDefinition {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Sheet_Links">Spreadsheets - Sheet Links</a><br>
-service SheetLink {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Connection_Pooling">Database Access - Connection Pooling</a><br>
+interface XPooledConnection {}
 };
 };
 };
@@ -1177,11 +1226,10 @@ service SheetLink {}
 module com {
 module sun {
 module star {
-module text {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Editing_Text#Text_Contents_Other_Than_Strings">Text - Editing Text - Text Contents Other Than Strings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Editing_Text">Text - Editing Text</a><br>
-interface XText {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Connection_Pooling">Database Access - Connection Pooling</a><br>
+service ConnectionPool {}
 };
 };
 };
@@ -1191,10 +1239,12 @@ interface XText {}
 module com {
 module sun {
 module star {
-module text {
+module form {
+module binding {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#Document_Specific_Controller_Services">OfficeDev - Component - Controllers - Document Specific Controller Services</a><br>
-service TextDocumentView {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#External_List_Sources">Forms - External List Sources</a><br>
+interface XListEntrySink {}
+};
 };
 };
 };
@@ -1204,12 +1254,12 @@ service TextDocumentView {}
 module com {
 module sun {
 module star {
-module sdb {
+module form {
+module binding {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Forms_as_Row_Sets">Forms - Forms as Row Sets</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/The_RowSet_Service">Database - The RowSet Service</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Example:_Querying_the_Bibliography_Database">Database - Example: Querying the Bibliography Database</a><br>
-service RowSet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#External_List_Sources">Forms - External List Sources</a><br>
+interface XListEntrySource {}
+};
 };
 };
 };
@@ -1219,10 +1269,10 @@ service RowSet {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Working_with_Text_Documents#Word_Processing">Text - Working with Text Documents - Word Processing</a><br>
-service Text {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Multiple_Operations">Spreadsheet Documents - Multiple Operations</a><br>
+interface XMultipleOperation {}
 };
 };
 };
@@ -1232,10 +1282,10 @@ service Text {}
 module com {
 module sun {
 module star {
-module util {
+module task {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-service NumberFormats {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Implementation_2">Writing UNO Components - Jobs - Implementation</a><br>
+interface XAsyncJob {}
 };
 };
 };
@@ -1245,10 +1295,10 @@ service NumberFormats {}
 module com {
 module sun {
 module star {
-module document {
+module task {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Inserting_Text_Files">Text - Inserting Text Files</a><br>
-interface XDocumentInsertable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Implementation_2">Writing UNO Components - Jobs - Implementation</a><br>
+interface XJob {}
 };
 };
 };
@@ -1258,10 +1308,10 @@ interface XDocumentInsertable {}
 module com {
 module sun {
 module star {
-module sheet {
+module task {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Print_Areas">Spreadsheets - Printing Spreadsheet Documents - Print Areas</a><br>
-interface XPrintAreas {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Implementation_2">Writing UNO Components - Jobs - Implementation</a><br>
+service Job {}
 };
 };
 };
@@ -1271,10 +1321,10 @@ interface XPrintAreas {}
 module com {
 module sun {
 module star {
-module document {
+module task {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Redline">Text - Redline</a><br>
-interface XRedlinesSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Implementation_2">Writing UNO Components - Jobs - Implementation</a><br>
+service AsyncJob {}
 };
 };
 };
@@ -1284,10 +1334,10 @@ interface XRedlinesSupplier {}
 module com {
 module sun {
 module star {
-module bridge {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Opening_a_Connection">ProUNO - Opening a Connection</a><br>
-service BridgeFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Settings">Spreadsheet Documents - Settings</a><br>
+service GlobalSheetSettings {}
 };
 };
 };
@@ -1297,10 +1347,10 @@ service BridgeFactory {}
 module com {
 module sun {
 module star {
-module sheet {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/DataPilot_Tables">Spreadsheets - DataPilot Tables</a><br>
-service DataPilotTables {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Loadable_Forms">Forms - Loadable Forms</a><br>
+interface XLoadable {}
 };
 };
 };
@@ -1310,14 +1360,10 @@ service DataPilotTables {}
 module com {
 module sun {
 module star {
-module frame {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Creating_Frames_Manually#Frame_Creation">OfficeDev - Creating Frames Manually - Frame Creation</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frames#Linking_Components_and_Windows">OfficeDev - Frames - Linking Components and Windows</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Frames#Frame_Setup">OfficeDev - Component - Frames - XFrame - Frame Setup</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Getting_Frames%2C_Controllers_and_Models_from_Each_Other">OfficeDev - Component - Getting Frames, Controllers and Models from Each Other</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org">OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org</a><br>
-interface XFrame {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Loadable_Forms">Forms - Loadable Forms</a><br>
+interface XLoadListener {}
 };
 };
 };
@@ -1327,10 +1373,10 @@ interface XFrame {}
 module com {
 module sun {
 module star {
-module text {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Line_Numbering_and_Outline_Numbering#Line_Numbering">Text - Line Numbering and Outline Numbering - Line Numbering</a><br>
-service LineNumberingProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#PreparedStatement_From_DataSource_Queries">Database Access - PreparedStatement From DataSource Queries</a><br>
+interface XCommandPreparation {}
 };
 };
 };
@@ -1342,8 +1388,8 @@ module sun {
 module star {
 module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext">Database - Data Sources in OpenOffice.org API - DatabaseContext</a><br>
-service DatabaseContext {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#PreparedStatement_From_DataSource_Queries">Database Access - PreparedStatement From DataSource Queries</a><br>
+constants CommandType {}
 };
 };
 };
@@ -1353,10 +1399,10 @@ service DatabaseContext {}
 module com {
 module sun {
 module star {
-module util {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Indentation">Spreadsheets - Indentation</a><br>
-interface XIndent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Data_Aware_Controls">Forms - Data Aware Controls</a><br>
+service DataAwareControlModel {}
 };
 };
 };
@@ -1366,11 +1412,10 @@ interface XIndent {}
 module com {
 module sun {
 module star {
-module frame {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Frames#XFramesSupplier">OfficeDev - Component - Frames - XFramesSupplier</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Creating_Frames_Manually#Setting_Components_into_Frame_Hierarchies">OfficeDev - Creating Frames Manually - Setting Components into Frame Hierarchies</a><br>
-interface XFramesSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Queries">Database Access - Queries</a><br>
+service QueryDefinition {}
 };
 };
 };
@@ -1380,11 +1425,10 @@ interface XFramesSupplier {}
 module com {
 module sun {
 module star {
-module text {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Iterating_over_Text">Text - Iterating over Text</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service Paragraph {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Grouping%2C_Combining_and_Binding">Drawings and Presentations - Grouping, Combining and Binding</a><br>
+service GroupShape {}
 };
 };
 };
@@ -1394,10 +1438,10 @@ service Paragraph {}
 module com {
 module sun {
 module star {
-module text {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Editing_Text#Strings">Text - Editing Text - Strings</a><br>
-interface XSimpleText {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Grouping%2C_Combining_and_Binding">Drawings and Presentations - Grouping, Combining and Binding</a><br>
+service ShapeCollection {}
 };
 };
 };
@@ -1407,10 +1451,10 @@ interface XSimpleText {}
 module com {
 module sun {
 module star {
-module sheet {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Scenarios">Spreadsheets - Other Table Operations - Scenarios</a><br>
-interface XScenarios {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Grouping%2C_Combining_and_Binding">Drawings and Presentations - Grouping, Combining and Binding</a><br>
+interface XShapeGrouper {}
 };
 };
 };
@@ -1420,11 +1464,10 @@ interface XScenarios {}
 module com {
 module sun {
 module star {
-module i18n {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XCalendar">OfficeDev - Implementing a New Locale - XCalendar</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XCalendar">OfficeDev - Overview and Using the API - XCalendar</a><br>
-interface XCalendar {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Grouping%2C_Combining_and_Binding">Drawings and Presentations - Grouping, Combining and Binding</a><br>
+interface XShapeCombiner {}
 };
 };
 };
@@ -1434,10 +1477,10 @@ interface XCalendar {}
 module com {
 module sun {
 module star {
-module drawing {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/General_Drawing_Properties">Drawings - General Drawing Properties</a><br>
-service TextProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#View_Settings">Spreadsheet Documents - View Settings</a><br>
+service SpreadsheetViewSettings {}
 };
 };
 };
@@ -1447,10 +1490,10 @@ service TextProperties {}
 module com {
 module sun {
 module star {
-module frame {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Implementation">WritingUNO - Implementation</a><br>
-service ProtocolHandler {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Area_Links">Spreadsheet Documents - Cell Area Links</a><br>
+interface XAreaLink {}
 };
 };
 };
@@ -1460,13 +1503,10 @@ service ProtocolHandler {}
 module com {
 module sun {
 module star {
-module view {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Printing_Drawing_Documents#Printer_and_Print_Job_Settings">Drawings - Printing Drawing Documents - Printer and Print Job Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Printing_Text_Documents#Printer_and_Print_Job_Settings">Text - Printing Text Documents - Printer and Print Job Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Storing_Documents#Printing_Documents">OfficeDev - Storing Documents - Printing Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Printer_and_Print_Job_Settings">Spreadsheets - Printing Spreadsheet Documents - Printer and Print Job Settings</a><br>
-interface XPrintable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Area_Links">Spreadsheet Documents - Cell Area Links</a><br>
+interface XAreaLinks {}
 };
 };
 };
@@ -1476,10 +1516,11 @@ interface XPrintable {}
 module com {
 module sun {
 module star {
-module sheet {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Creating_a_New_DataPilot_Table">Spreadsheets - Creating a New DataPilot Table</a><br>
-service DataPilotDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Properties">Professional UNO - Properties</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models">Forms - Control Models</a><br>
+interface XPropertyState {}
 };
 };
 };
@@ -1489,10 +1530,10 @@ service DataPilotDescriptor {}
 module com {
 module sun {
 module star {
-module sdb {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Forms_and_Reports">Database - Forms and Reports</a><br>
-interface XReportDocumentsSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Properties">Professional UNO - Properties</a><br>
+interface XPropertySetInfo {}
 };
 };
 };
@@ -1502,10 +1543,10 @@ interface XReportDocumentsSupplier {}
 module com {
 module sun {
 module star {
-module text {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Indexes_and_Index_Marks#Index_marks">Text - Indexes and Index Marks - Index marks</a><br>
-service BaseIndexMark {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Properties">Professional UNO - Properties</a><br>
+interface XFastPropertySet {}
 };
 };
 };
@@ -1515,10 +1556,10 @@ service BaseIndexMark {}
 module com {
 module sun {
 module star {
-module util {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Navigating#Search_and_Replace">Text - Navigating - Search and Replace</a><br>
-service SearchDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Properties">Professional UNO - Properties</a><br>
+interface XMultiPropertySet {}
 };
 };
 };
@@ -1528,13 +1569,10 @@ service SearchDescriptor {}
 module com {
 module sun {
 module star {
-module bridge {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager">ProUNO - Java - Getting a Service Manager</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/Implementing_UNO_Language_Bindings#Bootstrapping">AdvUNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - Bootstrapping</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections">ProUNO - C++ - Establishing Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections">ProUNO - UNO Interprocess Connections</a><br>
-service UnoUrlResolver {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Layer_Handling">Drawings and Presentations - Layer Handling</a><br>
+interface XLayerManager {}
 };
 };
 };
@@ -1544,10 +1582,12 @@ service UnoUrlResolver {}
 module com {
 module sun {
 module star {
-module form {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Data_Aware_Controls">Forms - Data Aware Controls</a><br>
-service DataAwareControlModel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Documents">Text Documents - Text Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Document_Properties">Text Documents - Settings - Document Properties</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service TextDocument {}
 };
 };
 };
@@ -1557,12 +1597,10 @@ service DataAwareControlModel {}
 module com {
 module sun {
 module star {
-module view {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#XSelectionSupplier">OfficeDev - Component - Controllers - XSelectionSupplier</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Setting_the_Current_Page">Drawings - Setting the Current Page</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/TextView">Text - TextView</a><br>
-interface XSelectionSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Scenarios">Spreadsheet Documents - Other Table Operations - Scenarios</a><br>
+interface XScenarios {}
 };
 };
 };
@@ -1572,10 +1610,11 @@ interface XSelectionSupplier {}
 module com {
 module sun {
 module star {
-module util {
+module view {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-interface XNumberFormatTypes {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Printer_and_Print_Job_Settings">Drawings and Presentations - Printing Drawing Documents - Printer and Print Job Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Printer_and_Print_Job_Settings">Spreadsheet Documents - Printing Spreadsheet Documents - Printer and Print Job Settings</a><br>
+service PrintOptions {}
 };
 };
 };
@@ -1585,12 +1624,11 @@ interface XNumberFormatTypes {}
 module com {
 module sun {
 module star {
-module datatransfer {
-module clipboard {
+module view {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Common_Application_Features#Clipboard">OfficeDev - Common Application Features - Clipboard</a><br>
-interface XClipboard {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Printer_and_Print_Job_Settings">Drawings and Presentations - Printing Drawing Documents - Printer and Print Job Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Printer_and_Print_Job_Settings">Spreadsheet Documents - Printing Spreadsheet Documents - Printer and Print Job Settings</a><br>
+service PrinterDescriptor {}
 };
 };
 };
@@ -1600,10 +1638,13 @@ interface XClipboard {}
 module com {
 module sun {
 module star {
-module awt {
+module view {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models_Forms">Forms - Control Models Forms</a><br>
-interface XTabControllerModel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Printer_and_Print_Job_Settings">Drawings and Presentations - Printing Drawing Documents - Printer and Print Job Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Printer_and_Print_Job_Settings">Text Documents - Printing Text Documents - Printer and Print Job Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Printing_Documents">Office Development - Storing Documents - Printing Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Printer_and_Print_Job_Settings">Spreadsheet Documents - Printing Spreadsheet Documents - Printer and Print Job Settings</a><br>
+interface XPrintable {}
 };
 };
 };
@@ -1613,10 +1654,10 @@ interface XTabControllerModel {}
 module com {
 module sun {
 module star {
-module script {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-service Converter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+interface XNumberFormatTypes {}
 };
 };
 };
@@ -1626,10 +1667,10 @@ service Converter {}
 module com {
 module sun {
 module star {
-module text {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Auto_Text">Text - Auto Text</a><br>
-service AutoTextEntry {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+interface XNumberFormatter {}
 };
 };
 };
@@ -1639,10 +1680,10 @@ service AutoTextEntry {}
 module com {
 module sun {
 module star {
-module text {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Navigating#Locating_Text_Contents">Text - Navigating - Locating Text Contents</a><br>
-interface XTextContent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+interface XNumberFormatPreviewer {}
 };
 };
 };
@@ -1652,10 +1693,10 @@ interface XTextContent {}
 module com {
 module sun {
 module star {
-module i18n {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XExtendedIndexEntrySupplier">OfficeDev - Overview and Using the API - XExtendedIndexEntrySupplier</a><br>
-interface XExtendedIndexEntrySupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+interface XNumberFormats {}
 };
 };
 };
@@ -1665,10 +1706,10 @@ interface XExtendedIndexEntrySupplier {}
 module com {
 module sun {
 module star {
-module sheet {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Named_Ranges">Spreadsheets - Named Ranges</a><br>
-interface XNamedRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+service NumberFormats {}
 };
 };
 };
@@ -1678,10 +1719,10 @@ interface XNamedRanges {}
 module com {
 module sun {
 module star {
-module frame {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Desktop">OfficeDev - Using the Desktop</a><br>
-interface XDesktop {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+service NumberFormatter {}
 };
 };
 };
@@ -1693,8 +1734,9 @@ module sun {
 module star {
 module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Command_URL">OfficeDev - Command URL</a><br>
-struct URL {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Number_Formats">Office Development - Number Formats</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Number_Formats">Text Documents - Line Numbering and Outline Numbering - Number Formats</a><br>
+interface XNumberFormatsSupplier {}
 };
 };
 };
@@ -1704,10 +1746,11 @@ struct URL {}
 module com {
 module sun {
 module star {
-module sdbc {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connecting_Using_the_DriverManager_and_a_Database_URL">Database - Connecting Using the DriverManager and a Database URL</a><br>
-service DriverManager {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Cursors">Text Documents - Navigating - Cursors</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service TextCursor {}
 };
 };
 };
@@ -1717,10 +1760,11 @@ service DriverManager {}
 module com {
 module sun {
 module star {
-module task {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Frames#XStatusIndicatorFactory">OfficeDev - Component - Frames - XStatusIndicatorFactory</a><br>
-interface XStatusIndicatorFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XFramesSupplier">Office Development - Component - Frames - XFramesSupplier</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Setting_Components_into_Frame_Hierarchies">Office Development - Creating Frames Manually - Setting Components into Frame Hierarchies</a><br>
+interface XFramesSupplier {}
 };
 };
 };
@@ -1730,10 +1774,10 @@ interface XStatusIndicatorFactory {}
 module com {
 module sun {
 module star {
-module beans {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-service Introspection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Data_Validation">Spreadsheet Documents - Other Table Operations - Data Validation</a><br>
+service TableValidation {}
 };
 };
 };
@@ -1743,10 +1787,11 @@ service Introspection {}
 module com {
 module sun {
 module star {
-module document {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Handling_Documents#MediaDescriptor">OfficeDev - Handling Documents - Loading Documents - MediaDescriptor</a><br>
-service MediaDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XIndexEntrySupplier">Office Development - Overview and Using the API - XIndexEntrySupplier</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XIndexEntrySupplier">Office Development - Implementing a New Locale - XIndexEntrySupplier</a><br>
+interface XIndexEntrySupplier {}
 };
 };
 };
@@ -1758,8 +1803,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Members">Spreadsheets - Members</a><br>
-service DataPilotSourceMember {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Cursor">Spreadsheet Documents - Cell Cursor</a><br>
+interface XSheetCellCursor {}
 };
 };
 };
@@ -1769,11 +1814,10 @@ service DataPilotSourceMember {}
 module com {
 module sun {
 module star {
-module util {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Line_Numbering_and_Outline_Numbering#Number_Formats">Text - Line Numbering and Outline Numbering - Number Formats</a><br>
-interface XNumberFormatsSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Filtering">Spreadsheet Documents - Filtering</a><br>
+service SheetFilterDescriptor {}
 };
 };
 };
@@ -1783,10 +1827,10 @@ interface XNumberFormatsSupplier {}
 module com {
 module sun {
 module star {
-module chart {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Working_With_Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
-service ChartDocument {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Filtering">Spreadsheet Documents - Filtering</a><br>
+interface XSheetFilterableEx {}
 };
 };
 };
@@ -1796,10 +1840,10 @@ service ChartDocument {}
 module com {
 module sun {
 module star {
-module i18n {
-/// @enum TransliterationModulesNew
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XTransliteration">OfficeDev - Implementing a New Locale - XTransliteration</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Filtering">Spreadsheet Documents - Filtering</a><br>
+interface XSheetFilterable {}
 };
 };
 };
@@ -1811,8 +1855,9 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Detective">Spreadsheets - Detective</a><br>
-interface XSheetAuditing {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview">Spreadsheet Documents - Spreadsheet Services - Overview</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cells">Spreadsheet Documents - Cells</a><br>
+service SheetCell {}
 };
 };
 };
@@ -1822,11 +1867,11 @@ interface XSheetAuditing {}
 module com {
 module sun {
 module star {
-module lang {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XUnoTunnel">WritingUNO - XUnoTunnel</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-interface XUnoTunnel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview">Spreadsheet Documents - Spreadsheet Services - Overview</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Ranges_and_Cells_Container">Spreadsheet Documents - Cell Ranges and Cells Container</a><br>
+service SheetCellRanges {}
 };
 };
 };
@@ -1838,8 +1883,10 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Creating_a_New_DataPilot_Table">Spreadsheets - Creating a New DataPilot Table</a><br>
-service DataPilotField {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview">Spreadsheet Documents - Spreadsheet Services - Overview</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Ranges">Spreadsheet Documents - Cell Ranges</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_and_Cell_Range_Access">Spreadsheet Documents - Cell and Cell Range Access</a><br>
+service SheetCellRange {}
 };
 };
 };
@@ -1849,10 +1896,10 @@ service DataPilotField {}
 module com {
 module sun {
 module star {
-module task {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Jobs/Implementation">WritingUNO - Jobs - Implementation</a><br>
-interface XJob {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview">Spreadsheet Documents - Spreadsheet Services - Overview</a><br>
+service Spreadsheet {}
 };
 };
 };
@@ -1862,10 +1909,10 @@ interface XJob {}
 module com {
 module sun {
 module star {
-module text {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Bookmarks">Text - Bookmarks</a><br>
-service Bookmark {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview">Spreadsheet Documents - Spreadsheet Services - Overview</a><br>
+service TableColumn {}
 };
 };
 };
@@ -1875,10 +1922,10 @@ service Bookmark {}
 module com {
 module sun {
 module star {
-module chart {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Stock_Charts">Charts - Stock Charts</a><br>
-service StockDiagram {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview">Spreadsheet Documents - Spreadsheet Services - Overview</a><br>
+service TableRow {}
 };
 };
 };
@@ -1888,10 +1935,10 @@ service StockDiagram {}
 module com {
 module sun {
 module star {
-module drawing {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Page_Formatting">Drawings - Page Formatting</a><br>
-service GenericDrawPage {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#DataPilot_Tables">Spreadsheet Documents - DataPilot Tables</a><br>
+service DataPilotTables {}
 };
 };
 };
@@ -1903,8 +1950,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Variable_Results">Spreadsheets - Variable Results</a><br>
-interface XVolatileResult {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Styles">Spreadsheet Documents - Overall Document Features - Styles - Cell Styles</a><br>
+service TableCellStyle {}
 };
 };
 };
@@ -1914,10 +1961,10 @@ interface XVolatileResult {}
 module com {
 module sun {
 module star {
-module text {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Fields">Text - Text Fields</a><br>
-service TextField {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Search_and_Replace">Text Documents - Navigating - Search and Replace</a><br>
+service SearchDescriptor {}
 };
 };
 };
@@ -1927,11 +1974,11 @@ service TextField {}
 module com {
 module sun {
 module star {
-module view {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Printing_Drawing_Documents#Printer_and_Print_Job_Settings">Drawings - Printing Drawing Documents - Printer and Print Job Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Printer_and_Print_Job_Settings">Spreadsheets - Printing Spreadsheet Documents - Printer and Print Job Settings</a><br>
-service PrintOptions {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Search_and_Replace">Text Documents - Navigating - Search and Replace</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Search_and_Replace">Spreadsheet Documents - Search and Replace</a><br>
+interface XReplaceable {}
 };
 };
 };
@@ -1941,10 +1988,10 @@ service PrintOptions {}
 module com {
 module sun {
 module star {
-module linguistic2 {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Linguistics">OfficeDev - Linguistics</a><br>
-service Hyphenator {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Search_and_Replace">Text Documents - Navigating - Search and Replace</a><br>
+interface XSearchable {}
 };
 };
 };
@@ -1954,16 +2001,10 @@ service Hyphenator {}
 module com {
 module sun {
 module star {
-module lang {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Service_Manager_and_Component_Context">ProUNO - Service Manager and Component Context</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact#Getting_Started">FirstSteps - First Contact - Getting Started</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager">ProUNO - Java - Getting a Service Manager</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections">ProUNO - C++ - Establishing Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections">ProUNO - UNO Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Transparent_Use_of_Office_UNO_Components">ProUNO - C++ - Transparent Use of Office UNO Components</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Transparent_Use_of_Office_UNO_Components">ProUNO - Java - Transparent Use of Office UNO Components</a><br>
-interface XMultiComponentFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#ResultSetMetaData">Database Access - ResultSetMetaData</a><br>
+interface XResultSetMetaData {}
 };
 };
 };
@@ -1973,10 +2014,10 @@ interface XMultiComponentFactory {}
 module com {
 module sun {
 module star {
-module ucb {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Accessing_a_UCB_Content">UCB - Accessing a UCB Content</a><br>
-interface XContentProvider {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Key_Service">Database Access - Key Service</a><br>
+constants KeyType {}
 };
 };
 };
@@ -1988,8 +2029,8 @@ module sun {
 module star {
 module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Settings#Creating_Default_Settings">Text - Settings - Creating Default Settings</a><br>
-service Defaults {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Auto_Text">Text Documents - Auto Text</a><br>
+service AutoTextGroup {}
 };
 };
 };
@@ -1999,10 +2040,10 @@ service Defaults {}
 module com {
 module sun {
 module star {
-module drawing {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Grouping%2C_Combining_and_Binding">Drawings - Grouping, Combining and Binding</a><br>
-service GroupShape {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Auto_Text">Text Documents - Auto Text</a><br>
+service AutoTextContainer {}
 };
 };
 };
@@ -2012,12 +2053,10 @@ service GroupShape {}
 module com {
 module sun {
 module star {
-module bridge {
-module oleautomation {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/The_Bridge_Services">ProUNO - Bridge - The Bridge Services</a><br>
-service BridgeSupplier {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Auto_Text">Text Documents - Auto Text</a><br>
+service AutoTextEntry {}
 };
 };
 };
@@ -2027,11 +2066,10 @@ service BridgeSupplier {}
 module com {
 module sun {
 module star {
-module table {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Working_With_Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Creating_and_Adding_a_Chart_to_a_Spreadsheet">Charts - Creating and Adding a Chart to a Spreadsheet</a><br>
-interface XTableChartsSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Sections">Text Documents - Text Sections</a><br>
+service TextSection {}
 };
 };
 };
@@ -2041,10 +2079,10 @@ interface XTableChartsSupplier {}
 module com {
 module sun {
 module star {
-module sheet {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Add-Ins">Spreadsheets - Spreadsheet Add-Ins</a><br>
-service AddIn {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+service FilterFactory {}
 };
 };
 };
@@ -2054,11 +2092,10 @@ service AddIn {}
 module com {
 module sun {
 module star {
-module presentation {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Presentation_Settings">Drawings - Presentation Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Working_with_Presentation_Documents">Drawings - Working with Presentation Documents</a><br>
-interface XPresentation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+service TypeDetection {}
 };
 };
 };
@@ -2068,11 +2105,10 @@ interface XPresentation {}
 module com {
 module sun {
 module star {
-module i18n {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XCollator">OfficeDev - Implementing a New Locale - XCollator</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XCollator">OfficeDev - Overview and Using the API - XCollator</a><br>
-interface XCollator {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+service SynchronousFrameLoader {}
 };
 };
 };
@@ -2082,10 +2118,11 @@ interface XCollator {}
 module com {
 module sun {
 module star {
-module style {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Overall_Document_Features#Styles">Text - Overall Document Features - Styles</a><br>
-service StyleFamilies {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XML_Filter_Detection">Office Development - XML Filter Detection</a><br>
+service ExtendedTypeDetection {}
 };
 };
 };
@@ -2095,10 +2132,10 @@ service StyleFamilies {}
 module com {
 module sun {
 module star {
-module util {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models#XModifiable">OfficeDev - Component - Models - XModifiable</a><br>
-interface XModifiable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+service ImportFilter {}
 };
 };
 };
@@ -2108,10 +2145,10 @@ interface XModifiable {}
 module com {
 module sun {
 module star {
-module sheet {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Area_Links">Spreadsheets - Cell Area Links</a><br>
-interface XAreaLink {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+service FrameLoader {}
 };
 };
 };
@@ -2121,10 +2158,10 @@ interface XAreaLink {}
 module com {
 module sun {
 module star {
-module awt {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Models_and_Views_for_Form_Controls">Forms - Models and Views for Form Controls</a><br>
-service UnoControl {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters">Office Development - Integrating Import and Export Filters</a><br>
+service ExportFilter {}
 };
 };
 };
@@ -2136,8 +2173,9 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/View_Panes">Spreadsheets - View Panes</a><br>
-service SpreadsheetViewPane {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Document">Spreadsheet Documents - Working With Spreadsheet Documents - Document Structure - Spreadsheet Document</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Documents">Spreadsheet Documents - Spreadsheet Documents</a><br>
+service SpreadsheetDocument {}
 };
 };
 };
@@ -2149,8 +2187,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Area_Links">Spreadsheets - Cell Area Links</a><br>
-interface XAreaLinks {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Document">Spreadsheet Documents - Working With Spreadsheet Documents - Document Structure - Spreadsheet Document</a><br>
+service Spreadsheets {}
 };
 };
 };
@@ -2160,10 +2198,10 @@ interface XAreaLinks {}
 module com {
 module sun {
 module star {
-module linguistic2 {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Linguistics">OfficeDev - Linguistics</a><br>
-service LinguProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Column_Service">Database Access - Column Service</a><br>
+service IndexColumn {}
 };
 };
 };
@@ -2173,10 +2211,10 @@ service LinguProperties {}
 module com {
 module sun {
 module star {
-module sdbc {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Driver_Service">Database - Driver Service</a><br>
-service Driver {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Column_Service">Database Access - Column Service</a><br>
+service Column {}
 };
 };
 };
@@ -2186,10 +2224,10 @@ service Driver {}
 module com {
 module sun {
 module star {
-module linguistic2 {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Linguistics">OfficeDev - Linguistics</a><br>
-service DictionaryList {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Column_Service">Database Access - Column Service</a><br>
+service KeyColumn {}
 };
 };
 };
@@ -2199,10 +2237,12 @@ service DictionaryList {}
 module com {
 module sun {
 module star {
-module sheet {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Sorting#Table_Sort_Descriptor">Spreadsheets - Sorting - Table Sort Descriptor</a><br>
-service SheetSortDescriptor2 {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Window_Interfaces">Office Development - Component - Window Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linking_Components_and_Windows">Office Development - Frames - Linking Components and Windows</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Windows">Office Development - Windows</a><br>
+interface XWindow {}
 };
 };
 };
@@ -2212,13 +2252,12 @@ service SheetSortDescriptor2 {}
 module com {
 module sun {
 module star {
-module lang {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager">ProUNO - Java - Getting a Service Manager</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections">ProUNO - C++ - Establishing Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact#Failed_Connections">FirstSteps - First Contact - Getting Started - Failed Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections">ProUNO - UNO Interprocess Connections</a><br>
-exception DisposedException {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Window_Interfaces">Office Development - Component - Window Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linking_Components_and_Windows">Office Development - Frames - Linking Components and Windows</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Windows">Office Development - Windows</a><br>
+interface XTopWindow {}
 };
 };
 };
@@ -2228,10 +2267,10 @@ exception DisposedException {}
 module com {
 module sun {
 module star {
-module table {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview">Spreadsheets - Spreadsheet Services - Overview</a><br>
-service TableColumn {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#General_Drawing_Properties">Drawings and Presentations - General Drawing Properties</a><br>
+service TextProperties {}
 };
 };
 };
@@ -2241,12 +2280,10 @@ service TableColumn {}
 module com {
 module sun {
 module star {
-module datatransfer {
-module clipboard {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Common_Application_Features#Clipboard">OfficeDev - Common Application Features - Clipboard</a><br>
-service SystemClipboard {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#General_Drawing_Properties">Drawings and Presentations - General Drawing Properties</a><br>
+service FillProperties {}
 };
 };
 };
@@ -2256,14 +2293,10 @@ service SystemClipboard {}
 module com {
 module sun {
 module star {
-module uno {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Exception_Handling_in_C++">ProUNO - C++ - Exception Handling in C++</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Exception_Handling">ProUNO - Basic - Exception Handling</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Mapping_of_Exception_Types">ProUNO - Java - Mapping of Exception Types</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Exceptions_and_Errorcodes">ProUNO - Bridge - Exceptions and Errorcodes</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Exception_Handling">ProUNO - Exception Handling</a><br>
-exception Exception {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#General_Drawing_Properties">Drawings and Presentations - General Drawing Properties</a><br>
+service LineProperties {}
 };
 };
 };
@@ -2273,11 +2306,10 @@ exception Exception {}
 module com {
 module sun {
 module star {
-module lang {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XInitialization">WritingUNO - XInitialization</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-interface XInitialization {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Source_Object">Spreadsheet Documents - Source Object</a><br>
+service DataPilotSource {}
 };
 };
 };
@@ -2287,10 +2319,10 @@ interface XInitialization {}
 module com {
 module sun {
 module star {
-module sheet {
-/// @enum ConditionOperator
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Conditional_Formats">Spreadsheets - Conditional Formats</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XEventsSupplier">Office Development - Component - Models - XEventsSupplier</a><br>
+interface XEventsSupplier {}
 };
 };
 };
@@ -2300,10 +2332,10 @@ module sheet {
 module com {
 module sun {
 module star {
-module text {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Footnotes_and_Endnotes">Text - Footnotes and Endnotes</a><br>
-service Footnote {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Events_and_Other_Notifications">Database Access - Events and Other Notifications</a><br>
+interface XRowSetListener {}
 };
 };
 };
@@ -2313,10 +2345,10 @@ service Footnote {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Label_Ranges">Spreadsheets - Label Ranges</a><br>
-service LabelRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Events_and_Other_Notifications">Database Access - Events and Other Notifications</a><br>
+interface XRowSetApproveListener {}
 };
 };
 };
@@ -2326,13 +2358,11 @@ service LabelRanges {}
 module com {
 module sun {
 module star {
-module frame {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Storing">Drawings - Storing</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Storing_Documents">OfficeDev - Storing Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Saving_Spreadsheet_Documents#Storing">Spreadsheets - Saving Spreadsheet Documents - Storing</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Saving_Text_Documents#Storing">Text - Saving Text Documents - Storing</a><br>
-interface XStorable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Form_Control_Models">Forms - Form Control Models</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models">Forms - Control Models</a><br>
+service FormControlModel {}
 };
 };
 };
@@ -2344,9 +2374,9 @@ module sun {
 module star {
 module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Universal_Content_Broker#Capabilities">UCB - Universal Content Broker - Capabilities</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Instantiating_the_UCB">UCB - Instantiating the UCB</a><br>
-service UniversalContentBroker {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Content_Provider_Proxies">Universal Content Broker - Content Provider Proxies</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Unconfigured_UCBs">Universal Content Broker - Unconfigured UCBs</a><br>
+interface XContentProviderManager {}
 };
 };
 };
@@ -2356,10 +2386,14 @@ service UniversalContentBroker {}
 module com {
 module sun {
 module star {
-module chart {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Setting_the_Chart_Type">Charts - Setting the Chart Type</a><br>
-service Diagram {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XModel">Office Development - Component - Models - XModel</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Getting_Frames%2C_Controllers_and_Models_from_Each_Other">Office Development - Component - Getting Frames, Controllers and Models from Each Other</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Document_Controller">Text Documents - Text Document Controller</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Models">Office Development - Component - Models</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Frame-Controller-Model_Paradigm_in_LibreOffice">Office Development - Frame-Controller-Model Paradigm in LibreOffice</a><br>
+interface XModel {}
 };
 };
 };
@@ -2369,10 +2403,10 @@ service Diagram {}
 module com {
 module sun {
 module star {
-module util {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Closing_Documents">OfficeDev - Closing Documents</a><br>
-interface XCloseable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Page_Formatting">Drawings and Presentations - Page Formatting</a><br>
+service GenericDrawPage {}
 };
 };
 };
@@ -2382,12 +2416,10 @@ interface XCloseable {}
 module com {
 module sun {
 module star {
-module lang {
+module presentation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XServiceInfo">WritingUNO - XServiceInfo</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Service_Names">Spreadsheets - Service Names</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-interface XServiceInfo {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Custom_Slide_Show">Drawings and Presentations - Custom Slide Show</a><br>
+service CustomPresentationAccess {}
 };
 };
 };
@@ -2397,10 +2429,10 @@ interface XServiceInfo {}
 module com {
 module sun {
 module star {
-module sheet {
+module presentation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Table_Auto_Formats">Spreadsheets - Table Auto Formats</a><br>
-service TableAutoFormat {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Custom_Slide_Show">Drawings and Presentations - Custom Slide Show</a><br>
+interface XCustomPresentationSupplier {}
 };
 };
 };
@@ -2410,10 +2442,10 @@ service TableAutoFormat {}
 module com {
 module sun {
 module star {
-module sheet {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview">Spreadsheets - Spreadsheet Services - Overview</a><br>
-service Spreadsheet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Stock_Charts">Charts - Stock Charts</a><br>
+service StockDiagram {}
 };
 };
 };
@@ -2423,10 +2455,10 @@ service Spreadsheet {}
 module com {
 module sun {
 module star {
-module drawing {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Creating_a_Chart_OLE_Object_in_Draw_and_Impress">Charts - Creating a Chart OLE Object in Draw and Impress</a><br>
-interface XDrawPagesSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Control_Characters">Text Documents - Editing Text - Control Characters</a><br>
+constants ControlCharacter {}
 };
 };
 };
@@ -2436,10 +2468,11 @@ interface XDrawPagesSupplier {}
 module com {
 module sun {
 module star {
-module container {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Navigating">Drawings - Navigating</a><br>
-interface XNamed {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linking_Components_and_Windows">Office Development - Frames - Linking Components and Windows</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Desktop">Office Development - Using the Desktop</a><br>
+interface XFrames {}
 };
 };
 };
@@ -2450,9 +2483,9 @@ module com {
 module sun {
 module star {
 module sheet {
+/// @enum DataPilotFieldOrientation
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Sheet_Outline">Spreadsheets - Sheet Outline</a><br>
-interface XSheetOutline {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Creating_a_New_DataPilot_Table">Spreadsheet Documents - Creating a New DataPilot Table</a><br>
 };
 };
 };
@@ -2464,8 +2497,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/View_Settings">Spreadsheets - View Settings</a><br>
-service SpreadsheetViewSettings {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Creating_a_New_DataPilot_Table">Spreadsheet Documents - Creating a New DataPilot Table</a><br>
+service DataPilotDescriptor {}
 };
 };
 };
@@ -2475,10 +2508,10 @@ service SpreadsheetViewSettings {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Auto_Text">Text - Auto Text</a><br>
-service AutoTextContainer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Creating_a_New_DataPilot_Table">Spreadsheet Documents - Creating a New DataPilot Table</a><br>
+service DataPilotField {}
 };
 };
 };
@@ -2488,10 +2521,10 @@ service AutoTextContainer {}
 module com {
 module sun {
 module star {
-module ui {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus">WritingUNO - Intercepting Context Menus</a><br>
-interface XContextMenuInterception {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Range_Selection">Spreadsheet Documents - Range Selection</a><br>
+interface XRangeSelectionChangeListener {}
 };
 };
 };
@@ -2501,10 +2534,10 @@ interface XContextMenuInterception {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/TextViewCursor">Text - TextViewCursor</a><br>
-service TextViewCursor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Range_Selection">Spreadsheet Documents - Range Selection</a><br>
+interface XRangeSelection {}
 };
 };
 };
@@ -2514,12 +2547,10 @@ service TextViewCursor {}
 module com {
 module sun {
 module star {
-module bridge {
-module oleautomation {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/The_Bridge_Services">ProUNO - Bridge - The Bridge Services</a><br>
-service ApplicationRegistration {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Range_Selection">Spreadsheet Documents - Range Selection</a><br>
+service RangeSelectionArguments {}
 };
 };
 };
@@ -2529,10 +2560,10 @@ service ApplicationRegistration {}
 module com {
 module sun {
 module star {
-module i18n {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XExtendedIndexEntrySupplier">OfficeDev - Overview and Using the API - XExtendedIndexEntrySupplier</a><br>
-interface XInputSequenceChecker {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Page_Layout">Text Documents - Page Layout</a><br>
+service PageProperties {}
 };
 };
 };
@@ -2542,10 +2573,10 @@ interface XInputSequenceChecker {}
 module com {
 module sun {
 module star {
-module sheet {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Function_Handling#Information_about_Functions">Spreadsheets - Function Handling - Information about Functions</a><br>
-service FunctionDescription {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Columns">Text Documents - Columns</a><br>
+service TextColumns {}
 };
 };
 };
@@ -2555,10 +2586,10 @@ service FunctionDescription {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Overall_Document_Features#Page_Styles">Spreadsheets - Overall Document Features - Styles - Page Styles</a><br>
-service TablePageStyle {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#The_DataSource_Service">Database Access - The DataSource Service</a><br>
+service DataSource {}
 };
 };
 };
@@ -2568,10 +2599,12 @@ service TablePageStyle {}
 module com {
 module sun {
 module star {
-module sheet {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Database_Import">Spreadsheets - Database Import</a><br>
-service DatabaseImportDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XServiceInfo">Writing UNO Components - XServiceInfo</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Service_Names">Spreadsheet Documents - Service Names</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+interface XServiceInfo {}
 };
 };
 };
@@ -2581,10 +2614,10 @@ service DatabaseImportDescriptor {}
 module com {
 module sun {
 module star {
-module presentation {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Animations_and_Interactions">Drawings - Animations and Interactions</a><br>
-service Shape {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Stored_Procedures">Database Access - Stored Procedures</a><br>
+interface XOutParameters {}
 };
 };
 };
@@ -2594,10 +2627,10 @@ service Shape {}
 module com {
 module sun {
 module star {
-module drawing {
+module task {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Layer_Handling">Drawings - Layer Handling</a><br>
-interface XLayerManager {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XStatusIndicatorFactory">Office Development - Component - Frames - XStatusIndicatorFactory</a><br>
+interface XStatusIndicatorFactory {}
 };
 };
 };
@@ -2607,11 +2640,12 @@ interface XLayerManager {}
 module com {
 module sun {
 module star {
-module i18n {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XLocaleData">OfficeDev - Overview and Using the API - XLocaleData</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XLocaleData">OfficeDev - Implementing a New Locale - XLocaleData</a><br>
-interface XLocaleData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Event_Model">Professional UNO - Event Model</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Automation_Objects_with_UNO_Interfaces">Professional UNO - Bridge - Automation Objects with UNO Interfaces</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Listeners">Professional UNO - Basic - Listeners</a><br>
+interface XEventListener {}
 };
 };
 };
@@ -2621,11 +2655,11 @@ interface XLocaleData {}
 module com {
 module sun {
 module star {
-module frame {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Creating_Frames_Manually#Frame_Creation">OfficeDev - Creating Frames Manually - Frame Creation</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frames#Linking_Components_and_Windows">OfficeDev - Frames - Linking Components and Windows</a><br>
-service Frame {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Iterating_over_Text">Text Documents - Iterating over Text</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#XContentEnumerationAccess_Interface">Professional UNO - Service Manager - XContentEnumerationAccess Interface</a><br>
+interface XContentEnumerationAccess {}
 };
 };
 };
@@ -2635,10 +2669,11 @@ service Frame {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Creating_a_User">Database - Creating a User</a><br>
-service UserDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Iterating_over_Text">Text Documents - Iterating over Text</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Collections_and_Containers">Professional UNO - Collections and Containers</a><br>
+interface XEnumerationAccess {}
 };
 };
 };
@@ -2648,10 +2683,11 @@ service UserDescriptor {}
 module com {
 module sun {
 module star {
-module sdbc {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Stored_Procedures">Database - Stored Procedures</a><br>
-interface XOutParameters {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Iterating_over_Text">Text Documents - Iterating over Text</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service Paragraph {}
 };
 };
 };
@@ -2663,9 +2699,9 @@ module sun {
 module star {
 module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Navigating#Cursors">Text - Navigating - Cursors</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service TextCursor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Iterating_over_Text">Text Documents - Iterating over Text</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service TextPortion {}
 };
 };
 };
@@ -2675,10 +2711,10 @@ service TextCursor {}
 module com {
 module sun {
 module star {
-module task {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Jobs/Implementation">WritingUNO - Jobs - Implementation</a><br>
-service AsyncJob {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Database_Operations">Spreadsheet Documents - Database Operations</a><br>
+service DatabaseRange {}
 };
 };
 };
@@ -2688,12 +2724,10 @@ service AsyncJob {}
 module com {
 module sun {
 module star {
-module lang {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/The_UNO_Executable">WritingUNO - The UNO Executable</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XMain">WritingUNO - XMain</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-interface XMain {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Database_Operations">Spreadsheet Documents - Database Operations</a><br>
+service DatabaseRanges {}
 };
 };
 };
@@ -2703,10 +2737,10 @@ interface XMain {}
 module com {
 module sun {
 module star {
-module sheet {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Querying_for_Cells_with_Specific_Properties">Spreadsheets - Querying for Cells with Specific Properties</a><br>
-interface XCellRangesQuery {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Closing_Documents">Office Development - Closing Documents</a><br>
+interface XCloseListener {}
 };
 };
 };
@@ -2716,10 +2750,10 @@ interface XCellRangesQuery {}
 module com {
 module sun {
 module star {
-module ucb {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-interface XCommandProcessor2 {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Closing_Documents">Office Development - Closing Documents</a><br>
+interface XCloseable {}
 };
 };
 };
@@ -2729,10 +2763,10 @@ interface XCommandProcessor2 {}
 module com {
 module sun {
 module star {
-module sheet {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Sheet_Links">Spreadsheets - Sheet Links</a><br>
-interface XSheetLinkable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Committing_Controls">Forms - Committing Controls</a><br>
+interface XBoundComponent {}
 };
 };
 };
@@ -2742,10 +2776,10 @@ interface XSheetLinkable {}
 module com {
 module sun {
 module star {
-module text {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Fields">Text - Text Fields</a><br>
-module fieldmaster {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Creating_Statements">Database Access - Creating Statements</a><br>
+service Statement {}
 };
 };
 };
@@ -2755,10 +2789,10 @@ module fieldmaster {}
 module com {
 module sun {
 module star {
-module table {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Column_and_Row_Access">Spreadsheets - Column and Row Access</a><br>
-interface XColumnRowRange {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Understanding_Connections">Database Access - Connections - Understanding Connections</a><br>
+service Connection {}
 };
 };
 };
@@ -2768,11 +2802,10 @@ interface XColumnRowRange {}
 module com {
 module sun {
 module star {
-module ucb {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Executing_Content_Commands">UCB - Executing Content Commands</a><br>
-interface XCommandProcessor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Page_Breaks">Spreadsheet Documents - Spreadsheet - Page Breaks</a><br>
+struct TablePageBreakData {}
 };
 };
 };
@@ -2782,11 +2815,10 @@ interface XCommandProcessor {}
 module com {
 module sun {
 module star {
-module document {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models#XDocumentPropertiesSupplier">OfficeDev - Component - Models - XDocumentPropertiesSupplier</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Settings#General_Document_Information">Text - Settings - General Document Information</a><br>
-interface XDocumentPropertiesSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Page_Breaks">Spreadsheet Documents - Spreadsheet - Page Breaks</a><br>
+interface XSheetPageBreak {}
 };
 };
 };
@@ -2796,13 +2828,10 @@ interface XDocumentPropertiesSupplier {}
 module com {
 module sun {
 module star {
-module xml {
-module sax {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component">OfficeDev - Writing the Filtering Component</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component#XDocumentHandler">OfficeDev - Writing the Filtering Component - XDocumentHandler</a><br>
-interface XDocumentHandler {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Index_marks">Text Documents - Indexes and Index Marks - Index marks</a><br>
+interface XDocumentIndexMark {}
 };
 };
 };
@@ -2812,10 +2841,10 @@ interface XDocumentHandler {}
 module com {
 module sun {
 module star {
-module lang {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Service_Manager_and_Component_Context">ProUNO - Service Manager and Component Context</a><br>
-interface XMultiServiceFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Index_marks">Text Documents - Indexes and Index Marks - Index marks</a><br>
+service BaseIndexMark {}
 };
 };
 };
@@ -2825,10 +2854,10 @@ interface XMultiServiceFactory {}
 module com {
 module sun {
 module star {
-module style {
+module i18n {
+/// @enum TransliterationModulesNew
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Overall_Document_Features#Styles">Text - Overall Document Features - Styles</a><br>
-service Style {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XTransliteration">Office Development - Implementing a New Locale - XTransliteration</a><br>
 };
 };
 };
@@ -2838,10 +2867,10 @@ service Style {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module i18n {
+/// @enum TransliterationModules
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Key_Service">Database - Key Service</a><br>
-constants KeyType {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XTransliteration">Office Development - Implementing a New Locale - XTransliteration</a><br>
 };
 };
 };
@@ -2851,10 +2880,10 @@ constants KeyType {}
 module com {
 module sun {
 module star {
-module sheet {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Range_Selection">Spreadsheets - Range Selection</a><br>
-service RangeSelectionArguments {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Rotating_and_Shearing">Drawings and Presentations - Rotating and Shearing</a><br>
+service RotationDescriptor {}
 };
 };
 };
@@ -2864,11 +2893,10 @@ service RangeSelectionArguments {}
 module com {
 module sun {
 module star {
-module lang {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events">OfficeDev - Document Events</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Events_and_Other_Notifications">Database - Events and Other Notifications</a><br>
-struct EventObject {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Adding_a_Group">Database Access - Adding a Group</a><br>
+service GroupDescriptor {}
 };
 };
 };
@@ -2878,10 +2906,11 @@ struct EventObject {}
 module com {
 module sun {
 module star {
-module awt {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Java_Window_Integration">OfficeDev - Java Window Integration</a><br>
-service Toolkit {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#XDatabaseMetaData_Interface">Database Access - XDatabaseMetaData Interface</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Retrieving_Information_about_a_Database">Database Access - Database Design - Retrieving Information about a Database</a><br>
+interface XDatabaseMetaData {}
 };
 };
 };
@@ -2891,10 +2920,10 @@ service Toolkit {}
 module com {
 module sun {
 module star {
-module reflection {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-service CoreReflection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Strings">Text Documents - Editing Text - Strings</a><br>
+interface XSimpleText {}
 };
 };
 };
@@ -2904,10 +2933,10 @@ service CoreReflection {}
 module com {
 module sun {
 module star {
-module text {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Inserting_a_Paragraph_where_no_Cursor_can_go">Text - Inserting a Paragraph where no Cursor can go</a><br>
-interface XRelativeTextContentInsert {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XModifiable">Office Development - Component - Models - XModifiable</a><br>
+interface XModifiable {}
 };
 };
 };
@@ -2917,10 +2946,10 @@ interface XRelativeTextContentInsert {}
 module com {
 module sun {
 module star {
-module document {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/XML_Based_Filter_Development#Introduction">OfficeDev - XML Based Filter Development - Introduction</a><br>
-interface XFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Bezier_Shapes">Drawings and Presentations - Bezier Shapes</a><br>
+service PolyPolygonBezierDescriptor {}
 };
 };
 };
@@ -2930,10 +2959,10 @@ interface XFilter {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Column_Service">Database - Column Service</a><br>
-service Column {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XExtendedIndexEntrySupplier">Office Development - Overview and Using the API - XExtendedIndexEntrySupplier</a><br>
+interface XInputSequenceChecker {}
 };
 };
 };
@@ -2943,10 +2972,10 @@ service Column {}
 module com {
 module sun {
 module star {
-module drawing {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Working_With_Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
-service OLE2Shape {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XExtendedIndexEntrySupplier">Office Development - Overview and Using the API - XExtendedIndexEntrySupplier</a><br>
+interface XExtendedIndexEntrySupplier {}
 };
 };
 };
@@ -2956,10 +2985,12 @@ service OLE2Shape {}
 module com {
 module sun {
 module star {
-module sheet {
+module bridge {
+module oleautomation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cells_Absolute_Address">Spreadsheets - Cells Absolute Address</a><br>
-interface XCellAddressable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#The_Bridge_Services">Professional UNO - Bridge - The Bridge Services</a><br>
+service Factory {}
+};
 };
 };
 };
@@ -2969,11 +3000,12 @@ interface XCellAddressable {}
 module com {
 module sun {
 module star {
-module i18n {
+module bridge {
+module oleautomation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XTextConversion">OfficeDev - Implementing a New Locale - XTextConversion</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XTextConversion">OfficeDev - Overview and Using the API - XTextConversion</a><br>
-interface XTextConversion {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#The_Bridge_Services">Professional UNO - Bridge - The Bridge Services</a><br>
+service BridgeSupplier {}
+};
 };
 };
 };
@@ -2983,10 +3015,12 @@ interface XTextConversion {}
 module com {
 module sun {
 module star {
-module document {
+module bridge {
+module oleautomation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Link_Targets">Text - Link Targets</a><br>
-interface XLinkTargetSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#The_Bridge_Services">Professional UNO - Bridge - The Bridge Services</a><br>
+service ApplicationRegistration {}
+};
 };
 };
 };
@@ -2996,11 +3030,11 @@ interface XLinkTargetSupplier {}
 module com {
 module sun {
 module star {
-module chart {
+module configuration {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Data_Access">Charts - Data Access</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Working_With_Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
-service ChartDataArray {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Configuration_Management#Reading_Configuration_Data">Configuration Management - Reading Configuration Data</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Configuration_Management#Object_Model">Configuration Management - Object Model</a><br>
+service ConfigurationAccess {}
 };
 };
 };
@@ -3012,8 +3046,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Cursor#Used_Area">Spreadsheets - Cell Cursor - Used Area</a><br>
-interface XUsedAreaCursor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Dimensions">Spreadsheet Documents - Dimensions</a><br>
+service DataPilotSourceDimensions {}
 };
 };
 };
@@ -3023,12 +3057,10 @@ interface XUsedAreaCursor {}
 module com {
 module sun {
 module star {
-module configuration {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Disable_Commands#Disabling_Commands_at_Runtime">WritingUNO - Disable Commands - Disabling Commands at Runtime</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Config/Object_Model">Config - Object Model</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Config/Updating_Configuration_Data">Config - Updating Configuration Data</a><br>
-service ConfigurationUpdateAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Fields">Text Documents - Text Fields</a><br>
+module fieldmaster {}
 };
 };
 };
@@ -3038,13 +3070,10 @@ service ConfigurationUpdateAccess {}
 module com {
 module sun {
 module star {
-module uno {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Lifetime_of_UNO_objects">ProUNO - Lifetime of UNO objects</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XWeak">WritingUNO - XWeak</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Using_Weak_References">ProUNO - C++ - Using Weak References</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-interface XWeak {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Fields">Text Documents - Text Fields</a><br>
+service TextField {}
 };
 };
 };
@@ -3054,10 +3083,10 @@ interface XWeak {}
 module com {
 module sun {
 module star {
-module sheet {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Multiple_Operations">Spreadsheets - Multiple Operations</a><br>
-interface XMultipleOperation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Fields">Text Documents - Text Fields</a><br>
+interface XTextField {}
 };
 };
 };
@@ -3067,10 +3096,10 @@ interface XMultipleOperation {}
 module com {
 module sun {
 module star {
-module presentation {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Custom_Slide_Show">Drawings - Custom Slide Show</a><br>
-interface XCustomPresentationSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Contents_Other_Than_Strings">Text Documents - Editing Text - Text Contents Other Than Strings</a><br>
+service TextContent {}
 };
 };
 };
@@ -3080,10 +3109,11 @@ interface XCustomPresentationSupplier {}
 module com {
 module sun {
 module star {
-module presentation {
-/// @enum FadeEffect
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Slide_Transition">Drawings - Slide Transition</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Text_Contents_Other_Than_Strings">Text Documents - Editing Text - Text Contents Other Than Strings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Editing_Text">Text Documents - Editing Text</a><br>
+interface XText {}
 };
 };
 };
@@ -3093,11 +3123,11 @@ module presentation {
 module com {
 module sun {
 module star {
-module util {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Navigating#Search_and_Replace">Text - Navigating - Search and Replace</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Search_and_Replace">Spreadsheets - Search and Replace</a><br>
-interface XReplaceable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XInitialization">Writing UNO Components - XInitialization</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+interface XInitialization {}
 };
 };
 };
@@ -3107,10 +3137,12 @@ interface XReplaceable {}
 module com {
 module sun {
 module star {
-module xml {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component">OfficeDev - Writing the Filtering Component</a><br>
-service ExportFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Forms_as_Row_Sets">Forms - Forms as Row Sets</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#The_RowSet_Service">Database Access - The RowSet Service</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Example:_Querying_the_Bibliography_Database">Database Access - Example: Querying the Bibliography Database</a><br>
+service RowSet {}
 };
 };
 };
@@ -3120,10 +3152,12 @@ service ExportFilter {}
 module com {
 module sun {
 module star {
-module sdb {
+module view {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Adding_and_Editing_Predefined_Queries">Database - Adding and Editing Predefined Queries</a><br>
-service DefinitionContainer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XSelectionSupplier">Office Development - Component - Controllers - XSelectionSupplier</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Setting_the_Current_Page">Drawings and Presentations - Setting the Current Page</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#TextView">Text Documents - TextView</a><br>
+interface XSelectionSupplier {}
 };
 };
 };
@@ -3133,10 +3167,10 @@ service DefinitionContainer {}
 module com {
 module sun {
 module star {
-module util {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Handling_Documents#URL_Parameter">OfficeDev - Handling Documents - Loading Documents - URL Parameter</a><br>
-service URLTransformer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Database_Import">Spreadsheet Documents - Database Import</a><br>
+service DatabaseImportDescriptor {}
 };
 };
 };
@@ -3148,8 +3182,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Function_Handling#Calculating_Function_Results">Spreadsheets - Function Handling - Calculating Function Results</a><br>
-service FunctionAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Variable_Results">Spreadsheet Documents - Variable Results</a><br>
+interface XVolatileResult {}
 };
 };
 };
@@ -3159,10 +3193,10 @@ service FunctionAccess {}
 module com {
 module sun {
 module star {
-module linguistic2 {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Linguistics">OfficeDev - Linguistics</a><br>
-service SpellChecker {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#The_SQLQueryComposer">Database Access - The SQLQueryComposer</a><br>
+service SQLQueryComposer {}
 };
 };
 };
@@ -3172,11 +3206,10 @@ service SpellChecker {}
 module com {
 module sun {
 module star {
-module frame {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Implementation">WritingUNO - Implementation</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Dispatch_Framework">OfficeDev - Dispatch Framework</a><br>
-interface XDispatchProvider {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Absolute_Address">Spreadsheet Documents - Absolute Address</a><br>
+interface XCellRangeAddressable {}
 };
 };
 };
@@ -3186,10 +3219,11 @@ interface XDispatchProvider {}
 module com {
 module sun {
 module star {
-module drawing {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Shape_Types">Drawings - Shape Types</a><br>
-service Shape {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XNativeNumberSupplier">Office Development - Overview and Using the API - XNativeNumberSupplier</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XNativeNumberSupplier">Office Development - Implementing a New Locale - XNativeNumberSupplier</a><br>
+interface XNativeNumberSupplier {}
 };
 };
 };
@@ -3199,10 +3233,10 @@ service Shape {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Conditional_Formats">Spreadsheets - Conditional Formats</a><br>
-interface XSheetConditionalEntries {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Connecting_Through_a_DataSource">Database Access - Connecting Through a DataSource</a><br>
+interface XDataSource {}
 };
 };
 };
@@ -3212,10 +3246,10 @@ interface XSheetConditionalEntries {}
 module com {
 module sun {
 module star {
-module presentation {
+module connection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Custom_Slide_Show">Drawings - Custom Slide Show</a><br>
-service CustomPresentationAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Opening_a_Connection">Professional UNO - Opening a Connection</a><br>
+service Acceptor {}
 };
 };
 };
@@ -3225,10 +3259,10 @@ service CustomPresentationAccess {}
 module com {
 module sun {
 module star {
-module sheet {
+module bridge {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Settings">Spreadsheets - Settings</a><br>
-service GlobalSheetSettings {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Opening_a_Connection">Professional UNO - Opening a Connection</a><br>
+interface XBridgeFactory {}
 };
 };
 };
@@ -3238,10 +3272,10 @@ service GlobalSheetSettings {}
 module com {
 module sun {
 module star {
-module util {
+module connection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-service NumberFormatter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Opening_a_Connection">Professional UNO - Opening a Connection</a><br>
+service Connector {}
 };
 };
 };
@@ -3251,10 +3285,10 @@ service NumberFormatter {}
 module com {
 module sun {
 module star {
-module frame {
+module connection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-service FrameLoader {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Opening_a_Connection">Professional UNO - Opening a Connection</a><br>
+interface XConnector {}
 };
 };
 };
@@ -3264,10 +3298,10 @@ service FrameLoader {}
 module com {
 module sun {
 module star {
-module presentation {
-/// @enum AnimationEffect
+module bridge {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Animations_and_Interactions">Drawings - Animations and Interactions</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Opening_a_Connection">Professional UNO - Opening a Connection</a><br>
+service BridgeFactory {}
 };
 };
 };
@@ -3277,10 +3311,10 @@ module presentation {
 module com {
 module sun {
 module star {
-module form {
+module connection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/FormComponents_Service">Forms - FormComponents Service</a><br>
-service FormComponents {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Opening_a_Connection">Professional UNO - Opening a Connection</a><br>
+interface XAcceptor {}
 };
 };
 };
@@ -3290,12 +3324,10 @@ service FormComponents {}
 module com {
 module sun {
 module star {
-module form {
-module binding {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Value_Bindings">Forms - Value Bindings</a><br>
-interface XValueBinding {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Connection_Service">Database Access - Connection Service</a><br>
+service Connection {}
 };
 };
 };
@@ -3305,10 +3337,10 @@ interface XValueBinding {}
 module com {
 module sun {
 module star {
-module i18n {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XTransliteration">OfficeDev - Overview and Using the API - XTransliteration</a><br>
-interface XTransliteration {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Bookmarks">Text Documents - Bookmarks</a><br>
+service Bookmark {}
 };
 };
 };
@@ -3318,10 +3350,10 @@ interface XTransliteration {}
 module com {
 module sun {
 module star {
-module sheet {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Cursor">Spreadsheets - Cell Cursor</a><br>
-interface XSheetCellCursor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XExtendedCalendar">Office Development - Overview and Using the API - XExtendedCalendar</a><br>
+interface XExtendedCalendar {}
 };
 };
 };
@@ -3331,10 +3363,10 @@ interface XSheetCellCursor {}
 module com {
 module sun {
 module star {
-module drawing {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Grouping%2C_Combining_and_Binding">Drawings - Grouping, Combining and Binding</a><br>
-interface XShapeCombiner {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Columns_and_Rows">Spreadsheet Documents - Columns and Rows</a><br>
+service TableColumns {}
 };
 };
 };
@@ -3346,8 +3378,8 @@ module sun {
 module star {
 module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview">Spreadsheets - Spreadsheet Services - Overview</a><br>
-service TableRow {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Columns_and_Rows">Spreadsheet Documents - Columns and Rows</a><br>
+service TableRows {}
 };
 };
 };
@@ -3357,11 +3389,10 @@ service TableRow {}
 module com {
 module sun {
 module star {
-module ucb {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Content_Provider_Proxies">UCB - Content Provider Proxies</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Unconfigured_UCBs">UCB - Unconfigured UCBs</a><br>
-interface XContentProviderManager {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#User_Service">Database Access - User Service</a><br>
+interface XUser {}
 };
 };
 };
@@ -3371,10 +3402,10 @@ interface XContentProviderManager {}
 module com {
 module sun {
 module star {
-module form {
+module script {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Loadable_Forms">Forms - Loadable Forms</a><br>
-interface XLoadListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exceptions_and_Errorcodes">Professional UNO - Bridge - Exceptions and Errorcodes</a><br>
+exception CannotConvertException {}
 };
 };
 };
@@ -3384,10 +3415,10 @@ interface XLoadListener {}
 module com {
 module sun {
 module star {
-module ucb {
+module reflection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Accessing_a_UCB_Content">UCB - Accessing a UCB Content</a><br>
-interface XContentIdentifierFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Exceptions_and_Errorcodes">Professional UNO - Bridge - Exceptions and Errorcodes</a><br>
+exception InvocationTargetException {}
 };
 };
 };
@@ -3397,11 +3428,12 @@ interface XContentIdentifierFactory {}
 module com {
 module sun {
 module star {
-module document {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/XML_Filter_Detection">OfficeDev - XML Filter Detection</a><br>
-service ExtendedTypeDetection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Desktop_Environment">Office Development - Desktop Environment</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Desktop">Office Development - Using the Desktop</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Capabilities">Universal Content Broker - Universal Content Broker - Capabilities</a><br>
+service Desktop {}
 };
 };
 };
@@ -3411,11 +3443,12 @@ service ExtendedTypeDetection {}
 module com {
 module sun {
 module star {
-module sheet {
+module form {
+module validation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview">Spreadsheets - Spreadsheet Services - Overview</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Ranges_and_Cells_Container">Spreadsheets - Cell Ranges and Cells Container</a><br>
-service SheetCellRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Validation">Forms - Validation</a><br>
+interface XValidatable {}
+};
 };
 };
 };
@@ -3425,10 +3458,10 @@ service SheetCellRanges {}
 module com {
 module sun {
 module star {
-module style {
+module sheet {
+/// @enum ConditionOperator
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Overall_Document_Features#Styles">Text - Overall Document Features - Styles</a><br>
-service StyleFamily {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Conditional_Formats">Spreadsheet Documents - Conditional Formats</a><br>
 };
 };
 };
@@ -3438,12 +3471,10 @@ service StyleFamily {}
 module com {
 module sun {
 module star {
-module configuration {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Disable_Commands#Disabling_Commands_at_Runtime">WritingUNO - Disable Commands - Disabling Commands at Runtime</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Config/Connecting_to_a_Data_Source">Config - Connecting to a Data Source</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Config/Object_Model">Config - Object Model</a><br>
-service ConfigurationProvider {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Conditional_Formats">Spreadsheet Documents - Conditional Formats</a><br>
+interface XSheetConditionalEntries {}
 };
 };
 };
@@ -3453,10 +3484,10 @@ service ConfigurationProvider {}
 module com {
 module sun {
 module star {
-module document {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-service FilterFactory {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Conditional_Formats">Spreadsheet Documents - Conditional Formats</a><br>
+service TableConditionalFormat {}
 };
 };
 };
@@ -3466,11 +3497,10 @@ service FilterFactory {}
 module com {
 module sun {
 module star {
-module form {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Form_Control_Models">Forms - Form Control Models</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models">Forms - Control Models</a><br>
-service FormControlModel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Creating">Universal Content Broker - Creating</a><br>
+struct ContentInfo {}
 };
 };
 };
@@ -3480,10 +3510,10 @@ service FormControlModel {}
 module com {
 module sun {
 module star {
-module document {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models#XEventsSupplier">OfficeDev - Component - Models - XEventsSupplier</a><br>
-interface XEventsSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Sheet_Outline">Spreadsheet Documents - Sheet Outline</a><br>
+interface XSheetOutline {}
 };
 };
 };
@@ -3493,12 +3523,10 @@ interface XEventsSupplier {}
 module com {
 module sun {
 module star {
-module bridge {
-module oleautomation {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/The_Bridge_Services">ProUNO - Bridge - The Bridge Services</a><br>
-service Factory {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Driver_Service">Database Access - Driver Service</a><br>
+service Driver {}
 };
 };
 };
@@ -3508,10 +3536,10 @@ service Factory {}
 module com {
 module sun {
 module star {
-module drawing {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Grouping%2C_Combining_and_Binding">Drawings - Grouping, Combining and Binding</a><br>
-interface XShapeGrouper {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Sheet_Links">Spreadsheet Documents - Sheet Links</a><br>
+service SheetLink {}
 };
 };
 };
@@ -3521,11 +3549,10 @@ interface XShapeGrouper {}
 module com {
 module sun {
 module star {
-module i18n {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XCharacterClassification">OfficeDev - Implementing a New Locale - XCharacterClassification</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XCharacterClassification">OfficeDev - Overview and Using the API - XCharacterClassification</a><br>
-interface XCharacterClassification {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Sheet_Links">Spreadsheet Documents - Sheet Links</a><br>
+service SheetLinks {}
 };
 };
 };
@@ -3535,10 +3562,10 @@ interface XCharacterClassification {}
 module com {
 module sun {
 module star {
-module sdb {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/The_SQLQueryComposer">Database - The SQLQueryComposer</a><br>
-service SQLQueryComposer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Sheet_Links">Spreadsheet Documents - Sheet Links</a><br>
+interface XSheetLinkable {}
 };
 };
 };
@@ -3548,10 +3575,10 @@ service SQLQueryComposer {}
 module com {
 module sun {
 module star {
-module style {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service ParagraphProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Levels">Spreadsheet Documents - Levels</a><br>
+service DataPilotSourceLevel {}
 };
 };
 };
@@ -3561,11 +3588,10 @@ service ParagraphProperties {}
 module com {
 module sun {
 module star {
-module frame {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frames#Linking_Components_and_Windows">OfficeDev - Frames - Linking Components and Windows</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Desktop">OfficeDev - Using the Desktop</a><br>
-interface XFrames {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Fill_Series">Spreadsheet Documents - Fill Series</a><br>
+interface XCellSeries {}
 };
 };
 };
@@ -3575,10 +3601,10 @@ interface XFrames {}
 module com {
 module sun {
 module star {
-module sheet {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Subtotals">Spreadsheets - Subtotals</a><br>
-service SubTotalDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Inserting_a_Paragraph_where_no_Cursor_can_go">Text Documents - Inserting a Paragraph where no Cursor can go</a><br>
+interface XRelativeTextContentInsert {}
 };
 };
 };
@@ -3588,10 +3614,12 @@ service SubTotalDescriptor {}
 module com {
 module sun {
 module star {
-module sdb {
+module form {
+module binding {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/PreparedStatement_From_DataSource_Queries">Database - PreparedStatement From DataSource Queries</a><br>
-constants CommandType {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Value_Bindings">Forms - Value Bindings</a><br>
+interface XBindableValue {}
+};
 };
 };
 };
@@ -3601,10 +3629,12 @@ constants CommandType {}
 module com {
 module sun {
 module star {
-module loader {
+module form {
+module binding {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/Implementation_Loader">AdvUNO - Implementation Loader</a><br>
-interface XImplementationLoader {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Value_Bindings">Forms - Value Bindings</a><br>
+interface XValueBinding {}
+};
 };
 };
 };
@@ -3614,11 +3644,13 @@ interface XImplementationLoader {}
 module com {
 module sun {
 module star {
-module sdb {
+module form {
+module component {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Automatic_Key_Generation">Forms - Automatic Key Generation</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Events_and_Other_Notifications">Database - Events and Other Notifications</a><br>
-interface XRowSetApproveBroadcaster {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Logical_Forms">Forms - Logical Forms</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models_Forms">Forms - Control Models Forms</a><br>
+service Form {}
+};
 };
 };
 };
@@ -3628,14 +3660,10 @@ interface XRowSetApproveBroadcaster {}
 module com {
 module sun {
 module star {
-module uno {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Exception_Handling_in_C++">ProUNO - C++ - Exception Handling in C++</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/Exception_Handling">ProUNO - Basic - Exception Handling</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Mapping_of_Exception_Types">ProUNO - Java - Mapping of Exception Types</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Exceptions_and_Errorcodes">ProUNO - Bridge - Exceptions and Errorcodes</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Exception_Handling">ProUNO - Exception Handling</a><br>
-exception RuntimeException {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Protecting_Spreadsheets">Spreadsheet Documents - Protecting Spreadsheets</a><br>
+interface XProtectable {}
 };
 };
 };
@@ -3647,10 +3675,8 @@ module sun {
 module star {
 module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Document_Events">OfficeDev - Document Events</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models#XEventBroadcaster">OfficeDev - Component - Models - XEventBroadcaster</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Desktop">OfficeDev - Using the Desktop</a><br>
-interface XEventBroadcaster {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Protecting_Spreadsheets">Spreadsheet Documents - Protecting Spreadsheets</a><br>
+interface XActionLockable {}
 };
 };
 };
@@ -3660,14 +3686,13 @@ interface XEventBroadcaster {}
 module com {
 module sun {
 module star {
-module frame {
+module form {
+module component {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models#XModel">OfficeDev - Component - Models - XModel</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Getting_Frames%2C_Controllers_and_Models_from_Each_Other">OfficeDev - Component - Getting Frames, Controllers and Models from Each Other</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Document_Controller">Text - Text Document Controller</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models">OfficeDev - Component - Models</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org">OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org</a><br>
-interface XModel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#HTML_Forms">Forms - HTML Forms</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models_Forms">Forms - Control Models Forms</a><br>
+service HTMLForm {}
+};
 };
 };
 };
@@ -3679,8 +3704,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet#Page_Breaks">Spreadsheets - Spreadsheet - Page Breaks</a><br>
-struct TablePageBreakData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_and_Cell_Range_Access">Spreadsheet Documents - Cell and Cell Range Access</a><br>
+interface XSheetCellRange {}
 };
 };
 };
@@ -3690,11 +3715,10 @@ struct TablePageBreakData {}
 module com {
 module sun {
 module star {
-module i18n {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XBreakIterator">OfficeDev - Implementing a New Locale - XBreakIterator</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XBreakIterator">OfficeDev - Overview and Using the API - XBreakIterator</a><br>
-interface XBreakIterator {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_and_Cell_Range_Access">Spreadsheet Documents - Cell and Cell Range Access</a><br>
+interface XCellRange {}
 };
 };
 };
@@ -3704,10 +3728,10 @@ interface XBreakIterator {}
 module com {
 module sun {
 module star {
-module sheet {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Dimensions">Spreadsheets - Dimensions</a><br>
-service DataPilotSourceDimensions {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models_Forms">Forms - Control Models Forms</a><br>
+interface XForm {}
 };
 };
 };
@@ -3717,10 +3741,10 @@ service DataPilotSourceDimensions {}
 module com {
 module sun {
 module star {
-module text {
+module awt {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Tables#Table_Architecture">Text - Tables - Table Architecture</a><br>
-service TextTable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models_Forms">Forms - Control Models Forms</a><br>
+interface XTabControllerModel {}
 };
 };
 };
@@ -3730,10 +3754,10 @@ service TextTable {}
 module com {
 module sun {
 module star {
-module sdb {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connections#Understanding_Connections">Database - Connections - Understanding Connections</a><br>
-service Connection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Merging_Cell_Ranges_into_a_Single_Cell">Spreadsheet Documents - Merging Cell Ranges into a Single Cell</a><br>
+interface XMergeable {}
 };
 };
 };
@@ -3743,10 +3767,10 @@ service Connection {}
 module com {
 module sun {
 module star {
-module sdb {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/The_SingleSelectQueryComposer">Database - The SingleSelectQueryComposer</a><br>
-service SingleSelectQueryComposer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Target_Frame">Office Development - Handling Documents - Loading Documents - Target Frame</a><br>
+constants FrameSearchFlag {}
 };
 };
 };
@@ -3756,10 +3780,10 @@ service SingleSelectQueryComposer {}
 module com {
 module sun {
 module star {
-module i18n {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XNumberFormatCode">OfficeDev - Overview and Using the API - XNumberFormatCode</a><br>
-interface XNumberFormatCode {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Operations">Spreadsheet Documents - Operations</a><br>
+interface XSheetOperation {}
 };
 };
 };
@@ -3769,10 +3793,10 @@ interface XNumberFormatCode {}
 module com {
 module sun {
 module star {
-module drawing {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Working_with_Drawing_Documents#Page_Handling">Drawings - Working with Drawing Documents - Page Handling</a><br>
-interface XDrawPageDuplicator {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#FormComponents_Service">Forms - FormComponents Service</a><br>
+service FormComponents {}
 };
 };
 };
@@ -3782,10 +3806,10 @@ interface XDrawPageDuplicator {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Auto_Text">Text - Auto Text</a><br>
-service AutoTextGroup {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Compatibility_Names">Spreadsheet Documents - Compatibility Names</a><br>
+interface XCompatibilityNames {}
 };
 };
 };
@@ -3795,10 +3819,10 @@ service AutoTextGroup {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Driver_Specifics#Driver_Specifics">Database - Driver Specifics - Driver Specifics</a><br>
-service Driver {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Printing_Multiple_Pages_on_one_Page">Text Documents - Printing Text Documents - Printing Multiple Pages on one Page</a><br>
+interface XPagePrintable {}
 };
 };
 };
@@ -3808,10 +3832,10 @@ service Driver {}
 module com {
 module sun {
 module star {
-module sdbc {
+module ui {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connecting_Through_a_DataSource">Database - Connecting Through a DataSource</a><br>
-interface XDataSource {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Intercepting_Context_Menus">Writing UNO Components - Intercepting Context Menus</a><br>
+interface XContextMenuInterception {}
 };
 };
 };
@@ -3821,10 +3845,10 @@ interface XDataSource {}
 module com {
 module sun {
 module star {
-module sheet {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Levels">Spreadsheets - Levels</a><br>
-service DataPilotSourceLevel {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Accessing_the_Children_of_a_Folder">Universal Content Broker - Folders - Accessing the Children of a Folder</a><br>
+struct OpenCommandArgument2 {}
 };
 };
 };
@@ -3834,12 +3858,10 @@ service DataPilotSourceLevel {}
 module com {
 module sun {
 module star {
-module awt {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Window_Interfaces">OfficeDev - Component - Window Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frames#Linking_Components_and_Windows">OfficeDev - Frames - Linking Components and Windows</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Windows">OfficeDev - Windows</a><br>
-interface XWindow {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Accessing_the_Children_of_a_Folder">Universal Content Broker - Folders - Accessing the Children of a Folder</a><br>
+service DynamicResultSet {}
 };
 };
 };
@@ -3849,10 +3871,10 @@ interface XWindow {}
 module com {
 module sun {
 module star {
-module sdb {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/PreparedStatement_From_DataSource_Queries">Database - PreparedStatement From DataSource Queries</a><br>
-interface XCommandPreparation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Introduction_3">Office Development - XML Based Filter Development - Introduction</a><br>
+interface XFilter {}
 };
 };
 };
@@ -3862,10 +3884,10 @@ interface XCommandPreparation {}
 module com {
 module sun {
 module star {
-module text {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Shape_Objects_in_Text">Text - Shape Objects in Text</a><br>
-service TextGraphicObject {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Collections_and_Containers">Professional UNO - Collections and Containers</a><br>
+interface XNameContainer {}
 };
 };
 };
@@ -3875,12 +3897,10 @@ service TextGraphicObject {}
 module com {
 module sun {
 module star {
-module frame {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Getting_Frames%2C_Controllers_and_Models_from_Each_Other">OfficeDev - Component - Getting Frames, Controllers and Models from Each Other</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Controllers">OfficeDev - Controllers</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org">OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org</a><br>
-interface XController {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Collections_and_Containers">Professional UNO - Collections and Containers</a><br>
+interface XIndexAccess {}
 };
 };
 };
@@ -3890,10 +3910,10 @@ interface XController {}
 module com {
 module sun {
 module star {
-module sheet {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Data_Validation">Spreadsheets - Other Table Operations - Data Validation</a><br>
-service TableValidation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Collections_and_Containers">Professional UNO - Collections and Containers</a><br>
+interface XNameAccess {}
 };
 };
 };
@@ -3903,12 +3923,10 @@ service TableValidation {}
 module com {
 module sun {
 module star {
-module document {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Models#XViewDataSupplier">OfficeDev - Component - Models - XViewDataSupplier</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Other_Drawing_Specific_View_Settings">Drawings - Other Drawing Specific View Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Document_Controller">Text - Text Document Controller</a><br>
-interface XViewDataSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Professional_UNO#Collections_and_Containers">Professional UNO - Collections and Containers</a><br>
+interface XIndexContainer {}
 };
 };
 };
@@ -3918,10 +3936,10 @@ interface XViewDataSupplier {}
 module com {
 module sun {
 module star {
-module form {
+module loader {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models_Forms">Forms - Control Models Forms</a><br>
-interface XForm {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#Shared_Library_Loader">Advanced UNO - Implementation Loader - Shared Library Loader</a><br>
+service SharedLibrary {}
 };
 };
 };
@@ -3931,11 +3949,10 @@ interface XForm {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Working_With_Spreadsheet_Documents#Spreadsheet_Document">Spreadsheets - Working With Spreadsheet Documents - Document Structure - Spreadsheet Document</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Documents">Spreadsheets - Spreadsheet Documents</a><br>
-service SpreadsheetDocument {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Connecting_Using_the_DriverManager_and_a_Database_URL">Database Access - Connecting Using the DriverManager and a Database URL</a><br>
+service DriverManager {}
 };
 };
 };
@@ -3945,13 +3962,11 @@ service SpreadsheetDocument {}
 module com {
 module sun {
 module star {
-module form {
-module component {
+module presentation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Logical_Forms">Forms - Logical Forms</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models_Forms">Forms - Control Models Forms</a><br>
-service Form {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Presentation_Settings">Drawings and Presentations - Presentation Settings</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Working_with_Presentation_Documents">Drawings and Presentations - Working with Presentation Documents</a><br>
+interface XPresentation {}
 };
 };
 };
@@ -3961,12 +3976,10 @@ service Form {}
 module com {
 module sun {
 module star {
-module sheet {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview">Spreadsheets - Spreadsheet Services - Overview</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Ranges">Spreadsheets - Cell Ranges</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_and_Cell_Range_Access">Spreadsheets - Cell and Cell Range Access</a><br>
-service SheetCellRange {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Styles">Spreadsheet Documents - Overall Document Features - Styles</a><br>
+interface XStyleFamiliesSupplier {}
 };
 };
 };
@@ -3976,10 +3989,10 @@ service SheetCellRange {}
 module com {
 module sun {
 module star {
-module drawing {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Working_with_Drawing_Documents#Page_Handling">Drawings - Working with Drawing Documents - Page Handling</a><br>
-interface XDrawPages {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Command_URL">Office Development - Command URL</a><br>
+struct URL {}
 };
 };
 };
@@ -3989,12 +4002,10 @@ interface XDrawPages {}
 module com {
 module sun {
 module star {
-module frame {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Desktop_Environment">OfficeDev - Desktop Environment</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Desktop">OfficeDev - Using the Desktop</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Universal_Content_Broker#Capabilities">UCB - Universal Content Broker - Capabilities</a><br>
-service Desktop {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Indexes_and_Index_Marks">Text Documents - Indexes and Index Marks</a><br>
+service BaseIndex {}
 };
 };
 };
@@ -4004,10 +4015,10 @@ service Desktop {}
 module com {
 module sun {
 module star {
-module table {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_and_Cell_Range_Access">Spreadsheets - Cell and Cell Range Access</a><br>
-interface XCellRange {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Indexes_and_Index_Marks">Text Documents - Indexes and Index Marks</a><br>
+interface XDocumentIndex {}
 };
 };
 };
@@ -4017,10 +4028,12 @@ interface XCellRange {}
 module com {
 module sun {
 module star {
-module sheet {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Database_Ranges">Spreadsheets - Database Ranges</a><br>
-interface XDatabaseRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#The_UNO_Executable">Writing UNO Components - The UNO Executable</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XMain">Writing UNO Components - XMain</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+interface XMain {}
 };
 };
 };
@@ -4030,10 +4043,10 @@ interface XDatabaseRanges {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/User_Service">Database - User Service</a><br>
-interface XUser {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Update">Database Access - Update</a><br>
+interface XRowUpdate {}
 };
 };
 };
@@ -4043,10 +4056,10 @@ interface XUser {}
 module com {
 module sun {
 module star {
-module sdbc {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Events_and_Other_Notifications">Database - Events and Other Notifications</a><br>
-interface XRowSetListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Format_Ranges">Spreadsheet Documents - Equally Formatted Cell Ranges - Cell Format Ranges</a><br>
+service CellFormatRanges {}
 };
 };
 };
@@ -4056,10 +4069,10 @@ interface XRowSetListener {}
 module com {
 module sun {
 module star {
-module linguistic2 {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Linguistics">OfficeDev - Linguistics</a><br>
-service LinguServiceManager {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Creating_a_User">Database Access - Creating a User</a><br>
+service UserDescriptor {}
 };
 };
 };
@@ -4069,10 +4082,11 @@ service LinguServiceManager {}
 module com {
 module sun {
 module star {
-module loader {
+module presentation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/Implementation_Loader#Shared_Library_Loader">AdvUNO - Implementation Loader - Shared Library Loader</a><br>
-service SharedLibrary {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Working_with_Presentation_Documents">Drawings and Presentations - Working with Presentation Documents</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Slide_Transition">Drawings and Presentations - Slide Transition</a><br>
+service DrawPage {}
 };
 };
 };
@@ -4082,10 +4096,10 @@ service SharedLibrary {}
 module com {
 module sun {
 module star {
-module text {
+module linguistic2 {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Printing_Text_Documents#Printing_Multiple_Pages_on_one_Page">Text - Printing Text Documents - Printing Multiple Pages on one Page</a><br>
-interface XPagePrintable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linguistics">Office Development - Linguistics</a><br>
+service Hyphenator {}
 };
 };
 };
@@ -4095,10 +4109,10 @@ interface XPagePrintable {}
 module com {
 module sun {
 module star {
-module beans {
+module linguistic2 {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-interface XPropertyContainer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linguistics">Office Development - Linguistics</a><br>
+service SpellChecker {}
 };
 };
 };
@@ -4108,10 +4122,10 @@ interface XPropertyContainer {}
 module com {
 module sun {
 module star {
-module chart {
+module linguistic2 {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Setting_the_Chart_Type">Charts - Setting the Chart Type</a><br>
-service XYDiagram {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linguistics">Office Development - Linguistics</a><br>
+service LinguServiceManager {}
 };
 };
 };
@@ -4121,10 +4135,10 @@ service XYDiagram {}
 module com {
 module sun {
 module star {
-module util {
+module linguistic2 {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Disable_Commands#Disabling_Commands_at_Runtime">WritingUNO - Disable Commands - Disabling Commands at Runtime</a><br>
-interface XChangesBatch {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linguistics">Office Development - Linguistics</a><br>
+service DictionaryList {}
 };
 };
 };
@@ -4134,10 +4148,10 @@ interface XChangesBatch {}
 module com {
 module sun {
 module star {
-module chart {
+module linguistic2 {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Pie_Charts">Charts - Pie Charts</a><br>
-service ChartPieSegmentProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linguistics">Office Development - Linguistics</a><br>
+service LinguProperties {}
 };
 };
 };
@@ -4147,10 +4161,10 @@ service ChartPieSegmentProperties {}
 module com {
 module sun {
 module star {
-module chart {
+module linguistic2 {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/3-D_Charts">Charts - 3-D Charts</a><br>
-service Dim3DDiagram {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Linguistics">Office Development - Linguistics</a><br>
+service Thesaurus {}
 };
 };
 };
@@ -4162,8 +4176,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Table_Auto_Formats">Spreadsheets - Table Auto Formats</a><br>
-service TableAutoFormatField {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Calculating_Function_Results">Spreadsheet Documents - Function Handling - Calculating Function Results</a><br>
+service FunctionAccess {}
 };
 };
 };
@@ -4173,10 +4187,10 @@ service TableAutoFormatField {}
 module com {
 module sun {
 module star {
-module chart {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Data_Access">Charts - Data Access</a><br>
-interface XChartDataArray {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Indentation">Spreadsheet Documents - Indentation</a><br>
+interface XIndent {}
 };
 };
 };
@@ -4186,10 +4200,10 @@ interface XChartDataArray {}
 module com {
 module sun {
 module star {
-module drawing {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Exporting">Drawings - Exporting</a><br>
-service GraphicExportFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Result_Sets">Database Access - Result Sets</a><br>
+service ResultSet {}
 };
 };
 };
@@ -4199,10 +4213,10 @@ service GraphicExportFilter {}
 module com {
 module sun {
 module star {
-module util {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-interface XNumberFormatter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Result_Sets">Database Access - Result Sets</a><br>
+service ResultSet {}
 };
 };
 };
@@ -4212,10 +4226,11 @@ interface XNumberFormatter {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Filtering">Spreadsheets - Filtering</a><br>
-interface XSheetFilterableEx {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Result_Sets">Database Access - Result Sets</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Clones_of_the_RowSet_Service">Database Access - Clones of the RowSet Service</a><br>
+service ResultSet {}
 };
 };
 };
@@ -4225,10 +4240,10 @@ interface XSheetFilterableEx {}
 module com {
 module sun {
 module star {
-module sheet {
+module presentation {
+/// @enum FadeEffect
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet#Page_Breaks">Spreadsheets - Spreadsheet - Page Breaks</a><br>
-interface XSheetPageBreak {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Slide_Transition">Drawings and Presentations - Slide Transition</a><br>
 };
 };
 };
@@ -4238,10 +4253,10 @@ interface XSheetPageBreak {}
 module com {
 module sun {
 module star {
-module sheet {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Handling_Array_Formulas">Spreadsheets - Handling Array Formulas</a><br>
-interface XArrayFormulaRange {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Setting_the_Chart_Type">Charts - Setting the Chart Type</a><br>
+service XYDiagram {}
 };
 };
 };
@@ -4251,12 +4266,10 @@ interface XArrayFormulaRange {}
 module com {
 module sun {
 module star {
-module form {
-module validation {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Validation">Forms - Validation</a><br>
-interface XValidatable {}
-};
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Setting_the_Chart_Type">Charts - Setting the Chart Type</a><br>
+service Diagram {}
 };
 };
 };
@@ -4266,10 +4279,11 @@ interface XValidatable {}
 module com {
 module sun {
 module star {
-module frame {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Handling_Documents#Target_Frame">OfficeDev - Handling Documents - Loading Documents - Target Frame</a><br>
-constants FrameSearchFlag {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Creating_and_Adding_a_Chart_to_a_Spreadsheet">Charts - Creating and Adding a Chart to a Spreadsheet</a><br>
+interface XTableChartsSupplier {}
 };
 };
 };
@@ -4279,10 +4293,10 @@ constants FrameSearchFlag {}
 module com {
 module sun {
 module star {
-module sheet {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Working_With_Spreadsheet_Documents#Spreadsheet_Document">Spreadsheets - Working With Spreadsheet Documents - Document Structure - Spreadsheet Document</a><br>
-service Spreadsheets {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
+service OLE2Shape {}
 };
 };
 };
@@ -4292,10 +4306,10 @@ service Spreadsheets {}
 module com {
 module sun {
 module star {
-module ucb {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Services_and_Interfaces">UCB - Services and Interfaces</a><br>
-service Content {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
+service ChartDocument {}
 };
 };
 };
@@ -4307,8 +4321,8 @@ module sun {
 module star {
 module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Result_Sets">Database - Result Sets</a><br>
-service ResultSet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Transaction_Handling">Database Access - Using DBMS Features - Transaction Handling</a><br>
+constants TransactionIsolation {}
 };
 };
 };
@@ -4318,10 +4332,10 @@ service ResultSet {}
 module com {
 module sun {
 module star {
-module document {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-service TypeDetection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Table_Architecture">Text Documents - Tables - Table Architecture</a><br>
+service TextTable {}
 };
 };
 };
@@ -4331,10 +4345,10 @@ service TypeDetection {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Adding_a_Group">Database - Adding a Group</a><br>
-service GroupDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Exporting">Drawings and Presentations - Exporting</a><br>
+service GraphicExportFilter {}
 };
 };
 };
@@ -4344,10 +4358,12 @@ service GroupDescriptor {}
 module com {
 module sun {
 module star {
-module sheet {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Ranges_and_Cells_Container#Access_to_Single_Cell_Ranges_in_SheetCellRanges_Container">Spreadsheets - Cell Ranges and Cells Container - Access to Single Cell Ranges in SheetCellRanges Container</a><br>
-service Cells {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Getting_Frames%2C_Controllers_and_Models_from_Each_Other">Office Development - Component - Getting Frames, Controllers and Models from Each Other</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Controllers">Office Development - Controllers</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Frame-Controller-Model_Paradigm_in_LibreOffice">Office Development - Frame-Controller-Model Paradigm in LibreOffice</a><br>
+interface XController {}
 };
 };
 };
@@ -4357,10 +4373,10 @@ service Cells {}
 module com {
 module sun {
 module star {
-module util {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Merging_Cell_Ranges_into_a_Single_Cell">Spreadsheets - Merging Cell Ranges into a Single Cell</a><br>
-interface XMergeable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Adding_and_Editing_Predefined_Queries">Database Access - Adding and Editing Predefined Queries</a><br>
+service DefinitionContainer {}
 };
 };
 };
@@ -4370,10 +4386,10 @@ interface XMergeable {}
 module com {
 module sun {
 module star {
-module drawing {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models_and_Shapes">Forms - Control Models and Shapes</a><br>
-service ControlShape {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Clones_of_the_RowSet_Service">Database Access - Clones of the RowSet Service</a><br>
+interface XResultSetAccess {}
 };
 };
 };
@@ -4383,10 +4399,10 @@ service ControlShape {}
 module com {
 module sun {
 module star {
-module container {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Collections_and_Containers">ProUNO - Collections and Containers</a><br>
-interface XIndexContainer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Desktop">Office Development - Using the Desktop</a><br>
+interface XDesktop {}
 };
 };
 };
@@ -4396,10 +4412,10 @@ interface XIndexContainer {}
 module com {
 module sun {
 module star {
-module sheet {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Annotations">Spreadsheets - Cell Annotations</a><br>
-interface XSheetAnnotation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Inserting_Text_Files">Text Documents - Inserting Text Files</a><br>
+interface XDocumentInsertable {}
 };
 };
 };
@@ -4409,10 +4425,11 @@ interface XSheetAnnotation {}
 module com {
 module sun {
 module star {
-module text {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Sections">Text - Text Sections</a><br>
-service TextSection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XCollator">Office Development - Implementing a New Locale - XCollator</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XCollator">Office Development - Overview and Using the API - XCollator</a><br>
+interface XCollator {}
 };
 };
 };
@@ -4422,10 +4439,10 @@ service TextSection {}
 module com {
 module sun {
 module star {
-module util {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-interface XNumberFormats {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Creating_Default_Settings">Text Documents - Settings - Creating Default Settings</a><br>
+service Defaults {}
 };
 };
 };
@@ -4435,10 +4452,10 @@ interface XNumberFormats {}
 module com {
 module sun {
 module star {
-module frame {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-service SynchronousFrameLoader {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#DDE_Links">Spreadsheet Documents - DDE Links</a><br>
+service DDELink {}
 };
 };
 };
@@ -4448,10 +4465,10 @@ service SynchronousFrameLoader {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Column_Service">Database - Column Service</a><br>
-service IndexColumn {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Detective">Spreadsheet Documents - Detective</a><br>
+interface XSheetAuditing {}
 };
 };
 };
@@ -4461,11 +4478,10 @@ service IndexColumn {}
 module com {
 module sun {
 module star {
-module container {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Iterating_over_Text">Text - Iterating over Text</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Collections_and_Containers">ProUNO - Collections and Containers</a><br>
-interface XEnumerationAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Print_Areas">Spreadsheet Documents - Printing Spreadsheet Documents - Print Areas</a><br>
+interface XPrintAreas {}
 };
 };
 };
@@ -4475,10 +4491,10 @@ interface XEnumerationAccess {}
 module com {
 module sun {
 module star {
-module xml {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component">OfficeDev - Writing the Filtering Component</a><br>
-service XMLImportFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Unique_Cell_Format_Ranges">Spreadsheet Documents - Equally Formatted Cell Ranges - Unique Cell Format Ranges</a><br>
+service UniqueCellFormatRanges {}
 };
 };
 };
@@ -4488,10 +4504,11 @@ service XMLImportFilter {}
 module com {
 module sun {
 module star {
-module sheet {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Sheet_Links">Spreadsheets - Sheet Links</a><br>
-service SheetLinks {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XUnoTunnel">Writing UNO Components - XUnoTunnel</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+interface XUnoTunnel {}
 };
 };
 };
@@ -4501,10 +4518,10 @@ service SheetLinks {}
 module com {
 module sun {
 module star {
-module sheet {
+module container {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_and_Cell_Range_Access">Spreadsheets - Cell and Cell Range Access</a><br>
-interface XSheetCellRange {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Navigating">Drawings and Presentations - Navigating</a><br>
+interface XNamed {}
 };
 };
 };
@@ -4514,10 +4531,10 @@ interface XSheetCellRange {}
 module com {
 module sun {
 module star {
-module beans {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Settings">Drawings - Settings</a><br>
-service PropertySet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#TextViewCursor">Text Documents - TextViewCursor</a><br>
+service TextViewCursor {}
 };
 };
 };
@@ -4527,11 +4544,10 @@ service PropertySet {}
 module com {
 module sun {
 module star {
-module chart {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Data_Access">Charts - Data Access</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/Working_With_Charts#Document_Structure">Charts - Working With Charts - Document Structure</a><br>
-service ChartData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Page_Styles">Spreadsheet Documents - Overall Document Features - Styles - Page Styles</a><br>
+service TablePageStyle {}
 };
 };
 };
@@ -4541,10 +4557,10 @@ service ChartData {}
 module com {
 module sun {
 module star {
-module sheet {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Operations">Spreadsheets - Operations</a><br>
-interface XSheetOperation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Parameters">Forms - Parameters</a><br>
+interface XDatabaseParameterListener {}
 };
 };
 };
@@ -4554,14 +4570,10 @@ interface XSheetOperation {}
 module com {
 module sun {
 module star {
-module lang {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Lifetime_of_UNO_objects">ProUNO - Lifetime of UNO objects</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Closing_Documents">OfficeDev - Closing Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XComponent">WritingUNO - XComponent</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Component_Framework">OfficeDev - Using the Component Framework</a><br>
-interface XComponent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Parameters">Forms - Parameters</a><br>
+interface XDatabaseParameterBroadcaster {}
 };
 };
 };
@@ -4571,10 +4583,10 @@ interface XComponent {}
 module com {
 module sun {
 module star {
-module xml {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component">OfficeDev - Writing the Filtering Component</a><br>
-service ImportFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service TextTableCursor {}
 };
 };
 };
@@ -4584,10 +4596,10 @@ service ImportFilter {}
 module com {
 module sun {
 module star {
-module form {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Committing_Controls">Forms - Committing Controls</a><br>
-interface XBoundComponent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service ParagraphProperties {}
 };
 };
 };
@@ -4597,10 +4609,10 @@ interface XBoundComponent {}
 module com {
 module sun {
 module star {
-module connection {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Opening_a_Connection">ProUNO - Opening a Connection</a><br>
-interface XConnector {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service CharacterPropertiesComplex {}
 };
 };
 };
@@ -4610,10 +4622,10 @@ interface XConnector {}
 module com {
 module sun {
 module star {
-module beans {
+module style {
+/// @enum BreakType
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Properties">ProUNO - Properties</a><br>
-interface XFastPropertySet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
 };
 };
 };
@@ -4623,11 +4635,10 @@ interface XFastPropertySet {}
 module com {
 module sun {
 module star {
-module beans {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/Using_Services#Using_Properties">FirstSteps - Using Services - Using Properties</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Properties">ProUNO - Properties</a><br>
-interface XPropertySet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+service CharacterPropertiesAsian {}
 };
 };
 };
@@ -4637,10 +4648,11 @@ interface XPropertySet {}
 module com {
 module sun {
 module star {
-module sdbc {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/ResultSetMetaData">Database - ResultSetMetaData</a><br>
-interface XResultSetMetaData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Formatting">Text Documents - Formatting</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Ruby">Text Documents - Ruby</a><br>
+service CharacterProperties {}
 };
 };
 };
@@ -4650,10 +4662,10 @@ interface XResultSetMetaData {}
 module com {
 module sun {
 module star {
-module container {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Collections_and_Containers">ProUNO - Collections and Containers</a><br>
-interface XIndexAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Document_Structure">Drawings and Presentations - Working with Drawing Documents - Document Structure</a><br>
+service DrawPage {}
 };
 };
 };
@@ -4663,10 +4675,10 @@ interface XIndexAccess {}
 module com {
 module sun {
 module star {
-module document {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters">OfficeDev - Integrating Import and Export Filters</a><br>
-service ExportFilter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Settings">Drawings and Presentations - Settings</a><br>
+service PropertySet {}
 };
 };
 };
@@ -4676,11 +4688,10 @@ service ExportFilter {}
 module com {
 module sun {
 module star {
-module beans {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Properties">ProUNO - Properties</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models">Forms - Control Models</a><br>
-interface XPropertyState {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#URL_Parameter">Office Development - Handling Documents - Loading Documents - URL Parameter</a><br>
+service URLTransformer {}
 };
 };
 };
@@ -4690,10 +4701,10 @@ interface XPropertyState {}
 module com {
 module sun {
 module star {
-module util {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Path_Settings">OfficeDev - Path Settings</a><br>
-service PathSettings {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Ruby">Text Documents - Ruby</a><br>
+interface XRubySelection {}
 };
 };
 };
@@ -4703,10 +4714,10 @@ service PathSettings {}
 module com {
 module sun {
 module star {
-module util {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Number_Formats">OfficeDev - Number Formats</a><br>
-interface XNumberFormatPreviewer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Creating_a_Chart_OLE_Object_in_Draw_and_Impress">Charts - Creating a Chart OLE Object in Draw and Impress</a><br>
+interface XDrawPagesSupplier {}
 };
 };
 };
@@ -4716,10 +4727,10 @@ interface XNumberFormatPreviewer {}
 module com {
 module sun {
 module star {
-module text {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Shape_Objects_in_Text">Text - Shape Objects in Text</a><br>
-service TextFrame {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Shape_Types">Drawings and Presentations - Shape Types</a><br>
+service Shape {}
 };
 };
 };
@@ -4729,10 +4740,11 @@ service TextFrame {}
 module com {
 module sun {
 module star {
-module sdb {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Controllers#Document_Specific_Controller_Services">OfficeDev - Component - Controllers - Document Specific Controller Services</a><br>
-service DataSourceBrowser {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Capabilities">Universal Content Broker - Universal Content Broker - Capabilities</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Instantiating_the_UCB">Universal Content Broker - Instantiating the UCB</a><br>
+service UniversalContentBroker {}
 };
 };
 };
@@ -4742,10 +4754,11 @@ service DataSourceBrowser {}
 module com {
 module sun {
 module star {
-module sheet {
+module frame {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Conditional_Formats">Spreadsheets - Conditional Formats</a><br>
-service TableConditionalFormat {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Dispatch_Interception">Office Development - Dispatch Interception</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#Using_the_Dispatch_Framework">Office Development - Using the Dispatch Framework</a><br>
+interface XDispatchProviderInterceptor {}
 };
 };
 };
@@ -4755,10 +4768,10 @@ service TableConditionalFormat {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connections#Data_Definition">Database - Connections - Understanding Connections - Data Definition</a><br>
-service DatabaseDefinition {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Subtotals">Spreadsheet Documents - Subtotals</a><br>
+struct SubTotalColumn {}
 };
 };
 };
@@ -4768,10 +4781,10 @@ service DatabaseDefinition {}
 module com {
 module sun {
 module star {
-module connection {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Opening_a_Connection">ProUNO - Opening a Connection</a><br>
-service Acceptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Subtotals">Spreadsheet Documents - Subtotals</a><br>
+service SubTotalDescriptor {}
 };
 };
 };
@@ -4781,10 +4794,10 @@ service Acceptor {}
 module com {
 module sun {
 module star {
-module connection {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Opening_a_Connection">ProUNO - Opening a Connection</a><br>
-service Connector {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Subtotals">Spreadsheet Documents - Subtotals</a><br>
+service SubTotalField {}
 };
 };
 };
@@ -4794,10 +4807,10 @@ service Connector {}
 module com {
 module sun {
 module star {
-module sdbc {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Scrollable_Result_Sets">Database - Scrollable Result Sets</a><br>
-interface XResultSet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Subtotals">Spreadsheet Documents - Subtotals</a><br>
+interface XSubTotalCalculatable {}
 };
 };
 };
@@ -4807,10 +4820,10 @@ interface XResultSet {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Columns">Text - Columns</a><br>
-service TextColumns {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Members">Spreadsheet Documents - Members</a><br>
+service DataPilotSourceMember {}
 };
 };
 };
@@ -4820,10 +4833,10 @@ service TextColumns {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Equally_Formatted_Cell_Ranges#Unique_Cell_Format_Ranges">Spreadsheets - Equally Formatted Cell Ranges - Unique Cell Format Ranges</a><br>
-service UniqueCellFormatRanges {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Tables_and_Columns">Database Access - Tables and Columns</a><br>
+service Column {}
 };
 };
 };
@@ -4833,10 +4846,10 @@ service UniqueCellFormatRanges {}
 module com {
 module sun {
 module star {
-module util {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Closing_Documents">OfficeDev - Closing Documents</a><br>
-interface XCloseListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Tables_and_Columns">Database Access - Tables and Columns</a><br>
+service Table {}
 };
 };
 };
@@ -4846,10 +4859,10 @@ interface XCloseListener {}
 module com {
 module sun {
 module star {
-module text {
+module sdbcx {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service TextTableCursor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Data_Definition">Database Access - Connections - Understanding Connections - Data Definition</a><br>
+service DatabaseDefinition {}
 };
 };
 };
@@ -4859,10 +4872,11 @@ service TextTableCursor {}
 module com {
 module sun {
 module star {
-module sdbcx {
+module uno {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Result_Sets">Database - Result Sets</a><br>
-service ResultSet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XAggregation">Writing UNO Components - XAggregation</a><br>
+interface XAggregation {}
 };
 };
 };
@@ -4872,10 +4886,12 @@ service ResultSet {}
 module com {
 module sun {
 module star {
-module sdbc {
+module lang {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Using_the_getXXX_Methods">Database - Using the getXXX Methods</a><br>
-interface XRow {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement">Writing UNO Components - Core Interfaces to Implement</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#XTypeProvider">Writing UNO Components - XTypeProvider</a><br>
+interface XTypeProvider {}
 };
 };
 };
@@ -4885,10 +4901,10 @@ interface XRow {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Source_Object">Spreadsheets - Source Object</a><br>
-service DataPilotSource {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Scrollable_Result_Sets">Database Access - Scrollable Result Sets</a><br>
+interface XResultSet {}
 };
 };
 };
@@ -4898,10 +4914,10 @@ service DataPilotSource {}
 module com {
 module sun {
 module star {
-module table {
+module reflection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Table_Auto_Formats">Spreadsheets - Table Auto Formats</a><br>
-interface XAutoFormattable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+service CoreReflection {}
 };
 };
 };
@@ -4911,10 +4927,10 @@ interface XAutoFormattable {}
 module com {
 module sun {
 module star {
-module sdbc {
+module script {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Connection_Pooling">Database - Connection Pooling</a><br>
-service ConnectionPool {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+service Converter {}
 };
 };
 };
@@ -4924,10 +4940,10 @@ service ConnectionPool {}
 module com {
 module sun {
 module star {
-module style {
+module script {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service CharacterPropertiesComplex {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+service InvocationAdapterFactory {}
 };
 };
 };
@@ -4937,10 +4953,10 @@ service CharacterPropertiesComplex {}
 module com {
 module sun {
 module star {
-module text {
+module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Editing_Text#Text_Contents_Other_Than_Strings">Text - Editing Text - Text Contents Other Than Strings</a><br>
-service TextContent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+interface XIntrospection {}
 };
 };
 };
@@ -4950,10 +4966,10 @@ service TextContent {}
 module com {
 module sun {
 module star {
-module sdb {
+module reflection {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Tables_and_Columns">Database - Tables and Columns</a><br>
-service Table {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+interface XTypeDescription {}
 };
 };
 };
@@ -4963,10 +4979,11 @@ service Table {}
 module com {
 module sun {
 module star {
-module sheet {
+module script {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Subtotals">Spreadsheets - Subtotals</a><br>
-interface XSubTotalCalculatable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#Scripting_Existing_UNO_Objects">Advanced UNO - XInvocation Bridge - Scripting Existing UNO Objects</a><br>
+service Invocation {}
 };
 };
 };
@@ -4978,8 +4995,8 @@ module sun {
 module star {
 module beans {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Properties">ProUNO - Properties</a><br>
-interface XPropertySetInfo {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API">Advanced UNO - UNO Reflection API</a><br>
+service Introspection {}
 };
 };
 };
@@ -4989,10 +5006,10 @@ interface XPropertySetInfo {}
 module com {
 module sun {
 module star {
-module beans {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-interface XIntrospection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cells_Absolute_Address">Spreadsheet Documents - Cells Absolute Address</a><br>
+interface XCellAddressable {}
 };
 };
 };
@@ -5002,10 +5019,10 @@ interface XIntrospection {}
 module com {
 module sun {
 module star {
-module drawing {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Grouping%2C_Combining_and_Binding">Drawings - Grouping, Combining and Binding</a><br>
-service ShapeCollection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Line_Numbering">Text Documents - Line Numbering and Outline Numbering - Line Numbering</a><br>
+service LineNumberingProperties {}
 };
 };
 };
@@ -5015,10 +5032,10 @@ service ShapeCollection {}
 module com {
 module sun {
 module star {
-module sdb {
+module chart {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Clones_of_the_RowSet_Service">Database - Clones of the RowSet Service</a><br>
-interface XResultSetAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Charts#Pie_Charts">Charts - Pie Charts</a><br>
+service ChartPieSegmentProperties {}
 };
 };
 };
@@ -5028,10 +5045,10 @@ interface XResultSetAccess {}
 module com {
 module sun {
 module star {
-module task {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Jobs/Jobs">WritingUNO - Jobs - Jobs</a><br>
-service JobExecutor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Add-Ins">Spreadsheet Documents - Spreadsheet Add-Ins</a><br>
+service AddIn {}
 };
 };
 };
@@ -5041,10 +5058,10 @@ service JobExecutor {}
 module com {
 module sun {
 module star {
-module sheet {
+module loader {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Annotations">Spreadsheets - Cell Annotations</a><br>
-service CellAnnotation {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Advanced_UNO#Implementation_Loader">Advanced UNO - Implementation Loader</a><br>
+interface XImplementationLoader {}
 };
 };
 };
@@ -5054,11 +5071,10 @@ service CellAnnotation {}
 module com {
 module sun {
 module star {
-module style {
+module ucb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Ruby">Text - Ruby</a><br>
-service CharacterProperties {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Universal_Content_Broker#Executing_Content_Commands">Universal Content Broker - Executing Content Commands</a><br>
+struct Command {}
 };
 };
 };
@@ -5068,10 +5084,10 @@ service CharacterProperties {}
 module com {
 module sun {
 module star {
-module i18n {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XExtendedCalendar">OfficeDev - Overview and Using the API - XExtendedCalendar</a><br>
-interface XExtendedCalendar {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#MediaDescriptor">Office Development - Handling Documents - Loading Documents - MediaDescriptor</a><br>
+service MediaDescriptor {}
 };
 };
 };
@@ -5081,13 +5097,10 @@ interface XExtendedCalendar {}
 module com {
 module sun {
 module star {
-module awt {
+module task {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Java_Window_Integration">OfficeDev - Java Window Integration</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Component/Window_Interfaces">OfficeDev - Component - Window Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Windows">OfficeDev - Windows</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/JavaBean/OfficeWindow_Interface">JavaBean - OfficeWindow Interface</a><br>
-interface XWindowPeer {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Writing_UNO_Components#Jobs">Writing UNO Components - Jobs - Jobs</a><br>
+service JobExecutor {}
 };
 };
 };
@@ -5097,11 +5110,10 @@ interface XWindowPeer {}
 module com {
 module sun {
 module star {
-module presentation {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Working_with_Presentation_Documents">Drawings - Working with Presentation Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Slide_Transition">Drawings - Slide Transition</a><br>
-service DrawPage {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#DatabaseContext">Database Access - Data Sources in LibreOffice API - DatabaseContext</a><br>
+service DatabaseContext {}
 };
 };
 };
@@ -5113,10 +5125,8 @@ module sun {
 module star {
 module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Text_Documents">Text - Text Documents</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Settings#Document_Properties">Text - Settings - Document Properties</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Formatting">Text - Formatting</a><br>
-service TextDocument {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Word_Processing">Text Documents - Working with Text Documents - Word Processing</a><br>
+service Text {}
 };
 };
 };
@@ -5126,10 +5136,10 @@ service TextDocument {}
 module com {
 module sun {
 module star {
-module sheet {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Subtotals">Spreadsheets - Subtotals</a><br>
-struct SubTotalColumn {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Forms_and_Reports">Database Access - Forms and Reports</a><br>
+interface XReportDocumentsSupplier {}
 };
 };
 };
@@ -5139,11 +5149,10 @@ struct SubTotalColumn {}
 module com {
 module sun {
 module star {
-module view {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Printing_Drawing_Documents#Printer_and_Print_Job_Settings">Drawings - Printing Drawing Documents - Printer and Print Job Settings</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Printer_and_Print_Job_Settings">Spreadsheets - Printing Spreadsheet Documents - Printer and Print Job Settings</a><br>
-service PrinterDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Forms_and_Reports">Database Access - Forms and Reports</a><br>
+interface XFormDocumentsSupplier {}
 };
 };
 };
@@ -5153,10 +5162,11 @@ service PrinterDescriptor {}
 module com {
 module sun {
 module star {
-module drawing {
+module document {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Working_with_Drawing_Documents#Document_Structure">Drawings - Working with Drawing Documents - Document Structure</a><br>
-service DrawPage {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XDocumentPropertiesSupplier">Office Development - Component - Models - XDocumentPropertiesSupplier</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#General_Document_Information">Text Documents - Settings - General Document Information</a><br>
+interface XDocumentPropertiesSupplier {}
 };
 };
 };
@@ -5166,10 +5176,10 @@ service DrawPage {}
 module com {
 module sun {
 module star {
-module ucb {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Creating">UCB - Creating</a><br>
-struct ContentInfo {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Page_Handling">Drawings and Presentations - Working with Drawing Documents - Page Handling</a><br>
+interface XDrawPages {}
 };
 };
 };
@@ -5179,10 +5189,10 @@ struct ContentInfo {}
 module com {
 module sun {
 module star {
-module ucb {
+module drawing {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/UCB/Folders#Accessing_the_Children_of_a_Folder">UCB - Folders - Accessing the Children of a Folder</a><br>
-service DynamicResultSet {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Page_Handling">Drawings and Presentations - Working with Drawing Documents - Page Handling</a><br>
+interface XDrawPageDuplicator {}
 };
 };
 };
@@ -5192,11 +5202,10 @@ service DynamicResultSet {}
 module com {
 module sun {
 module star {
-module frame {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Dispatch_Interception">OfficeDev - Dispatch Interception</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Using_the_Dispatch_Framework">OfficeDev - Using the Dispatch Framework</a><br>
-interface XDispatchProviderInterceptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Table_Auto_Formats">Spreadsheet Documents - Table Auto Formats</a><br>
+service TableAutoFormatField {}
 };
 };
 };
@@ -5208,8 +5217,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/DDE_Links">Spreadsheets - DDE Links</a><br>
-service DDELink {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Table_Auto_Formats">Spreadsheet Documents - Table Auto Formats</a><br>
+service TableAutoFormat {}
 };
 };
 };
@@ -5219,10 +5228,10 @@ service DDELink {}
 module com {
 module sun {
 module star {
-module util {
+module table {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Charts/How_Add-Ins_Work">Charts - How Add-Ins Work</a><br>
-interface XRefreshable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Table_Auto_Formats">Spreadsheet Documents - Table Auto Formats</a><br>
+interface XAutoFormattable {}
 };
 };
 };
@@ -5232,10 +5241,10 @@ interface XRefreshable {}
 module com {
 module sun {
 module star {
-module document {
+module sdbc {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Protecting_Spreadsheets">Spreadsheets - Protecting Spreadsheets</a><br>
-interface XActionLockable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#Using_the_getXXX_Methods">Database Access - Using the getXXX Methods</a><br>
+interface XRow {}
 };
 };
 };
@@ -5247,8 +5256,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Overall_Document_Features#Cell_Styles">Spreadsheets - Overall Document Features - Styles - Cell Styles</a><br>
-service TableCellStyle {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Access_to_Single_Cell_Ranges_in_SheetCellRanges_Container">Spreadsheet Documents - Cell Ranges and Cells Container - Access to Single Cell Ranges in SheetCellRanges Container</a><br>
+service Cells {}
 };
 };
 };
@@ -5258,10 +5267,10 @@ service TableCellStyle {}
 module com {
 module sun {
 module star {
-module task {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Jobs/Implementation">WritingUNO - Jobs - Implementation</a><br>
-service Job {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Data_Array">Spreadsheet Documents - Data Array</a><br>
+interface XCellRangeData {}
 };
 };
 };
@@ -5271,10 +5280,10 @@ service Job {}
 module com {
 module sun {
 module star {
-module sheet {
+module form {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Querying_for_Cells_with_Specific_Properties">Spreadsheets - Querying for Cells with Specific Properties</a><br>
-interface XFormulaQuery {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Forms#Control_Models">Forms - Control Models</a><br>
+service FormComponent {}
 };
 };
 };
@@ -5284,10 +5293,10 @@ interface XFormulaQuery {}
 module com {
 module sun {
 module star {
-module style {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Overall_Document_Features#Styles">Spreadsheets - Overall Document Features - Styles</a><br>
-interface XStyleFamiliesSupplier {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Label_Ranges">Spreadsheet Documents - Label Ranges</a><br>
+service LabelRanges {}
 };
 };
 };
@@ -5299,8 +5308,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Cell_Annotations">Spreadsheets - Cell Annotations</a><br>
-interface XSheetAnnotationAnchor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Annotations">Spreadsheet Documents - Cell Annotations</a><br>
+service CellAnnotation {}
 };
 };
 };
@@ -5310,10 +5319,10 @@ interface XSheetAnnotationAnchor {}
 module com {
 module sun {
 module star {
-module form {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Loadable_Forms">Forms - Loadable Forms</a><br>
-interface XLoadable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Annotations">Spreadsheet Documents - Cell Annotations</a><br>
+interface XSheetAnnotation {}
 };
 };
 };
@@ -5323,10 +5332,10 @@ interface XLoadable {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Shape_Objects_in_Text">Text - Shape Objects in Text</a><br>
-service BaseFrame {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Cell_Annotations">Spreadsheet Documents - Cell Annotations</a><br>
+interface XSheetAnnotationAnchor {}
 };
 };
 };
@@ -5336,11 +5345,10 @@ service BaseFrame {}
 module com {
 module sun {
 module star {
-module style {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Overall_Document_Features#Styles">Text - Overall Document Features - Styles</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Overall_Document_Features#Graphics_Styles">Drawings - Overall Document Features - Styles - Graphics Styles</a><br>
-interface XStyle {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Footnotes_and_Endnotes">Text Documents - Footnotes and Endnotes</a><br>
+service Footnote {}
 };
 };
 };
@@ -5350,10 +5358,10 @@ interface XStyle {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Editing_Text#Control_Characters">Text - Editing Text - Control Characters</a><br>
-constants ControlCharacter {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Used_Area">Spreadsheet Documents - Cell Cursor - Used Area</a><br>
+interface XUsedAreaCursor {}
 };
 };
 };
@@ -5365,8 +5373,8 @@ module sun {
 module star {
 module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Range_Selection">Spreadsheets - Range Selection</a><br>
-interface XRangeSelection {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Database_Ranges">Spreadsheet Documents - Database Ranges</a><br>
+interface XDatabaseRanges {}
 };
 };
 };
@@ -5376,10 +5384,10 @@ interface XRangeSelection {}
 module com {
 module sun {
 module star {
-module util {
+module presentation {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Sorting_Text">Text - Sorting Text</a><br>
-interface XSortable {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Animations_and_Interactions">Drawings and Presentations - Animations and Interactions</a><br>
+service Shape {}
 };
 };
 };
@@ -5389,10 +5397,10 @@ interface XSortable {}
 module com {
 module sun {
 module star {
-module sheet {
+module presentation {
+/// @enum AnimationEffect
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Range_Selection">Spreadsheets - Range Selection</a><br>
-interface XRangeSelectionChangeListener {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Animations_and_Interactions">Drawings and Presentations - Animations and Interactions</a><br>
 };
 };
 };
@@ -5402,10 +5410,10 @@ interface XRangeSelectionChangeListener {}
 module com {
 module sun {
 module star {
-module sheet {
+module util {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Database_Operations">Spreadsheets - Database Operations</a><br>
-service DatabaseRange {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Sorting_Text">Text Documents - Sorting Text</a><br>
+interface XSortable {}
 };
 };
 };
@@ -5415,11 +5423,10 @@ service DatabaseRange {}
 module com {
 module sun {
 module star {
-module configuration {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Config/Reading_Configuration_Data">Config - Reading Configuration Data</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Config/Object_Model">Config - Object Model</a><br>
-service ConfigurationAccess {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Styles">Text Documents - Overall Document Features - Styles</a><br>
+service Style {}
 };
 };
 };
@@ -5429,10 +5436,10 @@ service ConfigurationAccess {}
 module com {
 module sun {
 module star {
-module sheet {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Subtotals">Spreadsheets - Subtotals</a><br>
-service SubTotalField {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Styles">Text Documents - Overall Document Features - Styles</a><br>
+service StyleFamilies {}
 };
 };
 };
@@ -5442,14 +5449,11 @@ service SubTotalField {}
 module com {
 module sun {
 module star {
-module uno {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Lifetime_of_UNO_objects">ProUNO - Lifetime of UNO objects</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/Using_Services#Using_Interfaces">FirstSteps - Using Services - Using Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Using_UNO_Interfaces">ProUNO - Using UNO Interfaces</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XInterface">WritingUNO - XInterface</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-interface XInterface {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Styles">Text Documents - Overall Document Features - Styles</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Graphics_Styles">Drawings and Presentations - Overall Document Features - Styles - Graphics Styles</a><br>
+interface XStyle {}
 };
 };
 };
@@ -5459,10 +5463,10 @@ interface XInterface {}
 module com {
 module sun {
 module star {
-module sheet {
+module style {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Data_Array">Spreadsheets - Data Array</a><br>
-interface XCellRangeData {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Styles">Text Documents - Overall Document Features - Styles</a><br>
+service StyleFamily {}
 };
 };
 };
@@ -5472,12 +5476,10 @@ interface XCellRangeData {}
 module com {
 module sun {
 module star {
-module lang {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement">WritingUNO - Core Interfaces to Implement</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/AdvUNO/UNO_Reflection_API">AdvUNO - UNO Reflection API</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/XTypeProvider">WritingUNO - XTypeProvider</a><br>
-interface XTypeProvider {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Information_about_Functions">Spreadsheet Documents - Function Handling - Information about Functions</a><br>
+service FunctionDescriptions {}
 };
 };
 };
@@ -5487,10 +5489,10 @@ interface XTypeProvider {}
 module com {
 module sun {
 module star {
-module table {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Columns_and_Rows">Spreadsheets - Columns and Rows</a><br>
-service TableRows {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Information_about_Functions">Spreadsheet Documents - Function Handling - Information about Functions</a><br>
+service FunctionDescription {}
 };
 };
 };
@@ -5500,10 +5502,10 @@ service TableRows {}
 module com {
 module sun {
 module star {
-module drawing {
+module sdb {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Drawings/Rotating_and_Shearing">Drawings - Rotating and Shearing</a><br>
-service RotationDescriptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Database_Access#The_SingleSelectQueryComposer">Database Access - The SingleSelectQueryComposer</a><br>
+service SingleSelectQueryComposer {}
 };
 };
 };
@@ -5513,10 +5515,10 @@ service RotationDescriptor {}
 module com {
 module sun {
 module star {
-module text {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Shape_Objects_in_Text">Text - Shape Objects in Text</a><br>
-service TextEmbeddedObject {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Table_Sort_Descriptor">Spreadsheet Documents - Sorting - Table Sort Descriptor</a><br>
+service SheetSortDescriptor2 {}
 };
 };
 };
@@ -5526,10 +5528,10 @@ service TextEmbeddedObject {}
 module com {
 module sun {
 module star {
-module connection {
+module i18n {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Opening_a_Connection">ProUNO - Opening a Connection</a><br>
-interface XAcceptor {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Office_Development#XTransliteration">Office Development - Overview and Using the API - XTransliteration</a><br>
+interface XTransliteration {}
 };
 };
 };
@@ -5539,12 +5541,10 @@ interface XAcceptor {}
 module com {
 module sun {
 module star {
-module bridge {
+module text {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager">ProUNO - Java - Getting a Service Manager</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections">ProUNO - C++ - Establishing Interprocess Connections</a><br>
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections">ProUNO - UNO Interprocess Connections</a><br>
-interface XUnoUrlResolver {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Text_Documents#Reference_Marks">Text Documents - Reference Marks</a><br>
+service ReferenceMark {}
 };
 };
 };
@@ -5554,10 +5554,10 @@ interface XUnoUrlResolver {}
 module com {
 module sun {
 module star {
-module uno {
-/// @enum TypeClass
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Data_Types">ProUNO - Data Types</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#View_Panes">Spreadsheet Documents - View Panes</a><br>
+service SpreadsheetViewPane {}
 };
 };
 };
@@ -5568,9 +5568,9 @@ module com {
 module sun {
 module star {
 module sheet {
-/// @enum DataPilotFieldOrientation
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Creating_a_New_DataPilot_Table">Spreadsheets - Creating a New DataPilot Table</a><br>
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Data_Consolidation">Spreadsheet Documents - Other Table Operations - Data Consolidation</a><br>
+interface XConsolidatable {}
 };
 };
 };
@@ -5580,13 +5580,11 @@ module sheet {
 module com {
 module sun {
 module star {
-module form {
+module sheet {
 /// @par Developers Guide
-///      <a href="http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Control_Models">Forms - Control Models</a><br>
-service FormComponent {}
+///      <a href="https://wiki.documentfoundation.org/Documentation/DevGuide/Spreadsheet_Documents#Data_Consolidation">Spreadsheet Documents - Other Table Operations - Data Consolidation</a><br>
+interface XConsolidationDescriptor {}
 };
 };
 };
 };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/docs/idl/idl_chapter_refs.txt b/odk/docs/idl/idl_chapter_refs.txt
index 169dd60ba9a2..f949be52932a 100644
--- a/odk/docs/idl/idl_chapter_refs.txt
+++ b/odk/docs/idl/idl_chapter_refs.txt
@@ -1,5 +1,5 @@
-LINK:Documentation/DevGuide/AppendixC/The_File_Content_Provider#Commands_and_Properties
-DESCR:AppendixC - The File Content Provider - Commands and Properties
+LINK:Documentation/DevGuide/Universal_Content_Providers#Commands_and_Properties_2
+DESCR:Appendix C. Universal Content Providers - The File Content Provider - Commands and Properties
 REF:
 com.sun.star.ucb.XContent
 com.sun.star.lang.XServiceInfo
@@ -13,15 +13,15 @@ com.sun.star.beans.XPropertyContainer
 com.sun.star.ucb.XCommandProcessor
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XCharacterClassification
-DESCR:OfficeDev - Implementing a New Locale - XCharacterClassification
+LINK:Documentation/DevGuide/Office_Development#XCharacterClassification_2
+DESCR:Office Development - Implementing a New Locale - XCharacterClassification
 REF:
 com.sun.star.i18n.XCharacterClassification
 TOPIC:
 com.sun.star.i18n.XCharacterClassification
 
-LINK:Documentation/DevGuide/ProUNO/Service_Manager_and_Component_Context
-DESCR:ProUNO - Service Manager and Component Context
+LINK:Documentation/DevGuide/Professional_UNO#Service_Manager_and_Component_Context
+DESCR:Professional UNO - Service Manager and Component Context
 REF:
 TOPIC:
 com.sun.star.uno.XComponentContext
@@ -29,30 +29,30 @@ com.sun.star.lang.XMultiServiceFactory
 com.sun.star.lang.XMultiComponentFactory
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/ProUNO/C++/Mapping_of_Singletons
-DESCR:ProUNO - C++ - Mapping of Singletons
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Singletons_2
+DESCR:Professional UNO - C++ - Mapping of Singletons
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.uno.DeploymentException
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XNumberFormatCode
-DESCR:OfficeDev - Overview and Using the API - XNumberFormatCode
+LINK:Documentation/DevGuide/Office_Development#XNumberFormatCode
+DESCR:Office Development - Overview and Using the API - XNumberFormatCode
 REF:
 com.sun.star.i18n.XLocaleData
 com.sun.star.i18n.XNumberFormatCode
 TOPIC:
 com.sun.star.i18n.XNumberFormatCode
 
-LINK:Documentation/DevGuide/ProUNO/C++/Exception_Handling_in_C++
-DESCR:ProUNO - C++ - Exception Handling in C++
+LINK:Documentation/DevGuide/Professional_UNO#Exception_Handling_in_C.2B.2B
+DESCR:Professional UNO - C++ - Exception Handling in C++
 REF:
 com.sun.star.bridge.XUnoUrlResolver
 TOPIC:
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
 
-LINK:Documentation/DevGuide/Charts/Data_Access
+LINK:Documentation/DevGuide/Charts#Data_Access
 DESCR:Charts - Data Access
 REF:
 com.sun.star.chart.XChartDataArray
@@ -69,15 +69,15 @@ com.sun.star.chart.XChartData
 com.sun.star.chart.ChartDataArray
 com.sun.star.chart.ChartData
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XBreakIterator
-DESCR:OfficeDev - Implementing a New Locale - XBreakIterator
+LINK:Documentation/DevGuide/Office_Development#XBreakIterator
+DESCR:Office Development - Implementing a New Locale - XBreakIterator
 REF:
 com.sun.star.i18n.XBreakIterator
 TOPIC:
 com.sun.star.i18n.XBreakIterator
 
-LINK:Documentation/DevGuide/Spreadsheets/Named_Ranges
-DESCR:Spreadsheets - Named Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Named_Ranges
+DESCR:Spreadsheet Documents - Named Ranges
 REF:
 com.sun.star.sheet.XNamedRanges
 com.sun.star.sheet.NamedRangeFlag
@@ -89,14 +89,14 @@ com.sun.star.sheet.NamedRange
 TOPIC:
 com.sun.star.sheet.XNamedRanges
 
-LINK:Documentation/DevGuide/Database/Moving_the_Result_Set_Cursor
-DESCR:Database - Moving the Result Set Cursor
+LINK:Documentation/DevGuide/Database_Access#Moving_the_Result_Set_Cursor
+DESCR:Database Access - Moving the Result Set Cursor
 REF:
 com.sun.star.sdbc.XResultSet
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Preprocessing
-DESCR:WritingUNO - Preprocessing
+LINK:Documentation/DevGuide/Writing_UNO_Components#Preprocessing
+DESCR:Writing UNO Components - Preprocessing
 REF:
 com.sun.star.lang.IllegalArgumentException
 com.sun.star.connection.NoConnectException
@@ -104,23 +104,23 @@ com.sun.star.connection.ConnectionSetupException
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/First_Contact#Getting_Started
-DESCR:FirstSteps - First Contact - Getting Started
+LINK:Documentation/DevGuide/First_Steps#Getting_Started
+DESCR:First Steps - First Contact - Getting Started
 REF:
 TOPIC:
 com.sun.star.uno.XComponentContext
 com.sun.star.lang.XMultiComponentFactory
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/Database/Handling_Unsupported_Functionality
-DESCR:Database - Handling Unsupported Functionality
+LINK:Documentation/DevGuide/Database_Access#Handling_Unsupported_Functionality
+DESCR:Database Access - Handling Unsupported Functionality
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 com.sun.star.sdbc.SQLException
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Document_Events
-DESCR:OfficeDev - Document Events
+LINK:Documentation/DevGuide/Office_Development#Document_Events
+DESCR:Office Development - Document Events
 REF:
 com.sun.star.document.EventObject
 com.sun.star.frame.GlobalEventBroadcaster
@@ -140,28 +140,28 @@ com.sun.star.document.XEventBroadcaster
 com.sun.star.lang.EventObject
 com.sun.star.document.Events
 
-LINK:Documentation/DevGuide/GUI/Radio_Button
-DESCR:GUI - Radio Button
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Radio_Button
+DESCR:Graphical User Interfaces - Radio Button
 REF:
 com.sun.star.awt.UnoControlRadioButtonModel
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Disable_Commands#Disabling_Commands_at_Runtime
-DESCR:WritingUNO - Disable Commands - Disabling Commands at Runtime
+LINK:Documentation/DevGuide/Writing_UNO_Components#Disabling_Commands_at_Runtime
+DESCR:Writing UNO Components - Disable Commands - Disabling Commands at Runtime
 REF:
 TOPIC:
 com.sun.star.configuration.ConfigurationUpdateAccess
 com.sun.star.configuration.ConfigurationProvider
 com.sun.star.util.XChangesBatch
 
-LINK:Documentation/DevGuide/Database/Catalog_Service
-DESCR:Database - Catalog Service
+LINK:Documentation/DevGuide/Database_Access#Catalog_Service
+DESCR:Database Access - Catalog Service
 REF:
 com.sun.star.sdbcx.XDataDefinitionSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Handling_Text_Document_Files#Creating_and_Loading_Text_Documents
-DESCR:Text - Handling Text Document Files - Creating and Loading Text Documents
+LINK:Documentation/DevGuide/Text_Documents#Creating_and_Loading_Text_Documents
+DESCR:Text Documents - Handling Text Document Files - Creating and Loading Text Documents
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.lang.XComponent
@@ -170,8 +170,8 @@ com.sun.star.frame.Desktop
 TOPIC:
 com.sun.star.frame.XComponentLoader
 
-LINK:Documentation/DevGuide/Text/Overall_Document_Features#Paragraph_Styles
-DESCR:Text - Overall Document Features - Styles - Paragraph Styles
+LINK:Documentation/DevGuide/Text_Documents#Paragraph_Styles
+DESCR:Text Documents - Overall Document Features - Styles - Paragraph Styles
 REF:
 com.sun.star.style.ConditionalParagraphStyle
 com.sun.star.style.ParagraphProperties
@@ -179,8 +179,8 @@ com.sun.star.lang.XMultiServiceFactory
 com.sun.star.style.ParagraphPropertiesAsian
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Redline
-DESCR:Text - Redline
+LINK:Documentation/DevGuide/Text_Documents#Redline
+DESCR:Text Documents - Redline
 REF:
 com.sun.star.text.RedlinePortion
 com.sun.star.beans.XPropertySet
@@ -191,15 +191,15 @@ com.sun.star.document.XRedlinesSupplier
 TOPIC:
 com.sun.star.document.XRedlinesSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/Properties_of_a_Type
-DESCR:OfficeDev - Properties of a Type
+LINK:Documentation/DevGuide/Office_Development#Properties_of_a_Type
+DESCR:Office Development - Properties of a Type
 REF:
 com.sun.star.document.TypeDetection
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Java_Window_Integration#A_Hack
-DESCR:OfficeDev - Java Window Integration - Using the Window Handle - A Hack
+LINK:Documentation/DevGuide/Office_Development#A_Hack
+DESCR:Office Development - Java Window Integration - Using the Window Handle - A Hack
 REF:
 com.sun.star.awt.XSystemDependentWindowPeer
 com.sun.star.awt.XWindow
@@ -207,15 +207,15 @@ com.sun.star.awt.XWindowPeer
 com.sun.star.frame.XFrame
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Text_Field
-DESCR:Basic - Text Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Text_Field
+DESCR:LibreOffice Basic - Text Field
 REF:
 com.sun.star.awt.UnoControlEdit
 com.sun.star.awt.XTextComponent
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus#Changing_a_Menu
-DESCR:WritingUNO - Intercepting Context Menus - Writing an Interceptor - Changing a Menu
+LINK:Documentation/DevGuide/Writing_UNO_Components#Changing_a_Menu
+DESCR:Writing UNO Components - Intercepting Context Menus - Writing an Interceptor - Changing a Menu
 REF:
 com.sun.star.ui.ContextMenuExecuteEvent
 com.sun.star.ui.ActionTriggerContainer
@@ -224,15 +224,15 @@ com.sun.star.ui.ActionTriggerSeparator
 com.sun.star.ui.ActionTrigger
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Properties_of_Cell_Ranges
-DESCR:Spreadsheets - Properties of Cell Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Properties_of_Cell_Ranges
+DESCR:Spreadsheet Documents - Properties of Cell Ranges
 REF:
 com.sun.star.table.CellRange
 com.sun.star.sheet.SheetCellRange
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Cursor#Cursor_Movement
-DESCR:Spreadsheets - Cell Cursor - Cursor Movement
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cursor_Movement
+DESCR:Spreadsheet Documents - Cell Cursor - Cursor Movement
 REF:
 com.sun.star.table.XCellCursor
 com.sun.star.sheet.XSpreadsheet
@@ -241,15 +241,15 @@ com.sun.star.table.CellCursor
 com.sun.star.sheet.XSheetCellCursor
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XCalendar
-DESCR:OfficeDev - Implementing a New Locale - XCalendar
+LINK:Documentation/DevGuide/Office_Development#XCalendar
+DESCR:Office Development - Implementing a New Locale - XCalendar
 REF:
 com.sun.star.i18n.XCalendar
 TOPIC:
 com.sun.star.i18n.XCalendar
 
-LINK:Documentation/DevGuide/Spreadsheets/Querying_for_Cells_with_Specific_Properties
-DESCR:Spreadsheets - Querying for Cells with Specific Properties
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Querying_for_Cells_with_Specific_Properties
+DESCR:Spreadsheet Documents - Querying for Cells with Specific Properties
 REF:
 com.sun.star.sheet.XCellRangesQuery
 com.sun.star.sheet.CellFlags
@@ -262,16 +262,16 @@ com.sun.star.sheet.XCellRangesQuery
 com.sun.star.sheet.XFormulaQuery
 com.sun.star.sheet.SheetRangesQuery
 
-LINK:Documentation/DevGuide/Text/Embedded_Objects
-DESCR:Text - Embedded Objects
+LINK:Documentation/DevGuide/Text_Documents#Embedded_Objects
+DESCR:Text Documents - Embedded Objects
 REF:
 com.sun.star.text.TextEmbeddedObject
 com.sun.star.text.BaseFrame
 com.sun.star.document.XEmbeddedObjectSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Column_and_Row_Access
-DESCR:Spreadsheets - Column and Row Access
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Column_and_Row_Access
+DESCR:Spreadsheet Documents - Column and Row Access
 REF:
 com.sun.star.table.XTableColumns
 com.sun.star.table.XColumnRowRange
@@ -279,23 +279,23 @@ com.sun.star.table.XTableRows
 TOPIC:
 com.sun.star.table.XColumnRowRange
 
-LINK:Documentation/DevGuide/OfficeDev/Path_Settings
-DESCR:OfficeDev - Path Settings
+LINK:Documentation/DevGuide/Office_Development#Path_Settings
+DESCR:Office Development - Path Settings
 REF:
 com.sun.star.util.PathSettings
 TOPIC:
 com.sun.star.util.PathSettings
 
-LINK:Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Page_Breaks_and_Scaling_for_Printout
-DESCR:Spreadsheets - Printing Spreadsheet Documents - Page Breaks and Scaling for Printout
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Page_Breaks_and_Scaling_for_Printout
+DESCR:Spreadsheet Documents - Printing Spreadsheet Documents - Page Breaks and Scaling for Printout
 REF:
 com.sun.star.style.XStyleFamiliesSupplier
 com.sun.star.table.TableColumn
 com.sun.star.table.TableRow
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Formatting#Cell_Formatting
-DESCR:Spreadsheets - Formatting - Cell Formatting
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Formatting
+DESCR:Spreadsheet Documents - Formatting - Cell Formatting
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.table.BorderLine
@@ -303,14 +303,14 @@ com.sun.star.table.CellProperties
 com.sun.star.table.TableBorder
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Implementing_without_Helpers#XComponent
-DESCR:WritingUNO - Implementing without Helpers - XComponent
+LINK:Documentation/DevGuide/Writing_UNO_Components#XComponent_2
+DESCR:Writing UNO Components - Implementing without Helpers - XComponent
 REF:
 com.sun.star.lang.XEventListener
 com.sun.star.lang.DisposedException
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Forms_Container
+LINK:Documentation/DevGuide/Forms#Forms_Container
 DESCR:Forms - Forms Container
 REF:
 com.sun.star.form.Forms
@@ -320,45 +320,45 @@ com.sun.star.form.FormComponents
 com.sun.star.form.XFormsSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Extensions/Location_of_Installed_Extensions
+LINK:Documentation/DevGuide/Extensions#Location_of_Installed_Extensions
 DESCR:Extensions - Location of Installed Extensions
 REF:
 com.sun.star.deployment.XPackageInformationProvider
 com.sun.star.deployment.PackageInformationProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Structs
-DESCR:ProUNO - Structs
+LINK:Documentation/DevGuide/Professional_UNO#Structs
+DESCR:Professional UNO - Structs
 REF:
 com.sun.star.beans.Optional
 com.sun.star.beans.Ambiguous
 com.sun.star.beans.Defaulted
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Lifetime_of_UNO_objects
-DESCR:ProUNO - Lifetime of UNO objects
+LINK:Documentation/DevGuide/Professional_UNO#Lifetime_of_UNO_objects
+DESCR:Professional UNO - Lifetime of UNO objects
 REF:
 TOPIC:
 com.sun.star.lang.XComponent
 com.sun.star.uno.XInterface
 com.sun.star.uno.XWeak
 
-LINK:Documentation/DevGuide/Scripting/Writing_Macros#Creating_dialogs_from_macros
-DESCR:Scripting - Writing Macros - Creating dialogs from macros
+LINK:Documentation/DevGuide/Scripting_Framework#Creating_dialogs_from_macros
+DESCR:Scripting Framework - Writing Macros - Creating dialogs from macros
 REF:
 com.sun.star.awt.XDialogProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Java_Window_Integration
-DESCR:OfficeDev - Java Window Integration
+LINK:Documentation/DevGuide/Office_Development#Java_Window_Integration
+DESCR:Office Development - Java Window Integration
 REF:
 TOPIC:
 com.sun.star.awt.XToolkit
 com.sun.star.awt.Toolkit
 com.sun.star.awt.XWindowPeer
 
-LINK:Documentation/DevGuide/GUI/The_Toolkit_Service
-DESCR:GUI - The Toolkit Service
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#The_Toolkit_Service
+DESCR:Graphical User Interfaces - The Toolkit Service
 REF:
 com.sun.star.awt.XToolkit
 com.sun.star.awt.XWindow
@@ -368,15 +368,15 @@ com.sun.star.awt.WindowClass
 com.sun.star.frame.XLayoutManager
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/A_Hierarchy_of_Models
+LINK:Documentation/DevGuide/Forms#A_Hierarchy_of_Models
 DESCR:Forms - A Hierarchy of Models
 REF:
 com.sun.star.container.XIndexAccess
 com.sun.star.container.XChild
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#Document_Specific_Features
-DESCR:OfficeDev - Component - Models - Document Specific Features
+LINK:Documentation/DevGuide/Office_Development#Document_Specific_Features
+DESCR:Office Development - Component - Models - Document Specific Features
 REF:
 com.sun.star.sheet.SpreadsheetDocument
 com.sun.star.lang.XServiceInfo
@@ -387,8 +387,8 @@ com.sun.star.text.TextDocument
 com.sun.star.presentation.PresentationDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Indexes_and_Index_Marks#Indexes
-DESCR:Text - Indexes and Index Marks - Indexes
+LINK:Documentation/DevGuide/Text_Documents#Indexes
+DESCR:Text Documents - Indexes and Index Marks - Indexes
 REF:
 com.sun.star.text.BibliographyDataType
 com.sun.star.text.BibliographyDataField
@@ -415,26 +415,26 @@ com.sun.star.beans.PropertyValue
 com.sun.star.text.DocumentIndexes
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Forms
+LINK:Documentation/DevGuide/Forms#Forms
 DESCR:Forms - Forms
 REF:
 com.sun.star.form
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/The_Service_Manager_Component#Instantiation
-DESCR:ProUNO - Bridge - The Service Manager Component - Instantiation
+LINK:Documentation/DevGuide/Professional_UNO#Instantiation
+DESCR:Professional UNO - Bridge - The Service Manager Component - Instantiation
 REF:
 TOPIC:
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/WritingUNO/Implementing_without_Helpers#XInterface
-DESCR:WritingUNO - Implementing without Helpers - XInterface
+LINK:Documentation/DevGuide/Writing_UNO_Components#XInterface_2
+DESCR:Writing UNO Components - Implementing without Helpers - XInterface
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Usage
-DESCR:Database - Usage
+LINK:Documentation/DevGuide/Database_Access#Usage
+DESCR:Database Access - Usage
 REF:
 com.sun.star.sdbcx.Privilege
 com.sun.star.sdbc.ResultSetType
@@ -448,8 +448,8 @@ com.sun.star.sdb.CommandType
 com.sun.star.sdbc.XRowSet
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Instantiating_UNO_Services
-DESCR:ProUNO - Basic - Instantiating UNO Services
+LINK:Documentation/DevGuide/Professional_UNO#Instantiating_UNO_Services
+DESCR:Professional UNO - Basic - Instantiating UNO Services
 REF:
 com.sun.star.ucb.SimpleFileAccess
 com.sun.star.lang.XMultiServiceFactory
@@ -458,8 +458,8 @@ com.sun.star.lang.ServiceManager
 TOPIC:
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/Text/Shape_Objects_in_Text
-DESCR:Text - Shape Objects in Text
+LINK:Documentation/DevGuide/Text_Documents#Shape_Objects_in_Text
+DESCR:Text Documents - Shape Objects in Text
 REF:
 TOPIC:
 com.sun.star.text.TextEmbeddedObject
@@ -468,15 +468,15 @@ com.sun.star.text.Shape
 com.sun.star.text.TextGraphicObject
 com.sun.star.text.TextFrame
 
-LINK:Documentation/DevGuide/Forms/Automatic_Key_Generation
+LINK:Documentation/DevGuide/Forms#Automatic_Key_Generation
 DESCR:Forms - Automatic Key Generation
 REF:
 com.sun.star.sdb.XRowSetApproveBroadcaster
 TOPIC:
 com.sun.star.sdb.XRowSetApproveBroadcaster
 
-LINK:Documentation/DevGuide/ProUNO/Java/Getting_a_Service_Manager
-DESCR:ProUNO - Java - Getting a Service Manager
+LINK:Documentation/DevGuide/Professional_UNO#Getting_a_Service_Manager
+DESCR:Professional UNO - Java - Getting a Service Manager
 REF:
 com.sun.star.loader.Java
 com.sun.star.lang.MultiServiceFactory
@@ -495,41 +495,41 @@ com.sun.star.bridge.UnoUrlResolver
 com.sun.star.lang.XMultiComponentFactory
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/Drawings/Shapes
-DESCR:Drawings - Shapes
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Shapes
+DESCR:Drawings and Presentations - Shapes
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.drawing.RectangleShape
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Component_Context#ComponentContext_API
-DESCR:ProUNO - Component Context - ComponentContext API
+LINK:Documentation/DevGuide/Professional_UNO#ComponentContext_API
+DESCR:Professional UNO - Component Context - ComponentContext API
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.lang.XMultiComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Implementing_without_Helpers#XTypeProvider
-DESCR:WritingUNO - Implementing without Helpers - XTypeProvider
+LINK:Documentation/DevGuide/Writing_UNO_Components#XTypeProvider_2
+DESCR:Writing UNO Components - Implementing without Helpers - XTypeProvider
 REF:
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/AppendixC/The_WebDAV_Content_Provider#Creation_of_New_DCP_Contents
-DESCR:AppendixC - The WebDAV Content Provider - Creation of New DCP Contents
+LINK:Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_DCP_Contents
+DESCR:Appendix C. Universal Content Providers - The WebDAV Content Provider - Creation of New DCP Contents
 REF:
 com.sun.star.ucb.XContentCreator
 TOPIC:
 com.sun.star.ucb.XContentCreator
 
-LINK:Documentation/DevGuide/Database/Database_Design#Determining_Feature_Support
-DESCR:Database - Database Design - Retrieving Information about a Database - Determining Feature Support
+LINK:Documentation/DevGuide/Database_Access#Determining_Feature_Support
+DESCR:Database Access - Database Design - Retrieving Information about a Database - Determining Feature Support
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component
-DESCR:OfficeDev - Writing the Filtering Component
+LINK:Documentation/DevGuide/Office_Development#Writing_the_Filtering_Component
+DESCR:Office Development - Writing the Filtering Component
 REF:
 com.sun.star.xml.XMLExportFilter
 com.sun.star.xml.ImportFilter
@@ -542,20 +542,20 @@ com.sun.star.xml.ExportFilter
 com.sun.star.xml.sax.XDocumentHandler
 com.sun.star.xml.XMLImportFilter
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Using_Automation_Objects_from_UNO#Properties_with_Arguments
-DESCR:ProUNO - Bridge - Using Automation Objects from UNO - Instantiation - Properties with Arguments
+LINK:Documentation/DevGuide/Professional_UNO#Properties_with_Arguments
+DESCR:Professional UNO - Bridge - Using Automation Objects from UNO - Instantiation - Properties with Arguments
 REF:
 com.sun.star.bridge.oleautomation.PropertyPutArgument
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Command_Line_Registry_Tools#Component_Registration_Tool
-DESCR:WritingUNO - Command Line Registry Tools - Component Registration Tool
+LINK:Documentation/DevGuide/Writing_UNO_Components#Component_Registration_Tool
+DESCR:Writing UNO Components - Command Line Registry Tools - Component Registration Tool
 REF:
 com.sun.star.loader.SharedLibrary
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Implementation
-DESCR:WritingUNO - Implementation
+LINK:Documentation/DevGuide/Writing_UNO_Components#Implementation
+DESCR:Writing UNO Components - Implementation
 REF:
 com.sun.star.frame.ProtocolHandler
 com.sun.star.lang.XInitialization
@@ -569,7 +569,7 @@ TOPIC:
 com.sun.star.frame.ProtocolHandler
 com.sun.star.frame.XDispatchProvider
 
-LINK:Documentation/DevGuide/Forms/Data_Validation
+LINK:Documentation/DevGuide/Forms#Data_Validation
 DESCR:Forms - Data Validation
 REF:
 com.sun.star.form.validation.XValidator
@@ -578,34 +578,34 @@ com.sun.star.form.XUpdateListener
 com.sun.star.sdb.XRowSetApproveListener
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/The_Exporter#Exporter_Filtering
-DESCR:OfficeDev - The Exporter - Exporter Filtering
+LINK:Documentation/DevGuide/Office_Development#Exporter_Filtering
+DESCR:Office Development - The Exporter - Exporter Filtering
 REF:
 com.sun.star.xml.sax.XDocumentHandler
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/General_Structure
-DESCR:Basic - General Structure
+LINK:Documentation/DevGuide/LibreOffice_Basic#General_Structure
+DESCR:LibreOffice Basic - General Structure
 REF:
 com.sun.star.io.XInputStreamProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Using_Services#Using_Properties
-DESCR:FirstSteps - Using Services - Using Properties
+LINK:Documentation/DevGuide/First_Steps#Using_Properties
+DESCR:First Steps - Using Services - Using Properties
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.beans.XMultiPropertySet
 TOPIC:
 com.sun.star.beans.XPropertySet
 
-LINK:Documentation/DevGuide/Drawings/Storing
-DESCR:Drawings - Storing
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Storing
+DESCR:Drawings and Presentations - Storing
 REF:
 com.sun.star.frame.XStorable
 TOPIC:
 com.sun.star.frame.XStorable
 
-LINK:Documentation/DevGuide/Charts/Prerequisites
+LINK:Documentation/DevGuide/Charts#Prerequisites
 DESCR:Charts - Prerequisites
 REF:
 com.sun.star.lang.XServiceInfo
@@ -616,20 +616,20 @@ com.sun.star.chart.Diagram
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component#XImportFilter
-DESCR:OfficeDev - Writing the Filtering Component - XImportFilter
+LINK:Documentation/DevGuide/Office_Development#XImportFilter
+DESCR:Office Development - Writing the Filtering Component - XImportFilter
 REF:
 com.sun.star.xml.XMLImportFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Data_Types
-DESCR:ProUNO - Data Types
+LINK:Documentation/DevGuide/Professional_UNO#Data_Types
+DESCR:Professional UNO - Data Types
 REF:
 TOPIC:
 com.sun.star.uno.TypeClass
 
-LINK:Documentation/DevGuide/UCB/Services_and_Interfaces
-DESCR:UCB - Services and Interfaces
+LINK:Documentation/DevGuide/Universal_Content_Broker#Services_and_Interfaces
+DESCR:Universal Content Broker - Services and Interfaces
 REF:
 com.sun.star.ucb.XContentProviderManager
 com.sun.star.ucb.XContent
@@ -651,22 +651,22 @@ com.sun.star.beans.XPropertyContainer
 com.sun.star.ucb.XCommandProcessor2
 com.sun.star.ucb.XCommandProcessor
 
-LINK:Documentation/DevGuide/Spreadsheets/Function_Descriptions
-DESCR:Spreadsheets - Function Descriptions
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Function_Descriptions
+DESCR:Spreadsheet Documents - Function Descriptions
 REF:
 com.sun.star.sheet.XAddIn
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Creating_Frames_Manually#Frame_Creation
-DESCR:OfficeDev - Creating Frames Manually - Frame Creation
+LINK:Documentation/DevGuide/Office_Development#Frame_Creation
+DESCR:Office Development - Creating Frames Manually - Frame Creation
 REF:
 com.sun.star.frame.Frame
 TOPIC:
 com.sun.star.frame.Frame
 com.sun.star.frame.XFrame
 
-LINK:Documentation/DevGuide/GUI/Font-specific_Properties
-DESCR:GUI - Font-specific Properties
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Font-specific_Properties
+DESCR:Graphical User Interfaces - Font-specific Properties
 REF:
 com.sun.star.awt.FontUnderline
 com.sun.star.awt.FontType
@@ -679,29 +679,29 @@ com.sun.star.awt.FontEmphasisMark
 com.sun.star.awt.CharSet
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Indexed_Cells_and_Cell_Ranges
-DESCR:Text - Indexed Cells and Cell Ranges
+LINK:Documentation/DevGuide/Text_Documents#Indexed_Cells_and_Cell_Ranges
+DESCR:Text Documents - Indexed Cells and Cell Ranges
 REF:
 com.sun.star.table.XCell
 com.sun.star.text.XText
 com.sun.star.table.XCellRange
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Defining_an_Exception
-DESCR:WritingUNO - Defining an Exception
+LINK:Documentation/DevGuide/Writing_UNO_Components#Defining_an_Exception
+DESCR:Writing UNO Components - Defining an Exception
 REF:
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_C++_Bridges#Binary_UNO_Interfaces
-DESCR:AdvUNO - UNO C++ Bridges - Binary UNO Interfaces
+LINK:Documentation/DevGuide/Advanced_UNO#Binary_UNO_Interfaces
+DESCR:Advanced UNO - UNO C++ Bridges - Binary UNO Interfaces
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/The_XComponent_Interface
-DESCR:ProUNO - The XComponent Interface
+LINK:Documentation/DevGuide/Professional_UNO#The_XComponent_Interface
+DESCR:Professional UNO - The XComponent Interface
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.lang.XEventListener
@@ -709,8 +709,8 @@ com.sun.star.lang.DisposedException
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/File_IO
-DESCR:Basic - File IO
+LINK:Documentation/DevGuide/LibreOffice_Basic#File_IO
+DESCR:LibreOffice Basic - File IO
 REF:
 com.sun.star.io.XActiveDataSource
 com.sun.star.io.XStream
@@ -727,8 +727,8 @@ com.sun.star.ucb.XSimpleFileAccess
 com.sun.star.io.XSeekable
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XViewDataSupplier
-DESCR:OfficeDev - Component - Models - XViewDataSupplier
+LINK:Documentation/DevGuide/Office_Development#XViewDataSupplier
+DESCR:Office Development - Component - Models - XViewDataSupplier
 REF:
 com.sun.star.document.XViewDataSupplier
 com.sun.star.container.XIndexAccess
@@ -736,7 +736,7 @@ com.sun.star.beans.PropertyValue
 TOPIC:
 com.sun.star.document.XViewDataSupplier
 
-LINK:Documentation/DevGuide/Charts/Accessing_Existing_Chart_Documents
+LINK:Documentation/DevGuide/Charts#Accessing_Existing_Chart_Documents
 DESCR:Charts - Accessing Existing Chart Documents
 REF:
 com.sun.star.table.XTableChartsSupplier
@@ -745,8 +745,8 @@ com.sun.star.drawing.XDrawPage
 com.sun.star.sheet.Spreadsheet
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Accessing_a_UCB_Content
-DESCR:UCB - Accessing a UCB Content
+LINK:Documentation/DevGuide/Universal_Content_Broker#Accessing_a_UCB_Content
+DESCR:Universal Content Broker - Accessing a UCB Content
 REF:
 com.sun.star.ucb.XContentProvider
 com.sun.star.ucb.XContentIdentifierFactory
@@ -754,8 +754,8 @@ TOPIC:
 com.sun.star.ucb.XContentProvider
 com.sun.star.ucb.XContentIdentifierFactory
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XTextConversion
-DESCR:OfficeDev - Implementing a New Locale - XTextConversion
+LINK:Documentation/DevGuide/Office_Development#XTextConversion
+DESCR:Office Development - Implementing a New Locale - XTextConversion
 REF:
 com.sun.star.linguistic2.XConversionDictionary
 com.sun.star.i18n.XTextConversion
@@ -763,8 +763,8 @@ com.sun.star.i18n.TextConversion
 TOPIC:
 com.sun.star.i18n.XTextConversion
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XCalendar
-DESCR:OfficeDev - Overview and Using the API - XCalendar
+LINK:Documentation/DevGuide/Office_Development#XCalendar
+DESCR:Office Development - Overview and Using the API - XCalendar
 REF:
 com.sun.star.i18n.XLocaleData
 com.sun.star.i18n.Calendar
@@ -772,16 +772,16 @@ com.sun.star.i18n.XCalendar
 TOPIC:
 com.sun.star.i18n.XCalendar
 
-LINK:Documentation/DevGuide/UCB/Copying%2C_Moving_and_Linking
-DESCR:UCB - Copying, Moving and Linking
+LINK:Documentation/DevGuide/Universal_Content_Broker#Copying%2C_Moving_and_Linking
+DESCR:Universal Content Broker - Copying, Moving and Linking
 REF:
 com.sun.star.ucb.GlobalTransferCommandArgument
 com.sun.star.ucb.XCommandProcessor
 com.sun.star.ucb.UniversalContentBroker
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Handling_Drawing_Document_Files#Creating_and_Loading_Drawing_Documents
-DESCR:Drawings - Handling Drawing Document Files - Creating and Loading Drawing Documents
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Creating_and_Loading_Drawing_Documents
+DESCR:Drawings and Presentations - Handling Drawing Document Files - Creating and Loading Drawing Documents
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.lang.XComponent
@@ -789,14 +789,14 @@ com.sun.star.document.MediaDescriptor
 com.sun.star.frame.Desktop
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Pattern_Field
-DESCR:GUI - Pattern Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Pattern_Field
+DESCR:Graphical User Interfaces - Pattern Field
 REF:
 com.sun.star.awt.UnoControlPatternField
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Named_Table_Cells_in_Rows%2C_Columns_and_the_Table_Cursor
-DESCR:Text - Named Table Cells in Rows, Columns and the Table Cursor
+LINK:Documentation/DevGuide/Text_Documents#Named_Table_Cells_in_Rows%2C_Columns_and_the_Table_Cursor
+DESCR:Text Documents - Named Table Cells in Rows, Columns and the Table Cursor
 REF:
 com.sun.star.table.XTableColumns
 com.sun.star.text.TableColumnSeparator
@@ -815,7 +815,7 @@ com.sun.star.text.XText
 com.sun.star.style.CharacterPropertiesComplex
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/3-D_Charts
+LINK:Documentation/DevGuide/Charts#3-D_Charts
 DESCR:Charts - 3-D Charts
 REF:
 com.sun.star.chart.BarDiagram
@@ -826,8 +826,8 @@ TOPIC:
 com.sun.star.chart.Dim3DDiagram
 com.sun.star.chart.Chart3DBarProperties
 
-LINK:Documentation/DevGuide/OfficeDev/Frames#Components_in_Frames
-DESCR:OfficeDev - Frames - Components in Frames
+LINK:Documentation/DevGuide/Office_Development#Components_in_Frames
+DESCR:Office Development - Frames - Components in Frames
 REF:
 com.sun.star.frame.Controller
 com.sun.star.frame.XController
@@ -836,8 +836,8 @@ com.sun.star.awt.XWindow
 com.sun.star.frame.XDispatchProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Controllers#Document_Specific_Controller_Services
-DESCR:OfficeDev - Component - Controllers - Document Specific Controller Services
+LINK:Documentation/DevGuide/Office_Development#Document_Specific_Controller_Services
+DESCR:Office Development - Component - Controllers - Document Specific Controller Services
 REF:
 com.sun.star.frame.Controller
 com.sun.star.sheet.SpreadsheetViewSettings
@@ -855,8 +855,8 @@ com.sun.star.text.TextDocumentView
 com.sun.star.drawing.DrawingDocumentDrawView
 com.sun.star.sheet.SpreadsheetView
 
-LINK:Documentation/DevGuide/Text/Navigating#Locating_Text_Contents
-DESCR:Text - Navigating - Locating Text Contents
+LINK:Documentation/DevGuide/Text_Documents#Locating_Text_Contents
+DESCR:Text Documents - Navigating - Locating Text Contents
 REF:
 com.sun.star.text.XTextTablesSupplier
 com.sun.star.text.XTextSectionsSupplier
@@ -874,16 +874,16 @@ com.sun.star.document.XRedlinesSupplier
 TOPIC:
 com.sun.star.text.XTextContent
 
-LINK:Documentation/DevGuide/Spreadsheets/Handling_Array_Formulas
-DESCR:Spreadsheets - Handling Array Formulas
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Handling_Array_Formulas
+DESCR:Spreadsheet Documents - Handling Array Formulas
 REF:
 com.sun.star.table.XCell
 com.sun.star.sheet.XArrayFormulaRange
 TOPIC:
 com.sun.star.sheet.XArrayFormulaRange
 
-LINK:Documentation/DevGuide/OfficeDev/Filtering_Process
-DESCR:OfficeDev - Filtering Process
+LINK:Documentation/DevGuide/Office_Development#Filtering_Process
+DESCR:Office Development - Filtering Process
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.document.FilterFactory
@@ -897,13 +897,13 @@ com.sun.star.frame.FrameLoader
 com.sun.star.document.ExportFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Events#Paint_Listener
-DESCR:GUI - Events - Paint Listener
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Paint_Listener
+DESCR:Graphical User Interfaces - Events - Paint Listener
 REF:
 com.sun.star.awt.XPaintListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Models_and_Views_for_Form_Controls
+LINK:Documentation/DevGuide/Forms#Models_and_Views_for_Form_Controls
 DESCR:Forms - Models and Views for Form Controls
 REF:
 com.sun.star.form.component
@@ -915,8 +915,8 @@ TOPIC:
 com.sun.star.awt.UnoControlModel
 com.sun.star.awt.UnoControl
 
-LINK:Documentation/DevGuide/OfficeDev/Common_Application_Features#Clipboard
-DESCR:OfficeDev - Common Application Features - Clipboard
+LINK:Documentation/DevGuide/Office_Development#Clipboard
+DESCR:Office Development - Common Application Features - Clipboard
 REF:
 com.sun.star.datatransfer.clipboard.SystemClipboard
 com.sun.star.datatransfer.XTransferable
@@ -925,8 +925,8 @@ TOPIC:
 com.sun.star.datatransfer.clipboard.SystemClipboard
 com.sun.star.datatransfer.clipboard.XClipboard
 
-LINK:Documentation/DevGuide/Text/Shape_Objects_in_Text#Drawing_Shapes
-DESCR:Text - Shape Objects in Text - null - Drawing Shapes
+LINK:Documentation/DevGuide/Text_Documents#Drawing_Shapes
+DESCR:Text Documents - Shape Objects in Text - Drawing Shapes
 REF:
 com.sun.star.drawing.XDrawPageSupplier
 com.sun.star.text.Shape
@@ -934,29 +934,29 @@ com.sun.star.text.XTextContent
 com.sun.star.drawing.Shape
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Custom_Path_Variables#Rules
-DESCR:OfficeDev - Custom Path Variables - Rules
+LINK:Documentation/DevGuide/Office_Development#Rules
+DESCR:Office Development - Custom Path Variables - Rules
 REF:
 com.sun.star.util.XStringSubstitution
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Control_Models_and_Shapes
+LINK:Documentation/DevGuide/Forms#Control_Models_and_Shapes
 DESCR:Forms - Control Models and Shapes
 REF:
 com.sun.star.drawing.ControlShape
 TOPIC:
 com.sun.star.drawing.ControlShape
 
-LINK:Documentation/DevGuide/Database/Driver_Specifics#Driver_Specifics
-DESCR:Database - Driver Specifics - Driver Specifics
+LINK:Documentation/DevGuide/Database_Access#Driver_Specifics
+DESCR:Database Access - Driver Specifics - Driver Specifics
 REF:
 com.sun.star.sdbc.Driver
 com.sun.star.sdbcx.Driver
 TOPIC:
 com.sun.star.sdbcx.Driver
 
-LINK:Documentation/DevGuide/FirstSteps/Objects%2C_Interfaces%2C_and_Services#Services
-DESCR:FirstSteps - Objects, Interfaces, and Services - Services
+LINK:Documentation/DevGuide/First_Steps#Services
+DESCR:First Steps - Objects, Interfaces, and Services - Services
 REF:
 com.sun.star.drawing.DrawingDocument
 com.sun.star.bridge.XUnoUrlResolver
@@ -969,7 +969,7 @@ com.sun.star.frame.Frame
 com.sun.star.text.TextDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/How_Add-Ins_Work
+LINK:Documentation/DevGuide/Charts#How_Add-Ins_Work
 DESCR:Charts - How Add-Ins Work
 REF:
 com.sun.star.lang.XInitialization
@@ -978,22 +978,22 @@ com.sun.star.util.XRefreshable
 TOPIC:
 com.sun.star.util.XRefreshable
 
-LINK:Documentation/DevGuide/FirstSteps/Using_Services
-DESCR:FirstSteps - Using Services
+LINK:Documentation/DevGuide/First_Steps#Using_Services
+DESCR:First Steps - Using Services
 REF:
 com.sun.star.document.OfficeDocument
 com.sun.star.text.TextDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XLocaleData
-DESCR:OfficeDev - Overview and Using the API - XLocaleData
+LINK:Documentation/DevGuide/Office_Development#XLocaleData
+DESCR:Office Development - Overview and Using the API - XLocaleData
 REF:
 com.sun.star.i18n.XLocaleData
 TOPIC:
 com.sun.star.i18n.XLocaleData
 
-LINK:Documentation/DevGuide/Text/Link_Targets
-DESCR:Text - Link Targets
+LINK:Documentation/DevGuide/Text_Documents#Link_Targets
+DESCR:Text Documents - Link Targets
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.document.XLinkTargetSupplier
@@ -1002,14 +1002,14 @@ com.sun.star.awt.XBitmap
 TOPIC:
 com.sun.star.document.XLinkTargetSupplier
 
-LINK:Documentation/DevGuide/WritingUNO/Defining_an_Interface
-DESCR:WritingUNO - Defining an Interface
+LINK:Documentation/DevGuide/Writing_UNO_Components#Defining_an_Interface
+DESCR:Writing UNO Components - Defining an Interface
 REF:
 com.sun.star.document.XFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Function_Handling#Recently_Used_Functions
-DESCR:Spreadsheets - Function Handling - Recently Used Functions
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Recently_Used_Functions
+DESCR:Spreadsheet Documents - Function Handling - Recently Used Functions
 REF:
 com.sun.star.sheet.FunctionDescriptions
 com.sun.star.sheet.RecentFunctions
@@ -1017,8 +1017,8 @@ com.sun.star.sheet.XRecentFunctions
 TOPIC:
 com.sun.star.sheet.RecentFunctions
 
-LINK:Documentation/DevGuide/Database/Connection_Pooling
-DESCR:Database - Connection Pooling
+LINK:Documentation/DevGuide/Database_Access#Connection_Pooling
+DESCR:Database Access - Connection Pooling
 REF:
 com.sun.star.sdb.Connection
 com.sun.star.sdbc.XDriverManager
@@ -1029,14 +1029,14 @@ TOPIC:
 com.sun.star.sdbc.XPooledConnection
 com.sun.star.sdbc.ConnectionPool
 
-LINK:Documentation/DevGuide/ProUNO/Interfaces
-DESCR:ProUNO - Interfaces
+LINK:Documentation/DevGuide/Professional_UNO#Interfaces
+DESCR:Professional UNO - Interfaces
 REF:
 com.sun.star.uno.XInterface
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/External_List_Sources
+LINK:Documentation/DevGuide/Forms#External_List_Sources
 DESCR:Forms - External List Sources
 REF:
 com.sun.star.form.binding.XListEntrySource
@@ -1047,22 +1047,22 @@ TOPIC:
 com.sun.star.form.binding.XListEntrySink
 com.sun.star.form.binding.XListEntrySource
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Using_Automation_Objects_from_UNO#Instantiation
-DESCR:ProUNO - Bridge - Using Automation Objects from UNO - Instantiation
+LINK:Documentation/DevGuide/Professional_UNO#Instantiation_2
+DESCR:Professional UNO - Bridge - Using Automation Objects from UNO - Instantiation
 REF:
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.bridge.oleautomation.Factory
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XTextConversion
-DESCR:OfficeDev - Overview and Using the API - XTextConversion
+LINK:Documentation/DevGuide/Office_Development#XTextConversion
+DESCR:Office Development - Overview and Using the API - XTextConversion
 REF:
 com.sun.star.i18n.XTextConversion
 TOPIC:
 com.sun.star.i18n.XTextConversion
 
-LINK:Documentation/DevGuide/GUI/Text_Field
-DESCR:GUI - Text Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Text_Field
+DESCR:Graphical User Interfaces - Text Field
 REF:
 com.sun.star.awt.UnoControlEdit
 com.sun.star.awt.LineEndFormat
@@ -1070,15 +1070,15 @@ com.sun.star.awt.XTextComponent
 com.sun.star.awt.UnoControlEditModel
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Services#Referencing_other_Services
-DESCR:ProUNO - Services - Referencing other Services
+LINK:Documentation/DevGuide/Professional_UNO#Referencing_other_Services
+DESCR:Professional UNO - Services - Referencing other Services
 REF:
 com.sun.star.text.TextContent
 com.sun.star.text.Paragraph
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#Introspection
-DESCR:AdvUNO - UNO Reflection API - CoreReflection Service - Introspection
+LINK:Documentation/DevGuide/Advanced_UNO#Introspection
+DESCR:Advanced UNO - UNO Reflection API - CoreReflection Service - Introspection
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.container.XIndexAccess
@@ -1088,14 +1088,14 @@ com.sun.star.beans.XIntrospectionAccess
 com.sun.star.beans.Introspection
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XComponent#Disposing_of_an_XComponent
-DESCR:WritingUNO - XComponent - Disposing of an XComponent
+LINK:Documentation/DevGuide/Writing_UNO_Components#Disposing_of_an_XComponent
+DESCR:Writing UNO Components - XComponent - Disposing of an XComponent
 REF:
 com.sun.star.lang.DisposedException
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Getting_Information_about_UNO_Objects#Inspecting_interfaces_during_debugging
-DESCR:ProUNO - Basic - Getting Information about UNO Objects - Inspecting interfaces during debugging
+LINK:Documentation/DevGuide/Professional_UNO#Inspecting_interfaces_during_debugging
+DESCR:Professional UNO - Basic - Getting Information about UNO Objects - Inspecting interfaces during debugging
 REF:
 com.sun.star.container.XElementAccess
 com.sun.star.container.XEnumerationAccess
@@ -1103,20 +1103,20 @@ com.sun.star.container.XSet
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Multiple_Operations
-DESCR:Spreadsheets - Multiple Operations
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Multiple_Operations
+DESCR:Spreadsheet Documents - Multiple Operations
 REF:
 TOPIC:
 com.sun.star.sheet.XMultipleOperation
 
-LINK:Documentation/DevGuide/Basic/HorizontalVertical_Line
-DESCR:Basic - HorizontalVertical Line
+LINK:Documentation/DevGuide/LibreOffice_Basic#HorizontalVertical_Line
+DESCR:LibreOffice Basic - HorizontalVertical Line
 REF:
 com.sun.star.awt.UnoControlFixedLine
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Class_Definition_with_Helper_Template_Classes
-DESCR:WritingUNO - C++ - Class Definition with Helper Template Classes
+LINK:Documentation/DevGuide/Writing_UNO_Components#Class_Definition_with_Helper_Template_Classes
+DESCR:Writing UNO Components - C++ - Class Definition with Helper Template Classes
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.lang.XComponent
@@ -1126,8 +1126,8 @@ com.sun.star.uno.XWeak
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Using_Dialogs_in_Components#Accept_events_created_by_dialog_controls
-DESCR:WritingUNO - Using Dialogs in Components - Accept events created by dialog controls
+LINK:Documentation/DevGuide/Writing_UNO_Components#Accept_events_created_by_dialog_controls
+DESCR:Writing UNO Components - Using Dialogs in Components - Accept events created by dialog controls
 REF:
 com.sun.star.test.XTestDialogHandler
 com.sun.star.awt.XActionListener
@@ -1137,14 +1137,14 @@ com.sun.star.lang.XTypeProvider
 com.sun.star.beans.Introspection
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/C++/C++_Component
-DESCR:WritingUNO - C++ - C++ Component
+LINK:Documentation/DevGuide/Writing_UNO_Components#C++_Component
+DESCR:Writing UNO Components - C++ - C++ Component
 REF:
 com.sun.star.lang.XInitialization
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Frames#Frame_Actions
-DESCR:OfficeDev - Component - Frames - XFrame - Frame Actions
+LINK:Documentation/DevGuide/Office_Development#Frame_Actions
+DESCR:Office Development - Component - Frames - XFrame - Frame Actions
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.frame.FrameActionEvent
@@ -1157,14 +1157,14 @@ com.sun.star.frame.FrameLoader
 com.sun.star.frame.XFrame
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Currency_Field
-DESCR:Basic - Currency Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Currency_Field
+DESCR:LibreOffice Basic - Currency Field
 REF:
 com.sun.star.awt.UnoControlCurrencyField
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Implementation
-DESCR:WritingUNO - Jobs - Implementation
+LINK:Documentation/DevGuide/Writing_UNO_Components#Implementation_2
+DESCR:Writing UNO Components - Jobs - Implementation
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.awt.Toolkit
@@ -1177,14 +1177,14 @@ com.sun.star.task.XJob
 com.sun.star.task.Job
 com.sun.star.task.AsyncJob
 
-LINK:Documentation/DevGuide/UCB/Preconfigured_UCBs
-DESCR:UCB - Preconfigured UCBs
+LINK:Documentation/DevGuide/Universal_Content_Broker#Preconfigured_UCBs
+DESCR:Universal Content Broker - Preconfigured UCBs
 REF:
 com.sun.star.ucb.UniversalContentBroker
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Modules
-DESCR:ProUNO - Modules
+LINK:Documentation/DevGuide/Professional_UNO#Modules
+DESCR:Professional UNO - Modules
 REF:
 com.sun.star.table
 com.sun.star.sheet
@@ -1195,21 +1195,21 @@ com.sun.star.drawing
 com.sun.star.uno
 TOPIC:
 
-LINK:Documentation/DevGuide/Scripting/How_the_Scripting_Framework_Works
-DESCR:Scripting - How the Scripting Framework Works
+LINK:Documentation/DevGuide/Scripting_Framework#How_the_Scripting_Framework_works
+DESCR:Scripting Framework - How the Scripting Framework Works
 REF:
 com.sun.star.script.provider.LanguageScriptProvider
 com.sun.star.script.provider.XScript
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Example:_Adding_a_New_Spreadsheet
-DESCR:Spreadsheets - Example: Adding a New Spreadsheet
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Example:_Adding_a_New_Spreadsheet
+DESCR:Spreadsheet Documents - Example: Adding a New Spreadsheet
 REF:
 com.sun.star.lang.XComponent
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus#Querying_a_Menu_Structure
-DESCR:WritingUNO - Intercepting Context Menus - Writing an Interceptor - Querying a Menu Structure
+LINK:Documentation/DevGuide/Writing_UNO_Components#Querying_a_Menu_Structure
+DESCR:Writing UNO Components - Intercepting Context Menus - Writing an Interceptor - Querying a Menu Structure
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.beans.XPropertySet
@@ -1221,46 +1221,46 @@ com.sun.star.container.XIndexContainer
 com.sun.star.awt.XBitmap
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Using_Prepared_Statements#Supplying_Values_for_PreparedStatement_Parameters
-DESCR:Database - Using Prepared Statements - Supplying Values for PreparedStatement Parameters
+LINK:Documentation/DevGuide/Database_Access#Supplying_Values_for_PreparedStatement_Parameters
+DESCR:Database Access - Using Prepared Statements - Supplying Values for PreparedStatement Parameters
 REF:
 com.sun.star.sdbc.XParameters
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Driver_Statements#PreparedStatement
-DESCR:Database - Driver Statements - PreparedStatement
+LINK:Documentation/DevGuide/Database_Access#PreparedStatement
+DESCR:Database Access - Driver Statements - PreparedStatement
 REF:
 com.sun.star.sdbc.XParameters
 com.sun.star.sdbc.XResultSetMetaDataSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Settings
-DESCR:Spreadsheets - Settings
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Settings
+DESCR:Spreadsheet Documents - Settings
 REF:
 com.sun.star.sheet.GlobalSheetSettings
 com.sun.star.beans.XPropertySet
 TOPIC:
 com.sun.star.sheet.GlobalSheetSettings
 
-LINK:Documentation/DevGuide/WritingUNO/XWeak
-DESCR:WritingUNO - XWeak
+LINK:Documentation/DevGuide/Writing_UNO_Components#XWeak
+DESCR:Writing UNO Components - XWeak
 REF:
 TOPIC:
 com.sun.star.uno.XWeak
 
-LINK:Documentation/DevGuide/GUI/Graphical_User_Interfaces#Basic_Concepts
-DESCR:GUI - Graphical User Interfaces - Basic Concepts
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Basic_Concepts
+DESCR:Graphical User Interfaces - Graphical User Interfaces - Basic Concepts
 REF:
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Events#Focus_Listener
-DESCR:GUI - Events - Focus Listener
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Focus_Listener
+DESCR:Graphical User Interfaces - Events - Focus Listener
 REF:
 com.sun.star.awt.XFocusListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Loadable_Forms
+LINK:Documentation/DevGuide/Forms#Loadable_Forms
 DESCR:Forms - Loadable Forms
 REF:
 com.sun.star.sdbc.XRowSetListener
@@ -1271,14 +1271,14 @@ TOPIC:
 com.sun.star.form.XLoadable
 com.sun.star.form.XLoadListener
 
-LINK:Documentation/DevGuide/Database/The_SDBC_Driver_for_dBase
-DESCR:Database - The SDBC Driver for dBase
+LINK:Documentation/DevGuide/Database_Access#The_SDBC_Driver_for_dBase
+DESCR:Database Access - The SDBC Driver for dBase
 REF:
 com.sun.star.sdbcx.Driver
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Graphic_Objects
-DESCR:Text - Graphic Objects
+LINK:Documentation/DevGuide/Text_Documents#Graphic_Objects
+DESCR:Text Documents - Graphic Objects
 REF:
 com.sun.star.awt.Size
 com.sun.star.text.BaseFrame
@@ -1289,15 +1289,15 @@ com.sun.star.container.XIndexContainer
 com.sun.star.text.GraphicCrop
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Overall_Document_Features#Numbering_Styles
-DESCR:Text - Overall Document Features - Styles - Numbering Styles
+LINK:Documentation/DevGuide/Text_Documents#Numbering_Styles
+DESCR:Text Documents - Overall Document Features - Styles - Numbering Styles
 REF:
 com.sun.star.text.NumberingStyle
 com.sun.star.lang.XMultiServiceFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/PreparedStatement_From_DataSource_Queries
-DESCR:Database - PreparedStatement From DataSource Queries
+LINK:Documentation/DevGuide/Database_Access#PreparedStatement_From_DataSource_Queries
+DESCR:Database Access - PreparedStatement From DataSource Queries
 REF:
 com.sun.star.sdb.XCommandPreparation
 com.sun.star.sdb.DataSource
@@ -1306,20 +1306,20 @@ TOPIC:
 com.sun.star.sdb.XCommandPreparation
 com.sun.star.sdb.CommandType
 
-LINK:Documentation/DevGuide/Text/Settings#Creating_Document_Settings
-DESCR:Text - Settings - Creating Document Settings
+LINK:Documentation/DevGuide/Text_Documents#Creating_Document_Settings
+DESCR:Text Documents - Settings - Creating Document Settings
 REF:
 com.sun.star.document.Settings
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Any
-DESCR:FirstSteps - Any
+LINK:Documentation/DevGuide/First_Steps#Any
+DESCR:First Steps - Any
 REF:
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/Implementing_UNO_Language_Bindings#UNO_Bridge
-DESCR:AdvUNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - UNO Bridge
+LINK:Documentation/DevGuide/Advanced_UNO#UNO_Bridge
+DESCR:Advanced UNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - UNO Bridge
 REF:
 com.sun.star.reflection.CoreReflection
 com.sun.star.script.XInvocation
@@ -1327,15 +1327,15 @@ com.sun.star.script.Converter
 com.sun.star.script.Invocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Data_Aware_Controls
+LINK:Documentation/DevGuide/Forms#Data_Aware_Controls
 DESCR:Forms - Data Aware Controls
 REF:
 com.sun.star.form.DataAwareControlModel
 TOPIC:
 com.sun.star.form.DataAwareControlModel
 
-LINK:Documentation/DevGuide/Database/Queries
-DESCR:Database - Queries
+LINK:Documentation/DevGuide/Database_Access#Queries
+DESCR:Database Access - Queries
 REF:
 com.sun.star.sdb.XCommandPreparation
 com.sun.star.sdb.RowSet
@@ -1343,22 +1343,22 @@ com.sun.star.sdb.QueryDefinition
 TOPIC:
 com.sun.star.sdb.QueryDefinition
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Exception_Handling
-DESCR:ProUNO - Basic - Exception Handling
+LINK:Documentation/DevGuide/Professional_UNO#Exception_Handling_2
+DESCR:Professional UNO - Basic - Exception Handling
 REF:
 com.sun.star.container.XNameAccess
 TOPIC:
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
 
-LINK:Documentation/DevGuide/ProUNO/Differences_Between_the_Lifetime_of_C++_and_Java_Objects
-DESCR:ProUNO - Differences Between the Lifetime of C++ and Java Objects
+LINK:Documentation/DevGuide/Professional_UNO#Differences_Between_the_Lifetime_of_C++_and_Java_Objects
+DESCR:Professional UNO - Differences Between the Lifetime of C++ and Java Objects
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Shape_Objects_in_Text#Base_Frames
-DESCR:Text - Shape Objects in Text - Base Frames
+LINK:Documentation/DevGuide/Text_Documents#Base_Frames
+DESCR:Text Documents - Shape Objects in Text - Base Frames
 REF:
 com.sun.star.awt.Size
 com.sun.star.text.TextEmbeddedObjects
@@ -1388,7 +1388,7 @@ com.sun.star.text.BaseFrameProperties
 com.sun.star.text.HoriOrientation
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Common_Parts_of_all_Chart_Types#Data_Series_and_Data_Points
+LINK:Documentation/DevGuide/Charts#Data_Series_and_Data_Points
 DESCR:Charts - Common Parts of all Chart Types - Data Series and Data Points
 REF:
 com.sun.star.chart.XYDiagram
@@ -1399,8 +1399,8 @@ com.sun.star.drawing.LineProperties
 com.sun.star.style.CharacterProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Grouping%2C_Combining_and_Binding
-DESCR:Drawings - Grouping, Combining and Binding
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Grouping%2C_Combining_and_Binding
+DESCR:Drawings and Presentations - Grouping, Combining and Binding
 REF:
 com.sun.star.drawing.XShapeBinder
 com.sun.star.drawing.GroupShape
@@ -1418,40 +1418,40 @@ com.sun.star.drawing.ShapeCollection
 com.sun.star.drawing.XShapeGrouper
 com.sun.star.drawing.XShapeCombiner
 
-LINK:Documentation/DevGuide/GUI/Common_Workflow_to_add_Controls
-DESCR:GUI - Common Workflow to add Controls
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Common_Workflow_to_add_Controls
+DESCR:Graphical User Interfaces - Common Workflow to add Controls
 REF:
 com.sun.star.beans.XMultiPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Common_Types#Enum_Types_and_Groups_of_Constants
-DESCR:FirstSteps - Common Types - Enum Types and Groups of Constants
+LINK:Documentation/DevGuide/First_Steps#Enum_Types_and_Groups_of_Constants
+DESCR:First Steps - Common Types - Enum Types and Groups of Constants
 REF:
 com.sun.star.table.CellVertJustify
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/View_Settings
-DESCR:Spreadsheets - View Settings
+LINK:Documentation/DevGuide/Spreadsheet_Documents#View_Settings
+DESCR:Spreadsheet Documents - View Settings
 REF:
 com.sun.star.sheet.SpreadsheetViewSettings
 com.sun.star.beans.XPropertySet
 TOPIC:
 com.sun.star.sheet.SpreadsheetViewSettings
 
-LINK:Documentation/DevGuide/OfficeDev/Common_Application_Features#Becoming_a_Clipboard_Viewer
-DESCR:OfficeDev - Common Application Features - Clipboard - Using the Clipboard - Becoming a Clipboard Viewer
+LINK:Documentation/DevGuide/Office_Development#Becoming_a_Clipboard_Viewer
+DESCR:Office Development - Common Application Features - Clipboard - Using the Clipboard - Becoming a Clipboard Viewer
 REF:
 com.sun.star.datatransfer.clipboard.XClipboardListener
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Window_Interfaces#XWindowPeer
-DESCR:OfficeDev - Component - Window Interfaces - XWindowPeer
+LINK:Documentation/DevGuide/Office_Development#XWindowPeer
+DESCR:Office Development - Component - Window Interfaces - XWindowPeer
 REF:
 com.sun.star.awt.XWindowPeer
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Area_Links
-DESCR:Spreadsheets - Cell Area Links
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Area_Links
+DESCR:Spreadsheet Documents - Cell Area Links
 REF:
 com.sun.star.sheet.XAreaLink
 com.sun.star.beans.XPropertySet
@@ -1463,8 +1463,8 @@ TOPIC:
 com.sun.star.sheet.XAreaLink
 com.sun.star.sheet.XAreaLinks
 
-LINK:Documentation/DevGuide/ProUNO/Properties
-DESCR:ProUNO - Properties
+LINK:Documentation/DevGuide/Professional_UNO#Properties
+DESCR:Professional UNO - Properties
 REF:
 com.sun.star.beans.XPropertyAccess
 com.sun.star.beans.XPropertyState
@@ -1485,8 +1485,8 @@ com.sun.star.beans.XPropertySetInfo
 com.sun.star.beans.XFastPropertySet
 com.sun.star.beans.XMultiPropertySet
 
-LINK:Documentation/DevGuide/Drawings/Layer_Handling
-DESCR:Drawings - Layer Handling
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Layer_Handling
+DESCR:Drawings and Presentations - Layer Handling
 REF:
 com.sun.star.drawing.XLayerSupplier
 com.sun.star.drawing.DrawingDocument
@@ -1494,8 +1494,8 @@ com.sun.star.drawing.XLayerManager
 TOPIC:
 com.sun.star.drawing.XLayerManager
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#Invocation
-DESCR:AdvUNO - UNO Reflection API - CoreReflection Service - Invocation
+LINK:Documentation/DevGuide/Advanced_UNO#Invocation
+DESCR:Advanced UNO - UNO Reflection API - CoreReflection Service - Invocation
 REF:
 com.sun.star.lang.XSingleServiceFactory
 com.sun.star.script.Converter
@@ -1505,8 +1505,8 @@ com.sun.star.script.XInvocation2
 com.sun.star.script.Invocation
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_Hyphenator
-DESCR:OfficeDev - Implementing a Hyphenator
+LINK:Documentation/DevGuide/Office_Development#Implementing_a_Hyphenator
+DESCR:Office Development - Implementing a Hyphenator
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.linguistic2.XHyphenator
@@ -1518,14 +1518,14 @@ com.sun.star.lang.XServiceDisplayName
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Text_Documents
-DESCR:Text - Text Documents
+LINK:Documentation/DevGuide/Text_Documents#Text_Documents
+DESCR:Text Documents - Text Documents
 REF:
 TOPIC:
 com.sun.star.text.TextDocument
 
-LINK:Documentation/DevGuide/Spreadsheets/Modifying_a_DataPilot_Table
-DESCR:Spreadsheets - Modifying a DataPilot Table
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Modifying_a_DataPilot_Table
+DESCR:Spreadsheet Documents - Modifying a DataPilot Table
 REF:
 com.sun.star.sheet.DataPilotTable
 com.sun.star.sheet.XDataPilotTable
@@ -1534,8 +1534,8 @@ com.sun.star.sheet.XDataPilotDescriptor
 com.sun.star.sheet.DataPilotTables
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Scenarios
-DESCR:Spreadsheets - Other Table Operations - Scenarios
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Scenarios
+DESCR:Spreadsheet Documents - Other Table Operations - Scenarios
 REF:
 com.sun.star.sheet.Spreadsheet
 com.sun.star.sheet.Scenarios
@@ -1546,8 +1546,8 @@ com.sun.star.sheet.XScenarios
 TOPIC:
 com.sun.star.sheet.XScenarios
 
-LINK:Documentation/DevGuide/FirstSteps/Common_Mechanisms_for_Text%2C_Tables_and_Drawings
-DESCR:FirstSteps - Common Mechanisms for Text, Tables and Drawings
+LINK:Documentation/DevGuide/First_Steps#Common_Mechanisms_for_Text%2C_Tables_and_Drawings
+DESCR:First Steps - Common Mechanisms for Text, Tables and Drawings
 REF:
 com.sun.star.table.XCell
 com.sun.star.drawing.LineShape
@@ -1583,8 +1583,8 @@ com.sun.star.text.TextTable
 com.sun.star.drawing.PolyLineShape
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Printing_Drawing_Documents#Printer_and_Print_Job_Settings
-DESCR:Drawings - Printing Drawing Documents - Printer and Print Job Settings
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Printer_and_Print_Job_Settings
+DESCR:Drawings and Presentations - Printing Drawing Documents - Printer and Print Job Settings
 REF:
 com.sun.star.awt.Size
 com.sun.star.view.PaperOrientation
@@ -1597,21 +1597,21 @@ com.sun.star.view.PrintOptions
 com.sun.star.view.PrinterDescriptor
 com.sun.star.view.XPrintable
 
-LINK:Documentation/DevGuide/JavaBean/OfficeConnection_Interface
-DESCR:JavaBean - OfficeConnection Interface
+LINK:Documentation/DevGuide/JavaBean_for_Office_Components#OfficeConnection_Interface
+DESCR:JavaBean for Office Components - OfficeConnection Interface
 REF:
 com.sun.star.uno.XComponentContext
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Mapping_of_Simple_Types
-DESCR:ProUNO - Basic - Mapping of Simple Types
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Simple_Types_3
+DESCR:Professional UNO - Basic - Mapping of Simple Types
 REF:
 com.sun.star.reflection.XIdlClass
 com.sun.star.container.XNameContainer
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Creating_Dialogs_at_Runtime
-DESCR:Basic - Creating Dialogs at Runtime
+LINK:Documentation/DevGuide/LibreOffice_Basic#Creating_Dialogs_at_Runtime
+DESCR:LibreOffice Basic - Creating Dialogs at Runtime
 REF:
 com.sun.star.awt.XDialog
 com.sun.star.awt.UnoControlDialogModel
@@ -1626,8 +1626,8 @@ com.sun.star.container.XNameContainer
 com.sun.star.beans.XMultiPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Filtering_Process#FrameLoader
-DESCR:OfficeDev - Filtering Process - FrameLoader
+LINK:Documentation/DevGuide/Office_Development#FrameLoader
+DESCR:Office Development - Filtering Process - FrameLoader
 REF:
 com.sun.star.frame.Controller
 com.sun.star.frame.SynchronousFrameLoader
@@ -1637,8 +1637,8 @@ com.sun.star.frame.FrameLoaderFactory
 com.sun.star.frame.FrameLoader
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Scroll_Bar
-DESCR:GUI - Scroll Bar
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Scroll_Bar
+DESCR:Graphical User Interfaces - Scroll Bar
 REF:
 com.sun.star.awt.UnoControlScrollBar
 com.sun.star.awt.XAdjustmentListener
@@ -1646,8 +1646,8 @@ com.sun.star.awt.UnoControlScrollBarModel
 com.sun.star.awt.XScrollBar
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Number_Formats
-DESCR:OfficeDev - Number Formats
+LINK:Documentation/DevGuide/Office_Development#Number_Formats
+DESCR:Office Development - Number Formats
 REF:
 TOPIC:
 com.sun.star.util.XNumberFormatTypes
@@ -1658,23 +1658,23 @@ com.sun.star.util.NumberFormats
 com.sun.star.util.NumberFormatter
 com.sun.star.util.XNumberFormatsSupplier
 
-LINK:Documentation/DevGuide/WritingUNO/Providing_a_Single_Factory_Using_a_Helper_Method
-DESCR:WritingUNO - Providing a Single Factory Using a Helper Method
+LINK:Documentation/DevGuide/Writing_UNO_Components#Providing_a_Single_Factory_Using_a_Helper_Method
+DESCR:Writing UNO Components - Providing a Single Factory Using a Helper Method
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.lang.XMultiServiceFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Config/Configuration_Management#Architecture
-DESCR:Config - Configuration Management - Architecture
+LINK:Documentation/DevGuide/Configuration_Management#Architecture
+DESCR:Configuration Management - Configuration Management - Architecture
 REF:
 com.sun.star.beans.NamedValue
 com.sun.star.beans.PropertyValue
 com.sun.star.configuration.ConfigurationProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Navigating#Cursors
-DESCR:Text - Navigating - Cursors
+LINK:Documentation/DevGuide/Text_Documents#Cursors
+DESCR:Text Documents - Navigating - Cursors
 REF:
 com.sun.star.text.TextViewCursor
 com.sun.star.text.TextCursor
@@ -1684,8 +1684,8 @@ com.sun.star.text.XTextCursor
 TOPIC:
 com.sun.star.text.TextCursor
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Frames#XFramesSupplier
-DESCR:OfficeDev - Component - Frames - XFramesSupplier
+LINK:Documentation/DevGuide/Office_Development#XFramesSupplier
+DESCR:Office Development - Component - Frames - XFramesSupplier
 REF:
 com.sun.star.frame.XFrames
 com.sun.star.container.XIndexAccess
@@ -1694,8 +1694,8 @@ com.sun.star.frame.XFrame
 TOPIC:
 com.sun.star.frame.XFramesSupplier
 
-LINK:Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Data_Validation
-DESCR:Spreadsheets - Other Table Operations - Data Validation
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Data_Validation
+DESCR:Spreadsheet Documents - Other Table Operations - Data Validation
 REF:
 com.sun.star.sheet.ValidationAlertStyle
 com.sun.star.sheet.XSheetCondition
@@ -1706,15 +1706,15 @@ com.sun.star.sheet.TableValidation
 TOPIC:
 com.sun.star.sheet.TableValidation
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XIndexEntrySupplier
-DESCR:OfficeDev - Overview and Using the API - XIndexEntrySupplier
+LINK:Documentation/DevGuide/Office_Development#XIndexEntrySupplier
+DESCR:Office Development - Overview and Using the API - XIndexEntrySupplier
 REF:
 com.sun.star.i18n.XIndexEntrySupplier
 TOPIC:
 com.sun.star.i18n.XIndexEntrySupplier
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Cursor
-DESCR:Spreadsheets - Cell Cursor
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Cursor
+DESCR:Spreadsheet Documents - Cell Cursor
 REF:
 com.sun.star.sheet.XSheetCellRange
 com.sun.star.sheet.XSpreadsheet
@@ -1724,23 +1724,23 @@ com.sun.star.sheet.SheetCellCursor
 TOPIC:
 com.sun.star.sheet.XSheetCellCursor
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Window_Interfaces#XWindow
-DESCR:OfficeDev - Component - Window Interfaces - XWindow
+LINK:Documentation/DevGuide/Office_Development#XWindow
+DESCR:Office Development - Component - Window Interfaces - XWindow
 REF:
 com.sun.star.awt.XWindowListener
 com.sun.star.awt.WindowEvent
 com.sun.star.awt.XWindow
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Image_Control
-DESCR:GUI - Image Control
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Image_Control
+DESCR:Graphical User Interfaces - Image Control
 REF:
 com.sun.star.awt.UnoControlImageControlModel
 com.sun.star.awt.UnoControlImageControl
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/List_Box
-DESCR:GUI - List Box
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#List_Box
+DESCR:Graphical User Interfaces - List Box
 REF:
 com.sun.star.awt.UnoControlListBox
 com.sun.star.awt.XItemListener
@@ -1749,7 +1749,7 @@ com.sun.star.awt.UnoControlListBoxModel
 com.sun.star.awt.XListBox
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Common_Parts_of_all_Chart_Types#Axis
+LINK:Documentation/DevGuide/Charts#Axis
 DESCR:Charts - Common Parts of all Chart Types - Axis
 REF:
 com.sun.star.chart.BarDiagram
@@ -1760,15 +1760,15 @@ com.sun.star.drawing.LineProperties
 com.sun.star.style.CharacterProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Using_Automation_Objects_from_UNO#Named_Arguments
-DESCR:ProUNO - Bridge - Using Automation Objects from UNO - Instantiation - Named Arguments
+LINK:Documentation/DevGuide/Professional_UNO#Named_Arguments
+DESCR:Professional UNO - Bridge - Using Automation Objects from UNO - Instantiation - Named Arguments
 REF:
 com.sun.star.script.XInvocation
 com.sun.star.bridge.oleautomation.NamedArgument
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Filtering
-DESCR:Spreadsheets - Filtering
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Filtering
+DESCR:Spreadsheet Documents - Filtering
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.sheet.SheetFilterDescriptor
@@ -1781,8 +1781,8 @@ com.sun.star.sheet.SheetFilterDescriptor
 com.sun.star.sheet.XSheetFilterableEx
 com.sun.star.sheet.XSheetFilterable
 
-LINK:Documentation/DevGuide/OfficeDev/Closing_Documents#Reacting_Upon_Closing
-DESCR:OfficeDev - Closing Documents - Reacting Upon Closing
+LINK:Documentation/DevGuide/Office_Development#Reacting_Upon_Closing
+DESCR:Office Development - Closing Documents - Reacting Upon Closing
 REF:
 com.sun.star.util.XCloseListener
 com.sun.star.lang.XComponent
@@ -1792,20 +1792,20 @@ com.sun.star.util.XCloseable
 com.sun.star.uno.XWeak
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Implementing_without_Helpers#XInterface_Implementation
-DESCR:WritingUNO - C++ - Implementing without Helpers - XInterface Implementation
+LINK:Documentation/DevGuide/Writing_UNO_Components#XInterface_Implementation
+DESCR:Writing UNO Components - C++ - Implementing without Helpers - XInterface Implementation
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Process#Dispatching_a_Command
-DESCR:OfficeDev - Dispatch Process - Dispatching a Command
+LINK:Documentation/DevGuide/Office_Development#Dispatching_a_Command
+DESCR:Office Development - Dispatch Process - Dispatching a Command
 REF:
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet#Naming
-DESCR:Spreadsheets - Spreadsheet - Naming
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Naming
+DESCR:Spreadsheet Documents - Spreadsheet - Naming
 REF:
 com.sun.star.container.XNamed
 com.sun.star.sheet.CellInsertMode
@@ -1813,8 +1813,8 @@ com.sun.star.sheet.XCellRangeMovement
 com.sun.star.sheet.CellDeleteMode
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Element_Access#Enumeration_Access
-DESCR:FirstSteps - Element Access - Enumeration Access
+LINK:Documentation/DevGuide/First_Steps#Enumeration_Access
+DESCR:First Steps - Element Access - Enumeration Access
 REF:
 com.sun.star.sheet.XCellRangesQuery
 com.sun.star.sheet.XSheetCellRanges
@@ -1823,8 +1823,8 @@ com.sun.star.container.XEnumerationAccess
 com.sun.star.container.XEnumeration
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Path_Settings#Accessing_Path_Settings
-DESCR:OfficeDev - Path Settings - Accessing Path Settings
+LINK:Documentation/DevGuide/Office_Development#Accessing_Path_Settings
+DESCR:Office Development - Path Settings - Accessing Path Settings
 REF:
 com.sun.star.lang.IllegalArgumentException
 com.sun.star.beans.XPropertySet
@@ -1832,8 +1832,8 @@ com.sun.star.beans.XFastPropertySet
 com.sun.star.beans.XMultiPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/DataPilot_Sources
-DESCR:Spreadsheets - DataPilot Sources
+LINK:Documentation/DevGuide/Spreadsheet_Documents#DataPilot_Sources
+DESCR:Spreadsheet Documents - DataPilot Sources
 REF:
 com.sun.star.sheet.XLevelsSupplier
 com.sun.star.sheet.XHierarchiesSupplier
@@ -1847,37 +1847,37 @@ com.sun.star.sheet.DataPilotSourceMembers
 com.sun.star.sheet.XDimensionsSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Automation_Objects_with_UNO_Interfaces#Requirements
-DESCR:ProUNO - Bridge - Automation Objects with UNO Interfaces - Requirements
+LINK:Documentation/DevGuide/Professional_UNO#Requirements
+DESCR:Professional UNO - Bridge - Automation Objects with UNO Interfaces - Requirements
 REF:
 com.sun.star.uno.XInterface
 com.sun.star.script.XInvocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/List_Box
-DESCR:Basic - List Box
+LINK:Documentation/DevGuide/LibreOffice_Basic#List_Box
+DESCR:LibreOffice Basic - List Box
 REF:
 com.sun.star.awt.UnoControlListBox
 com.sun.star.awt.XListBox
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Configuration
-DESCR:WritingUNO - Jobs - Configuration
+LINK:Documentation/DevGuide/Writing_UNO_Components#Configuration_2
+DESCR:Writing UNO Components - Jobs - Configuration
 REF:
 com.sun.star.task.Job
 com.sun.star.task.JobExecutor
 com.sun.star.task.AsyncJob
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Resolving_Path_Variables
-DESCR:OfficeDev - Resolving Path Variables
+LINK:Documentation/DevGuide/Office_Development#Resolving_Path_Variables
+DESCR:Office Development - Resolving Path Variables
 REF:
 com.sun.star.container.NoSuchElementException
 com.sun.star.util.XStringSubstitution
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet_Services_-_Overview
-DESCR:Spreadsheets - Spreadsheet Services - Overview
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Services_-_Overview
+DESCR:Spreadsheet Documents - Spreadsheet Services - Overview
 REF:
 com.sun.star.sheet.SheetCell
 com.sun.star.sheet.SheetCellRanges
@@ -1893,27 +1893,27 @@ com.sun.star.sheet.Spreadsheet
 com.sun.star.table.TableColumn
 com.sun.star.table.TableRow
 
-LINK:Documentation/DevGuide/Extensions/File_Format#Extension_Tooltip_Description
+LINK:Documentation/DevGuide/Extensions#Extension_Tooltip_Description
 DESCR:Extensions - File Format - Extension Tooltip Description
 REF:
 com.sun.star.util.MacroExpander
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Using_SDBCX_to_Access_the_Database_Design#The_Extension_Layer_SDBCX
-DESCR:Database - Using SDBCX to Access the Database Design - The Extension Layer SDBCX
+LINK:Documentation/DevGuide/Database_Access#The_Extension_Layer_SDBCX
+DESCR:Database Access - Using SDBCX to Access the Database Design - The Extension Layer SDBCX
 REF:
 com.sun.star.sdbcx.Container
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Filtering_Process#MediaDescriptor
-DESCR:OfficeDev - Filtering Process - MediaDescriptor
+LINK:Documentation/DevGuide/Office_Development#MediaDescriptor
+DESCR:Office Development - Filtering Process - MediaDescriptor
 REF:
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Properties_of_a_Filter
-DESCR:OfficeDev - Properties of a Filter
+LINK:Documentation/DevGuide/Office_Development#Properties_of_a_Filter
+DESCR:Office Development - Properties of a Filter
 REF:
 com.sun.star.document.FilterFactory
 com.sun.star.lang.XMultiServiceFactory
@@ -1923,8 +1923,8 @@ com.sun.star.document.ImportFilter
 com.sun.star.document.ExportFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/DataPilot_Tables
-DESCR:Spreadsheets - DataPilot Tables
+LINK:Documentation/DevGuide/Spreadsheet_Documents#DataPilot_Tables
+DESCR:Spreadsheet Documents - DataPilot Tables
 REF:
 com.sun.star.sheet.DataPilotSource
 com.sun.star.sheet.XDataPilotTables
@@ -1933,8 +1933,8 @@ com.sun.star.sheet.DataPilotTables
 TOPIC:
 com.sun.star.sheet.DataPilotTables
 
-LINK:Documentation/DevGuide/Spreadsheets/Overall_Document_Features#Cell_Styles
-DESCR:Spreadsheets - Overall Document Features - Styles - Cell Styles
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Styles
+DESCR:Spreadsheet Documents - Overall Document Features - Styles - Cell Styles
 REF:
 com.sun.star.container.XNamed
 com.sun.star.sheet.XSpreadsheetDocument
@@ -1942,8 +1942,8 @@ com.sun.star.sheet.TableCellStyle
 TOPIC:
 com.sun.star.sheet.TableCellStyle
 
-LINK:Documentation/DevGuide/Basic/Programming_Dialogs_and_Dialog_Controls
-DESCR:Basic - Programming Dialogs and Dialog Controls
+LINK:Documentation/DevGuide/LibreOffice_Basic#Programming_Dialogs_and_Dialog_Controls
+DESCR:LibreOffice Basic - Programming Dialogs and Dialog Controls
 REF:
 com.sun.star.awt.XWindow
 com.sun.star.beans.XPropertySet
@@ -1955,29 +1955,29 @@ com.sun.star.awt.XView
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cells
-DESCR:Spreadsheets - Cells
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cells
+DESCR:Spreadsheet Documents - Cells
 REF:
 com.sun.star.sheet.SheetCell
 com.sun.star.table.Cell
 TOPIC:
 com.sun.star.sheet.SheetCell
 
-LINK:Documentation/DevGuide/AdvUNO/Advanced_UNO#Java
-DESCR:AdvUNO - Advanced UNO - Choosing an Implementation Language - Supported Programming Environments - Java
+LINK:Documentation/DevGuide/Advanced_UNO#Java
+DESCR:Advanced UNO - Advanced UNO - Choosing an Implementation Language - Supported Programming Environments - Java
 REF:
 com.sun.star.beans.XPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Managing_Number_Formats#XNumberFormats
-DESCR:OfficeDev - Managing Number Formats - NumberFormats Service - XNumberFormats
+LINK:Documentation/DevGuide/Office_Development#XNumberFormats
+DESCR:Office Development - Managing Number Formats - NumberFormats Service - XNumberFormats
 REF:
 com.sun.star.util.XNumberFormats
 com.sun.star.util.NumberFormatProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Navigating#Search_and_Replace
-DESCR:Text - Navigating - Search and Replace
+LINK:Documentation/DevGuide/Text_Documents#Search_and_Replace
+DESCR:Text Documents - Navigating - Search and Replace
 REF:
 com.sun.star.util.XPropertyReplace
 com.sun.star.style.ParagraphProperties
@@ -1994,8 +1994,8 @@ com.sun.star.util.SearchDescriptor
 com.sun.star.util.XReplaceable
 com.sun.star.util.XSearchable
 
-LINK:Documentation/DevGuide/Basic/Accessing_the_UNO_API#ThisComponent
-DESCR:Basic - Accessing the UNO API - ThisComponent
+LINK:Documentation/DevGuide/LibreOffice_Basic#ThisComponent
+DESCR:LibreOffice Basic - Accessing the UNO API - ThisComponent
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.util.XModifiable
@@ -2023,15 +2023,15 @@ com.sun.star.document.XEventsSupplier
 com.sun.star.document.XDocumentPropertiesSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/The_Example_Listings
-DESCR:GUI - The Example Listings
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#The_Example_Listings
+DESCR:Graphical User Interfaces - The Example Listings
 REF:
 com.sun.star.container.ElementExistException
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Zooming
-DESCR:Drawings - Zooming
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Zooming
+DESCR:Drawings and Presentations - Zooming
 REF:
 com.sun.star.awt.Rectangle
 com.sun.star.view.DocumentZoomType
@@ -2040,8 +2040,8 @@ com.sun.star.awt.Point
 TOPIC:
 com.sun.star.drawing.DrawingDocumentDrawView
 
-LINK:Documentation/DevGuide/Database/Document_Links
-DESCR:Database - Document Links
+LINK:Documentation/DevGuide/Database_Access#Document_Links
+DESCR:Database Access - Document Links
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.sdb.DefinitionContainer
@@ -2052,30 +2052,30 @@ com.sun.star.sdb.XBookmarksSupplier
 com.sun.star.frame.Desktop
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/ResultSetMetaData
-DESCR:Database - ResultSetMetaData
+LINK:Documentation/DevGuide/Database_Access#ResultSetMetaData
+DESCR:Database Access - ResultSetMetaData
 REF:
 com.sun.star.sdbc.XResultSetMetaData
 com.sun.star.sdbc.DataType
 TOPIC:
 com.sun.star.sdbc.XResultSetMetaData
 
-LINK:Documentation/DevGuide/WritingUNO/Storing_the_Service_Manager_for_Further_Use
-DESCR:WritingUNO - Storing the Service Manager for Further Use
+LINK:Documentation/DevGuide/Writing_UNO_Components#Storing_the_Service_Manager_for_Further_Use
+DESCR:Writing UNO Components - Storing the Service Manager for Further Use
 REF:
 com.sun.star.uno.XComponentContext
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Key_Service
-DESCR:Database - Key Service
+LINK:Documentation/DevGuide/Database_Access#Key_Service
+DESCR:Database Access - Key Service
 REF:
 com.sun.star.sdbc.KeyRule
 com.sun.star.sdbcx.KeyType
 TOPIC:
 com.sun.star.sdbcx.KeyType
 
-LINK:Documentation/DevGuide/Text/Auto_Text
-DESCR:Text - Auto Text
+LINK:Documentation/DevGuide/Text_Documents#Auto_Text
+DESCR:Text Documents - Auto Text
 REF:
 com.sun.star.text.AutoTextGroup
 com.sun.star.text.AutoTextContainer
@@ -2085,8 +2085,8 @@ com.sun.star.text.AutoTextGroup
 com.sun.star.text.AutoTextContainer
 com.sun.star.text.AutoTextEntry
 
-LINK:Documentation/DevGuide/Scripting/Writing_Macros#The_HelloWorld_macro
-DESCR:Scripting - Writing Macros - The HelloWorld macro
+LINK:Documentation/DevGuide/Scripting_Framework#The_HelloWorld_macro
+DESCR:Scripting Framework - Writing Macros - The HelloWorld macro
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.frame.XDesktop
@@ -2094,14 +2094,14 @@ com.sun.star.frame.XModel
 com.sun.star.script.provider.XScriptContext
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Class_Definition_with_Helper_Class
-DESCR:WritingUNO - Class Definition with Helper Class
+LINK:Documentation/DevGuide/Writing_UNO_Components#Class_Definition_with_Helper_Class
+DESCR:Writing UNO Components - Class Definition with Helper Class
 REF:
 com.sun.star.lang.XServiceInfo
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Using_Services#Using_Interfaces
-DESCR:FirstSteps - Using Services - Using Interfaces
+LINK:Documentation/DevGuide/First_Steps#Using_Interfaces
+DESCR:First Steps - Using Services - Using Interfaces
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.lang.XComponent
@@ -2110,8 +2110,8 @@ com.sun.star.frame.Desktop
 TOPIC:
 com.sun.star.uno.XInterface
 
-LINK:Documentation/DevGuide/Text/Text_Sections
-DESCR:Text - Text Sections
+LINK:Documentation/DevGuide/Text_Documents#Text_Sections
+DESCR:Text Documents - Text Sections
 REF:
 com.sun.star.text.XTextSectionsSupplier
 com.sun.star.container.XIndexAccess
@@ -2120,16 +2120,16 @@ com.sun.star.text.TextSection
 TOPIC:
 com.sun.star.text.TextSection
 
-LINK:Documentation/DevGuide/GUI/Message_Box
-DESCR:GUI - Message Box
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Message_Box
+DESCR:Graphical User Interfaces - Message Box
 REF:
 com.sun.star.awt.Toolkit
 com.sun.star.awt.XMessageBoxFactory
 com.sun.star.awt.MessageBoxButtons
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Integrating_Import_and_Export_Filters
-DESCR:OfficeDev - Integrating Import and Export Filters
+LINK:Documentation/DevGuide/Office_Development#Integrating_Import_and_Export_Filters
+DESCR:Office Development - Integrating Import and Export Filters
 REF:
 TOPIC:
 com.sun.star.document.FilterFactory
@@ -2141,8 +2141,8 @@ com.sun.star.document.ImportFilter
 com.sun.star.frame.FrameLoader
 com.sun.star.document.ExportFilter
 
-LINK:Documentation/DevGuide/Spreadsheets/Working_With_Spreadsheet_Documents#Spreadsheet_Document
-DESCR:Spreadsheets - Working With Spreadsheet Documents - Document Structure - Spreadsheet Document
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Document
+DESCR:Spreadsheet Documents - Working With Spreadsheet Documents - Document Structure - Spreadsheet Document
 REF:
 com.sun.star.sheet.SpreadsheetDocument
 com.sun.star.container.XNameContainer
@@ -2157,8 +2157,8 @@ TOPIC:
 com.sun.star.sheet.SpreadsheetDocument
 com.sun.star.sheet.Spreadsheets
 
-LINK:Documentation/DevGuide/Database/Column_Service
-DESCR:Database - Column Service
+LINK:Documentation/DevGuide/Database_Access#Column_Service
+DESCR:Database Access - Column Service
 REF:
 com.sun.star.sdbcx.IndexColumn
 com.sun.star.sdbcx.Column
@@ -2171,15 +2171,15 @@ com.sun.star.sdbcx.IndexColumn
 com.sun.star.sdbcx.Column
 com.sun.star.sdbcx.KeyColumn
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Window_Interfaces
-DESCR:OfficeDev - Component - Window Interfaces
+LINK:Documentation/DevGuide/Office_Development#Window_Interfaces
+DESCR:Office Development - Component - Window Interfaces
 REF:
 TOPIC:
 com.sun.star.awt.XWindow
 com.sun.star.awt.XWindowPeer
 com.sun.star.awt.XTopWindow
 
-LINK:Documentation/DevGuide/Charts/Handling_Chart_Documents#Creating_Charts
+LINK:Documentation/DevGuide#Creating_Charts
 DESCR:Charts - Handling Chart Documents - Creating Charts
 REF:
 com.sun.star.chart.XChartDataArray
@@ -2187,8 +2187,8 @@ com.sun.star.table.XTableChartsSupplier
 com.sun.star.sheet.Spreadsheet
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/General_Drawing_Properties
-DESCR:Drawings - General Drawing Properties
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#General_Drawing_Properties
+DESCR:Drawings and Presentations - General Drawing Properties
 REF:
 com.sun.star.style.LineSpacing
 com.sun.star.drawing.TextFitToSizeType
@@ -2226,14 +2226,14 @@ com.sun.star.drawing.TextProperties
 com.sun.star.drawing.FillProperties
 com.sun.star.drawing.LineProperties
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Ranges_and_Cells_Container#Properties_of_SheetCellRanges
-DESCR:Spreadsheets - Cell Ranges and Cells Container - Properties of SheetCellRanges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Properties_of_SheetCellRanges
+DESCR:Spreadsheet Documents - Cell Ranges and Cells Container - Properties of SheetCellRanges
 REF:
 com.sun.star.sheet.SheetCellRanges
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Source_Object
-DESCR:Spreadsheets - Source Object
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Source_Object
+DESCR:Spreadsheet Documents - Source Object
 REF:
 com.sun.star.sheet.DataResult
 com.sun.star.sheet.DataResultFlags
@@ -2245,22 +2245,22 @@ com.sun.star.util.XRefreshable
 TOPIC:
 com.sun.star.sheet.DataPilotSource
 
-LINK:Documentation/DevGuide/Drawings/Printing_Presentation_Documents
-DESCR:Drawings - Printing Presentation Documents
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Printing_Presentation_Documents
+DESCR:Drawings and Presentations - Printing Presentation Documents
 REF:
 com.sun.star.presentation.DocumentSettings
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XEventsSupplier
-DESCR:OfficeDev - Component - Models - XEventsSupplier
+LINK:Documentation/DevGuide/Office_Development#XEventsSupplier
+DESCR:Office Development - Component - Models - XEventsSupplier
 REF:
 com.sun.star.document.XEventBroadcaster
 com.sun.star.document.XEventsSupplier
 TOPIC:
 com.sun.star.document.XEventsSupplier
 
-LINK:Documentation/DevGuide/Database/Events_and_Other_Notifications
-DESCR:Database - Events and Other Notifications
+LINK:Documentation/DevGuide/Database_Access#Events_and_Other_Notifications
+DESCR:Database Access - Events and Other Notifications
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.sdb.XRowSetApproveBroadcaster
@@ -2274,7 +2274,7 @@ com.sun.star.sdbc.XRowSetListener
 com.sun.star.lang.EventObject
 com.sun.star.sdb.XRowSetApproveListener
 
-LINK:Documentation/DevGuide/Forms/Form_Control_Models
+LINK:Documentation/DevGuide/Forms#Form_Control_Models
 DESCR:Forms - Form Control Models
 REF:
 com.sun.star.form.FormComponent
@@ -2283,41 +2283,41 @@ com.sun.star.form.FormControlModel
 TOPIC:
 com.sun.star.form.FormControlModel
 
-LINK:Documentation/DevGuide/OfficeDev/The_Exporter#Evaluating_XExportFilter_Parameters
-DESCR:OfficeDev - The Exporter - Evaluating XExportFilter Parameters
+LINK:Documentation/DevGuide/Office_Development#Evaluating_XExportFilter_Parameters
+DESCR:Office Development - The Exporter - Evaluating XExportFilter Parameters
 REF:
 com.sun.star.xml.sax.XDocumentHandler
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Numeric_Field
-DESCR:Basic - Numeric Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Numeric_Field
+DESCR:LibreOffice Basic - Numeric Field
 REF:
 com.sun.star.awt.UnoControlNumericField
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Services#Including_Properties
-DESCR:ProUNO - Services - Including Properties
+LINK:Documentation/DevGuide/Professional_UNO#Including_Properties
+DESCR:Professional UNO - Services - Including Properties
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.beans.XPropertyChangeListener
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Deployment_Options_for_Components#Component_Registration
-DESCR:WritingUNO - Deployment Options for Components - null - Component Registration
+LINK:Documentation/DevGuide/Writing_UNO_Components#Component_Registration
+DESCR:Writing UNO Components - Deployment Options for Components - Component Registration
 REF:
 com.sun.star.loader.SharedLibrary
 com.sun.star.io.Pipe
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Content_Provider_Proxies
-DESCR:UCB - Content Provider Proxies
+LINK:Documentation/DevGuide/Universal_Content_Broker#Content_Provider_Proxies
+DESCR:Universal Content Broker - Content Provider Proxies
 REF:
 com.sun.star.ucb.XContentProviderManager
 TOPIC:
 com.sun.star.ucb.XContentProviderManager
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_Thesaurus
-DESCR:OfficeDev - Implementing a Thesaurus
+LINK:Documentation/DevGuide/Office_Development#Implementing_a_Thesaurus
+DESCR:Office Development - Implementing a Thesaurus
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.linguistic2.XThesaurus
@@ -2327,8 +2327,8 @@ com.sun.star.lang.XServiceDisplayName
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XModel
-DESCR:OfficeDev - Component - Models - XModel
+LINK:Documentation/DevGuide/Office_Development#XModel
+DESCR:Office Development - Component - Models - XModel
 REF:
 com.sun.star.view.XSelectionSupplier
 com.sun.star.lang.XComponent
@@ -2337,30 +2337,30 @@ com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.frame.XModel
 
-LINK:Documentation/DevGuide/FirstSteps/Sequence
-DESCR:FirstSteps - Sequence
+LINK:Documentation/DevGuide/First_Steps#Sequence
+DESCR:First Steps - Sequence
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.document.MediaDescriptor
 com.sun.star.container.XEnumeration
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Page_Formatting
-DESCR:Drawings - Page Formatting
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Page_Formatting
+DESCR:Drawings and Presentations - Page Formatting
 REF:
 com.sun.star.view.PaperOrientation
 com.sun.star.drawing.GenericDrawPage
 TOPIC:
 com.sun.star.drawing.GenericDrawPage
 
-LINK:Documentation/DevGuide/Database/The_SDBC_Driver_for_Flat_File_Formats
-DESCR:Database - The SDBC Driver for Flat File Formats
+LINK:Documentation/DevGuide/Database_Access#The_SDBC_Driver_for_Flat_File_Formats
+DESCR:Database Access - The SDBC Driver for Flat File Formats
 REF:
 com.sun.star.sdbc.FLATConnectionProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Setting_Dialog_Properties
-DESCR:GUI - Setting Dialog Properties
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Setting_Dialog_Properties
+DESCR:Graphical User Interfaces - Setting Dialog Properties
 REF:
 com.sun.star.awt.UnoControlDialogModel
 com.sun.star.beans.XPropertySet
@@ -2369,8 +2369,8 @@ com.sun.star.awt.UnoControlModel
 com.sun.star.beans.XMultiPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Custom_Slide_Show
-DESCR:Drawings - Custom Slide Show
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Custom_Slide_Show
+DESCR:Drawings and Presentations - Custom Slide Show
 REF:
 com.sun.star.presentation.CustomPresentation
 com.sun.star.container.XNamed
@@ -2383,35 +2383,35 @@ TOPIC:
 com.sun.star.presentation.CustomPresentationAccess
 com.sun.star.presentation.XCustomPresentationSupplier
 
-LINK:Documentation/DevGuide/Config/Using_a_Data_Source
-DESCR:Config - Using a Data Source
+LINK:Documentation/DevGuide/Configuration_Management#Using_a_Data_Source
+DESCR:Configuration Management - Using a Data Source
 REF:
 com.sun.star.configuration.ConfigurationUpdateAccess
 com.sun.star.configuration.ConfigurationAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Property_Propagation_Between_Model_and_Control
-DESCR:GUI - Property Propagation Between Model and Control
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Property_Propagation_Between_Model_and_Control
+DESCR:Graphical User Interfaces - Property Propagation Between Model and Control
 REF:
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Stock_Charts
+LINK:Documentation/DevGuide/Charts#Stock_Charts
 DESCR:Charts - Stock Charts
 REF:
 com.sun.star.chart.StockDiagram
 TOPIC:
 com.sun.star.chart.StockDiagram
 
-LINK:Documentation/DevGuide/Text/Editing_Text#Control_Characters
-DESCR:Text - Editing Text - Control Characters
+LINK:Documentation/DevGuide/Text_Documents#Control_Characters
+DESCR:Text Documents - Editing Text - Control Characters
 REF:
 com.sun.star.text.ControlCharacter
 TOPIC:
 com.sun.star.text.ControlCharacter
 
-LINK:Documentation/DevGuide/OfficeDev/Frames#Linking_Components_and_Windows
-DESCR:OfficeDev - Frames - Linking Components and Windows
+LINK:Documentation/DevGuide/Office_Development#Linking_Components_and_Windows
+DESCR:Office Development - Frames - Linking Components and Windows
 REF:
 com.sun.star.frame.XFrames
 com.sun.star.frame.XController
@@ -2425,8 +2425,8 @@ com.sun.star.awt.XTopWindow
 com.sun.star.frame.Frame
 com.sun.star.frame.XFrame
 
-LINK:Documentation/DevGuide/Config/Connecting_to_a_Data_Source
-DESCR:Config - Connecting to a Data Source
+LINK:Documentation/DevGuide/Configuration_Management#Connecting_to_a_Data_Source
+DESCR:Configuration Management - Connecting to a Data Source
 REF:
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.configuration.ConfigurationProvider
@@ -2434,8 +2434,8 @@ com.sun.star.lang.ServiceManager
 TOPIC:
 com.sun.star.configuration.ConfigurationProvider
 
-LINK:Documentation/DevGuide/Spreadsheets/Creating_a_New_DataPilot_Table
-DESCR:Spreadsheets - Creating a New DataPilot Table
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Creating_a_New_DataPilot_Table
+DESCR:Spreadsheet Documents - Creating a New DataPilot Table
 REF:
 com.sun.star.table.CellRangeAddress
 com.sun.star.sheet.DataPilotFieldOrientation
@@ -2450,8 +2450,8 @@ com.sun.star.sheet.DataPilotFieldOrientation
 com.sun.star.sheet.DataPilotDescriptor
 com.sun.star.sheet.DataPilotField
 
-LINK:Documentation/DevGuide/Spreadsheets/Range_Selection
-DESCR:Spreadsheets - Range Selection
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Range_Selection
+DESCR:Spreadsheet Documents - Range Selection
 REF:
 com.sun.star.sheet.XRangeSelectionListener
 com.sun.star.sheet.XRangeSelectionChangeListener
@@ -2463,16 +2463,16 @@ com.sun.star.sheet.XRangeSelectionChangeListener
 com.sun.star.sheet.XRangeSelection
 com.sun.star.sheet.RangeSelectionArguments
 
-LINK:Documentation/DevGuide/Text/Overall_Document_Features#Character_Styles
-DESCR:Text - Overall Document Features - Styles - Character Styles
+LINK:Documentation/DevGuide/Text_Documents#Character_Styles
+DESCR:Text Documents - Overall Document Features - Styles - Character Styles
 REF:
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.style.CharacterPropertiesAsian
 com.sun.star.style.CharacterProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Page_Layout
-DESCR:Text - Page Layout
+LINK:Documentation/DevGuide/Text_Documents#Page_Layout
+DESCR:Text Documents - Page Layout
 REF:
 com.sun.star.style.PageProperties
 com.sun.star.style.PageStyleLayout
@@ -2480,8 +2480,8 @@ com.sun.star.text.Text
 TOPIC:
 com.sun.star.style.PageProperties
 
-LINK:Documentation/DevGuide/GUI/Combo_Box
-DESCR:GUI - Combo Box
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Combo_Box
+DESCR:Graphical User Interfaces - Combo Box
 REF:
 com.sun.star.awt.XTextListener
 com.sun.star.awt.UnoControlEdit
@@ -2490,8 +2490,8 @@ com.sun.star.awt.UnoControlComboBox
 com.sun.star.awt.XComboBox
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Columns
-DESCR:Text - Columns
+LINK:Documentation/DevGuide/Text_Documents#Columns
+DESCR:Text Documents - Columns
 REF:
 com.sun.star.text.TextColumns
 com.sun.star.text.TextColumn
@@ -2499,8 +2499,8 @@ com.sun.star.text.XTextColumns
 TOPIC:
 com.sun.star.text.TextColumns
 
-LINK:Documentation/DevGuide/Database/The_DataSource_Service
-DESCR:Database - The DataSource Service
+LINK:Documentation/DevGuide/Database_Access#The_DataSource_Service
+DESCR:Database Access - The DataSource Service
 REF:
 com.sun.star.document.OfficeDocument
 com.sun.star.sdb.XCompletedConnection
@@ -2515,8 +2515,8 @@ com.sun.star.util.XNumberFormatsSupplier
 TOPIC:
 com.sun.star.sdb.DataSource
 
-LINK:Documentation/DevGuide/ProUNO/Java/Mapping_of_Exception_Types
-DESCR:ProUNO - Java - Mapping of Exception Types
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Exception_Types
+DESCR:Professional UNO - Java - Mapping of Exception Types
 REF:
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
@@ -2524,28 +2524,28 @@ TOPIC:
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
 
-LINK:Documentation/DevGuide/GUI/Group_Box
-DESCR:GUI - Group Box
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Group_Box
+DESCR:Graphical User Interfaces - Group Box
 REF:
 com.sun.star.awt.UnoControlGroupBox
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Implementing_UNO_objects
-DESCR:AdvUNO - XInvocation Bridge - Implementing UNO objects
+LINK:Documentation/DevGuide/Advanced_UNO#Implementing_UNO_objects
+DESCR:Advanced UNO - XInvocation Bridge - Implementing UNO objects
 REF:
 com.sun.star.loader.XImplementationLoader
 com.sun.star.script.InvocationAdapterFactory
 com.sun.star.io.XInputStream
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Defining_an_Interface#Methods
-DESCR:WritingUNO - Defining an Interface - Methods
+LINK:Documentation/DevGuide/Writing_UNO_Components#Methods
+DESCR:Writing UNO Components - Defining an Interface - Methods
 REF:
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Storing_Documents
-DESCR:OfficeDev - Storing Documents
+LINK:Documentation/DevGuide/Office_Development#Storing_Documents
+DESCR:Office Development - Storing Documents
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.util.XModifiable
@@ -2557,41 +2557,41 @@ com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.frame.XStorable
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Storing_the_Service_Manager_for_Further_Use
-DESCR:WritingUNO - C++ - Storing the Service Manager for Further Use
+LINK:Documentation/DevGuide/Writing_UNO_Components#Storing_the_Service_Manager_for_Further_Use_2
+DESCR:Writing UNO Components - C++ - Storing the Service Manager for Further Use
 REF:
 com.sun.star.uno.XComponentContext
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XPrintable
-DESCR:OfficeDev - Component - Models - XPrintable
+LINK:Documentation/DevGuide/Office_Development#XPrintable
+DESCR:Office Development - Component - Models - XPrintable
 REF:
 com.sun.star.view.XPrintable
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Graphical_User_Interfaces
-DESCR:GUI - Graphical User Interfaces
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Graphical_User_Interfaces
+DESCR:Graphical User Interfaces - Graphical User Interfaces
 REF:
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/AppendixC/The_FTP_Content_Provider#Creation_of_New_FTP_Content
-DESCR:AppendixC - The FTP Content Provider - Creation of New FTP Content
+LINK:Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_FTP_Content
+DESCR:Appendix C. Universal Content Providers - The FTP Content Provider - Creation of New FTP Content
 REF:
 com.sun.star.ucb.XContentCreator
 com.sun.star.io.XInputStream
 TOPIC:
 com.sun.star.ucb.XContentCreator
 
-LINK:Documentation/DevGuide/OfficeDev/Using_Thesaurus
-DESCR:OfficeDev - Using Thesaurus
+LINK:Documentation/DevGuide/Office_Development#Using_Thesaurus
+DESCR:Office Development - Using Thesaurus
 REF:
 com.sun.star.linguistic2.XThesaurus
 com.sun.star.linguistic2.LinguProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Roadmap_Control
-DESCR:GUI - Roadmap Control
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Roadmap_Control
+DESCR:Graphical User Interfaces - Roadmap Control
 REF:
 com.sun.star.awt.UnoControlRoadmapModel
 com.sun.star.awt.RoadmapItem
@@ -2599,27 +2599,27 @@ com.sun.star.awt.UnoControlRoadmap
 com.sun.star.container.XIndexContainer
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Java_Window_Integration#More_Remote_Problems
-DESCR:OfficeDev - Java Window Integration - More Remote Problems - Resizing
+LINK:Documentation/DevGuide/Office_Development#More_Remote_Problems
+DESCR:Office Development - Java Window Integration - More Remote Problems - Resizing
 REF:
 com.sun.star.lang.DisposedException
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Setting_Content_Properties
-DESCR:UCB - Setting Content Properties
+LINK:Documentation/DevGuide/Universal_Content_Broker#Setting_Content_Properties
+DESCR:Universal Content Broker - Setting Content Properties
 REF:
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XServiceInfo
-DESCR:WritingUNO - XServiceInfo
+LINK:Documentation/DevGuide/Writing_UNO_Components#XServiceInfo
+DESCR:Writing UNO Components - XServiceInfo
 REF:
 com.sun.star.lang.XServiceInfo
 TOPIC:
 com.sun.star.lang.XServiceInfo
 
-LINK:Documentation/DevGuide/Database/Stored_Procedures
-DESCR:Database - Stored Procedures
+LINK:Documentation/DevGuide/Database_Access#Stored_Procedures
+DESCR:Database Access - Stored Procedures
 REF:
 com.sun.star.sdbc.XRow
 com.sun.star.sdbc.XOutParameters
@@ -2630,8 +2630,8 @@ com.sun.star.sdbcx.PreparedStatement
 TOPIC:
 com.sun.star.sdbc.XOutParameters
 
-LINK:Documentation/DevGuide/Database/Connections#Operation_on_Application_Level
-DESCR:Database - Connections - Understanding Connections - Operation on Application Level
+LINK:Documentation/DevGuide/Database_Access#Operation_on_Application_Level
+DESCR:Database Access - Connections - Understanding Connections - Operation on Application Level
 REF:
 com.sun.star.sdb.XSQLQueryComposerFactory
 com.sun.star.sdb.XCommandPreparation
@@ -2641,50 +2641,50 @@ com.sun.star.sdb.XQueriesSupplier
 com.sun.star.sdb.CommandType
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Frames#XStatusIndicatorFactory
-DESCR:OfficeDev - Component - Frames - XStatusIndicatorFactory
+LINK:Documentation/DevGuide/Office_Development#XStatusIndicatorFactory
+DESCR:Office Development - Component - Frames - XStatusIndicatorFactory
 REF:
 com.sun.star.task.XStatusIndicator
 com.sun.star.task.XStatusIndicatorFactory
 TOPIC:
 com.sun.star.task.XStatusIndicatorFactory
 
-LINK:Documentation/DevGuide/Spreadsheets/Saving_Spreadsheet_Documents#Storing
-DESCR:Spreadsheets - Saving Spreadsheet Documents - Storing
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Storing
+DESCR:Spreadsheet Documents - Saving Spreadsheet Documents - Storing
 REF:
 com.sun.star.frame.XStorable
 TOPIC:
 com.sun.star.frame.XStorable
 
-LINK:Documentation/DevGuide/Text/Overall_Document_Features#Frame_Styles
-DESCR:Text - Overall Document Features - Styles - Frame Styles
+LINK:Documentation/DevGuide/Text_Documents#Frame_Styles
+DESCR:Text Documents - Overall Document Features - Styles - Frame Styles
 REF:
 com.sun.star.text.BaseFrame
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.text.BaseFrameProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Necessary_Steps
-DESCR:OfficeDev - Necessary Steps
+LINK:Documentation/DevGuide/Office_Development#Necessary_Steps
+DESCR:Office Development - Necessary Steps
 REF:
 com.sun.star.document.ExtendedTypeDetection
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Exception_Handling
-DESCR:AdvUNO - XInvocation Bridge - Scripting Existing UNO Objects - Exception Handling
+LINK:Documentation/DevGuide/Advanced_UNO#Exception_Handling
+DESCR:Advanced UNO - XInvocation Bridge - Scripting Existing UNO Objects - Exception Handling
 REF:
 com.sun.star.script.CannotConvertException
 com.sun.star.reflection.InvocationTargetException
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Custom_Functions
-DESCR:Spreadsheets - Custom Functions
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Custom_Functions
+DESCR:Spreadsheet Documents - Custom Functions
 REF:
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus#Notification
-DESCR:WritingUNO - Intercepting Context Menus - Writing an Interceptor - Notification
+LINK:Documentation/DevGuide/Writing_UNO_Components#Notification
+DESCR:Writing UNO Components - Intercepting Context Menus - Writing an Interceptor - Notification
 REF:
 com.sun.star.view.XSelectionSupplier
 com.sun.star.ui.ContextMenuExecuteEvent
@@ -2695,30 +2695,30 @@ com.sun.star.container.XIndexContainer
 com.sun.star.awt.Point
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Roadmap_Control#Roadmap_Item
-DESCR:GUI - Roadmap Control - Roadmap Item
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Roadmap_Item
+DESCR:Graphical User Interfaces - Roadmap Control - Roadmap Item
 REF:
 com.sun.star.awt.RoadmapItem
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Java/Mapping_of_Services
-DESCR:ProUNO - Java - Mapping of Services
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Services
+DESCR:Professional UNO - Java - Mapping of Services
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.uno.DeploymentException
 com.sun.star.lang.XMultiComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Event_Model
-DESCR:ProUNO - Event Model
+LINK:Documentation/DevGuide/Professional_UNO#Event_Model
+DESCR:Professional UNO - Event Model
 REF:
 com.sun.star.lang.XEventListener
 com.sun.star.lang.EventObject
 TOPIC:
 com.sun.star.lang.XEventListener
 
-LINK:Documentation/DevGuide/Text/Iterating_over_Text
-DESCR:Text - Iterating over Text
+LINK:Documentation/DevGuide/Text_Documents#Iterating_over_Text
+DESCR:Text Documents - Iterating over Text
 REF:
 com.sun.star.container.XContentEnumerationAccess
 com.sun.star.text.TextField
@@ -2737,29 +2737,29 @@ com.sun.star.container.XEnumerationAccess
 com.sun.star.text.Paragraph
 com.sun.star.text.TextPortion
 
-LINK:Documentation/DevGuide/Spreadsheets/Database_Operations
-DESCR:Spreadsheets - Database Operations
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Database_Operations
+DESCR:Spreadsheet Documents - Database Operations
 REF:
 TOPIC:
 com.sun.star.sheet.DatabaseRange
 com.sun.star.sheet.DatabaseRanges
 
-LINK:Documentation/DevGuide/Spreadsheets/Properties_of_SheetCell
-DESCR:Spreadsheets - Properties of SheetCell
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Properties_of_SheetCell
+DESCR:Spreadsheet Documents - Properties of SheetCell
 REF:
 com.sun.star.sheet.SheetCell
 com.sun.star.table.Cell
 com.sun.star.sheet.FormulaResult
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Java/Mapping_of_Interface_Types
-DESCR:ProUNO - Java - Mapping of Interface Types
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Interface_Types
+DESCR:Professional UNO - Java - Mapping of Interface Types
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Closing_Documents
-DESCR:OfficeDev - Closing Documents
+LINK:Documentation/DevGuide/Office_Development#Closing_Documents
+DESCR:Office Development - Closing Documents
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.lang.XEventListener
@@ -2768,7 +2768,7 @@ com.sun.star.util.XCloseListener
 com.sun.star.lang.XComponent
 com.sun.star.util.XCloseable
 
-LINK:Documentation/DevGuide/Forms/Committing_Controls
+LINK:Documentation/DevGuide/Forms#Committing_Controls
 DESCR:Forms - Committing Controls
 REF:
 com.sun.star.form.FormController
@@ -2777,14 +2777,14 @@ com.sun.star.form.XBoundComponent
 TOPIC:
 com.sun.star.form.XBoundComponent
 
-LINK:Documentation/DevGuide/OfficeDev/Using_Spellchecker
-DESCR:OfficeDev - Using Spellchecker
+LINK:Documentation/DevGuide/Office_Development#Using_Spellchecker
+DESCR:Office Development - Using Spellchecker
 REF:
 com.sun.star.linguistic2.XSpellChecker
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Creating_Statements
-DESCR:Database - Creating Statements
+LINK:Documentation/DevGuide/Database_Access#Creating_Statements
+DESCR:Database Access - Creating Statements
 REF:
 com.sun.star.sdbc.XMultipleResults
 com.sun.star.sdbc.XConnection
@@ -2793,8 +2793,8 @@ com.sun.star.sdbc.Statement
 TOPIC:
 com.sun.star.sdbc.Statement
 
-LINK:Documentation/DevGuide/Database/Connections#Understanding_Connections
-DESCR:Database - Connections - Understanding Connections
+LINK:Documentation/DevGuide/Database_Access#Understanding_Connections
+DESCR:Database Access - Connections - Understanding Connections
 REF:
 com.sun.star.sdb.XSQLQueryComposerFactory
 com.sun.star.sdbc.Connection
@@ -2806,14 +2806,14 @@ com.sun.star.sdb.XQueriesSupplier
 TOPIC:
 com.sun.star.sdb.Connection
 
-LINK:Documentation/DevGuide/ProUNO/C++/Type_Mappings#Mapping_of_Type
-DESCR:ProUNO - C++ - Type Mappings - Mapping of Simple Types - Mapping of Type
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Type_2
+DESCR:Professional UNO - C++ - Type Mappings - Mapping of Simple Types - Mapping of Type
 REF:
 com.sun.star.uno.TypeClass
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet#Page_Breaks
-DESCR:Spreadsheets - Spreadsheet - Page Breaks
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Page_Breaks
+DESCR:Spreadsheet Documents - Spreadsheet - Page Breaks
 REF:
 com.sun.star.sheet.TablePageBreakData
 com.sun.star.sheet.XSheetPageBreak
@@ -2823,22 +2823,22 @@ TOPIC:
 com.sun.star.sheet.TablePageBreakData
 com.sun.star.sheet.XSheetPageBreak
 
-LINK:Documentation/DevGuide/Config/Configuration_Data_Sources
-DESCR:Config - Configuration Data Sources
+LINK:Documentation/DevGuide/Configuration_Management#Configuration_Data_Sources
+DESCR:Configuration Management - Configuration Data Sources
 REF:
 com.sun.star.configuration.ConfigurationUpdateAccess
 com.sun.star.configuration.ConfigurationProvider
 com.sun.star.configuration.ConfigurationAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Removing_a_DataPilot_Table
-DESCR:Spreadsheets - Removing a DataPilot Table
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Removing_a_DataPilot_Table
+DESCR:Spreadsheet Documents - Removing a DataPilot Table
 REF:
 com.sun.star.sheet.XDataPilotTables
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Indexes_and_Index_Marks#Index_marks
-DESCR:Text - Indexes and Index Marks - Index marks
+LINK:Documentation/DevGuide/Text_Documents#Index_marks
+DESCR:Text Documents - Indexes and Index Marks - Index marks
 REF:
 com.sun.star.text.DocumentIndexMark
 com.sun.star.text.TextContent
@@ -2851,8 +2851,8 @@ TOPIC:
 com.sun.star.text.XDocumentIndexMark
 com.sun.star.text.BaseIndexMark
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XTransliteration
-DESCR:OfficeDev - Implementing a New Locale - XTransliteration
+LINK:Documentation/DevGuide/Office_Development#XTransliteration
+DESCR:Office Development - Implementing a New Locale - XTransliteration
 REF:
 com.sun.star.i18n.XTransliteration
 com.sun.star.i18n.TransliterationModulesNew
@@ -2861,15 +2861,15 @@ TOPIC:
 com.sun.star.i18n.TransliterationModulesNew
 com.sun.star.i18n.TransliterationModules
 
-LINK:Documentation/DevGuide/WritingUNO/Protocol_Handler#Overview
-DESCR:WritingUNO - Protocol Handler - Overview
+LINK:Documentation/DevGuide/Writing_UNO_Components#Overview
+DESCR:Writing UNO Components - Protocol Handler - Overview
 REF:
 com.sun.star.frame.ContentHandler
 com.sun.star.frame.FrameLoader
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Special_Service_Manager_Configurations
-DESCR:WritingUNO - Special Service Manager Configurations
+LINK:Documentation/DevGuide/Writing_UNO_Components#Special_Service_Manager_Configurations
+DESCR:Writing UNO Components - Special Service Manager Configurations
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.lang.XSingleServiceFactory
@@ -2877,14 +2877,14 @@ com.sun.star.container.XSet
 com.sun.star.lang.XSingleComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/UCP_Registration_Information
-DESCR:UCB - UCP Registration Information
+LINK:Documentation/DevGuide/Universal_Content_Broker#UCP_Registration_Information
+DESCR:Universal Content Broker - UCP Registration Information
 REF:
 com.sun.star.ucb.XContentIdentifier
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Dialogs_and_Controls
-DESCR:GUI - Dialogs and Controls
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Dialogs_and_Controls
+DESCR:Graphical User Interfaces - Dialogs and Controls
 REF:
 com.sun.star.awt.XWindow2
 com.sun.star.awt.XWindow
@@ -2898,28 +2898,28 @@ com.sun.star.awt.XView
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Check_Box
-DESCR:GUI - Check Box
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Check_Box
+DESCR:Graphical User Interfaces - Check Box
 REF:
 com.sun.star.awt.XItemListener
 com.sun.star.awt.UnoControlCheckBoxModel
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Rotating_and_Shearing
-DESCR:Drawings - Rotating and Shearing
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Rotating_and_Shearing
+DESCR:Drawings and Presentations - Rotating and Shearing
 REF:
 com.sun.star.drawing.RotationDescriptor
 TOPIC:
 com.sun.star.drawing.RotationDescriptor
 
-LINK:Documentation/DevGuide/Drawings/Moving_and_Scaling
-DESCR:Drawings - Moving and Scaling
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Moving_and_Scaling
+DESCR:Drawings and Presentations - Moving and Scaling
 REF:
 com.sun.star.drawing.XShape
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XLocaleData
-DESCR:OfficeDev - Implementing a New Locale - XLocaleData
+LINK:Documentation/DevGuide/Office_Development#XLocaleData
+DESCR:Office Development - Implementing a New Locale - XLocaleData
 REF:
 com.sun.star.i18n.Calendar
 com.sun.star.i18n.Currency
@@ -2937,8 +2937,8 @@ com.sun.star.i18n.Implementation
 TOPIC:
 com.sun.star.i18n.XLocaleData
 
-LINK:Documentation/DevGuide/UCB/Unconfigured_UCBs
-DESCR:UCB - Unconfigured UCBs
+LINK:Documentation/DevGuide/Universal_Content_Broker#Unconfigured_UCBs
+DESCR:Universal Content Broker - Unconfigured UCBs
 REF:
 com.sun.star.ucb.XContentProviderManager
 com.sun.star.ucb.ContentProviderInfo
@@ -2946,27 +2946,27 @@ com.sun.star.ucb.UniversalContentBroker
 TOPIC:
 com.sun.star.ucb.XContentProviderManager
 
-LINK:Documentation/DevGuide/Database/Adding_a_Group
-DESCR:Database - Adding a Group
+LINK:Documentation/DevGuide/Database_Access#Adding_a_Group
+DESCR:Database Access - Adding a Group
 REF:
 com.sun.star.sdbcx.GroupDescriptor
 TOPIC:
 com.sun.star.sdbcx.GroupDescriptor
 
-LINK:Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Property_Support
-DESCR:AdvUNO - XInvocation Bridge - Scripting Existing UNO Objects - Property Support
+LINK:Documentation/DevGuide/Advanced_UNO#Property_Support
+DESCR:Advanced UNO - XInvocation Bridge - Scripting Existing UNO Objects - Property Support
 REF:
 com.sun.star.script.Invocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Using_Prepared_Statements
-DESCR:Database - Using Prepared Statements
+LINK:Documentation/DevGuide/Database_Access#Using_Prepared_Statements
+DESCR:Database Access - Using Prepared Statements
 REF:
 com.sun.star.sdbc.Statement
 TOPIC:
 
-LINK:Documentation/DevGuide/AppendixC/The_Package_Content_Provider#Commands_and_Properties
-DESCR:AppendixC - The Package Content Provider - Commands and Properties
+LINK:Documentation/DevGuide/Universal_Content_Providers#Commands_and_Properties_5
+DESCR:Appendix C. Universal Content Providers - The Package Content Provider - Commands and Properties
 REF:
 com.sun.star.ucb.XContent
 com.sun.star.lang.XServiceInfo
@@ -2981,8 +2981,8 @@ com.sun.star.ucb.XCommandProcessor
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Settings#Document_Properties
-DESCR:Text - Settings - Document Properties
+LINK:Documentation/DevGuide/Text_Documents#Document_Properties
+DESCR:Text Documents - Settings - Document Properties
 REF:
 com.sun.star.document.RedlineDisplayType
 com.sun.star.lang.Locale
@@ -2992,37 +2992,37 @@ com.sun.star.text.TextDocument
 TOPIC:
 com.sun.star.text.TextDocument
 
-LINK:Documentation/DevGuide/GUI/Horizontal_Vertical_Line_Control
-DESCR:GUI - Horizontal Vertical Line Control
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Horizontal_Vertical_Line_Control
+DESCR:Graphical User Interfaces - Horizontal Vertical Line Control
 REF:
 com.sun.star.awt.UnoControlFixedLine
 com.sun.star.awt.UnoControlFixedLineModel
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/XDatabaseMetaData_Interface
-DESCR:Database - XDatabaseMetaData Interface
+LINK:Documentation/DevGuide/Database_Access#XDatabaseMetaData_Interface
+DESCR:Database Access - XDatabaseMetaData Interface
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 TOPIC:
 com.sun.star.sdbc.XDatabaseMetaData
 
-LINK:Documentation/DevGuide/OfficeDev/Managing_Number_Formats#NumberFormats_Service
-DESCR:OfficeDev - Managing Number Formats - NumberFormats Service
+LINK:Documentation/DevGuide/Office_Development#NumberFormats_Service
+DESCR:Office Development - Managing Number Formats - NumberFormats Service
 REF:
 com.sun.star.util.XNumberFormatTypes
 com.sun.star.util.XNumberFormats
 com.sun.star.util.NumberFormats
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Managing_Number_Formats#XNumberFormatTypes
-DESCR:OfficeDev - Managing Number Formats - NumberFormats Service - XNumberFormatTypes
+LINK:Documentation/DevGuide/Office_Development#XNumberFormatTypes
+DESCR:Office Development - Managing Number Formats - NumberFormats Service - XNumberFormatTypes
 REF:
 com.sun.star.util.NumberFormat
 com.sun.star.util.XNumberFormatTypes
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Inserting_Tables
-DESCR:Text - Inserting Tables
+LINK:Documentation/DevGuide/Text_Documents#Inserting_Tables
+DESCR:Text Documents - Inserting Tables
 REF:
 com.sun.star.text.XTextTable
 com.sun.star.lang.XMultiServiceFactory
@@ -3030,8 +3030,8 @@ com.sun.star.text.XText
 com.sun.star.text.XTextContent
 TOPIC:
 
-LINK:Documentation/DevGuide/JavaBean/API_Overview
-DESCR:JavaBean - API Overview
+LINK:Documentation/DevGuide/JavaBean_for_Office_Components#API_Overview
+DESCR:JavaBean for Office Components - API Overview
 REF:
 com.sun.star.frame.Controller
 com.sun.star.lang.XMultiServiceFactory
@@ -3040,8 +3040,8 @@ com.sun.star.frame.Frame
 com.sun.star.document.OfficeDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Dialog_Controls
-DESCR:GUI - Dialog Controls
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Dialog_Controls
+DESCR:Graphical User Interfaces - Dialog Controls
 REF:
 com.sun.star.awt.Size
 com.sun.star.beans.XPropertySet
@@ -3051,8 +3051,8 @@ com.sun.star.awt.XLayoutConstrains
 com.sun.star.beans.XMultiPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Creating_Frames_Manually#Assigning_Windows_to_Frames
-DESCR:OfficeDev - Creating Frames Manually - Assigning Windows to Frames
+LINK:Documentation/DevGuide/Office_Development#Assigning_Windows_to_Frames
+DESCR:Office Development - Creating Frames Manually - Assigning Windows to Frames
 REF:
 com.sun.star.awt.XWindow
 com.sun.star.awt.Toolkit
@@ -3062,14 +3062,14 @@ com.sun.star.frame.Frame
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Label_Field
-DESCR:Basic - Label Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Label_Field
+DESCR:LibreOffice Basic - Label Field
 REF:
 com.sun.star.awt.UnoControlFixedText
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Events
-DESCR:OfficeDev - Events
+LINK:Documentation/DevGuide/Office_Development#Events
+DESCR:Office Development - Events
 REF:
 com.sun.star.linguistic2.DictionaryListEvent
 com.sun.star.linguistic2.XLinguServiceEventListener
@@ -3080,16 +3080,16 @@ com.sun.star.linguistic2.XDictionary
 com.sun.star.linguistic2.DictionaryEvent
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Understanding_the_API_Reference
-DESCR:ProUNO - Understanding the API Reference
+LINK:Documentation/DevGuide/Professional_UNO#Understanding_the_API_Reference
+DESCR:Professional UNO - Understanding the API Reference
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.text.TextFrame
 com.sun.star.text.TextDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XEventBroadcaster
-DESCR:OfficeDev - Component - Models - XEventBroadcaster
+LINK:Documentation/DevGuide/Office_Development#XEventBroadcaster
+DESCR:Office Development - Component - Models - XEventBroadcaster
 REF:
 com.sun.star.document.EventObject
 com.sun.star.document.XEventBroadcaster
@@ -3097,15 +3097,15 @@ com.sun.star.document.Events
 TOPIC:
 com.sun.star.document.XEventBroadcaster
 
-LINK:Documentation/DevGuide/AppendixA/Events#Usage
-DESCR:AppendixA - Events - null - Usage
+LINK:Documentation/DevGuide/LibreOffice_API-Design-Guidelines#Usage_5
+DESCR:Appendix A. Guidelines and Specifications - Events - Usage
 REF:
 com.sun.star.lang.XEventListener
 com.sun.star.lang.EventObject
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Editing_Text#Strings
-DESCR:Text - Editing Text - Strings
+LINK:Documentation/DevGuide/Text_Documents#Strings
+DESCR:Text Documents - Editing Text - Strings
 REF:
 com.sun.star.text.XSentenceCursor
 com.sun.star.text.XWordCursor
@@ -3113,22 +3113,22 @@ com.sun.star.text.XParagraphCursor
 TOPIC:
 com.sun.star.text.XSimpleText
 
-LINK:Documentation/DevGuide/Basic/Check_Box
-DESCR:Basic - Check Box
+LINK:Documentation/DevGuide/LibreOffice_Basic#Check_Box
+DESCR:LibreOffice Basic - Check Box
 REF:
 com.sun.star.awt.XCheckBox
 com.sun.star.awt.UnoControlCheckBox
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XModifiable
-DESCR:OfficeDev - Component - Models - XModifiable
+LINK:Documentation/DevGuide/Office_Development#XModifiable
+DESCR:Office Development - Component - Models - XModifiable
 REF:
 com.sun.star.util.XModifiable
 TOPIC:
 com.sun.star.util.XModifiable
 
-LINK:Documentation/DevGuide/Drawings/Bezier_Shapes
-DESCR:Drawings - Bezier Shapes
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Bezier_Shapes
+DESCR:Drawings and Presentations - Bezier Shapes
 REF:
 com.sun.star.drawing.PolyPolygonBezierDescriptor
 com.sun.star.drawing.PolyPolygonBezierCoords
@@ -3136,14 +3136,14 @@ com.sun.star.drawing.PolygonKind
 TOPIC:
 com.sun.star.drawing.PolyPolygonBezierDescriptor
 
-LINK:Documentation/DevGuide/OfficeDev/Filtering_Process#ExtendedTypeDetection
-DESCR:OfficeDev - Filtering Process - ExtendedTypeDetection
+LINK:Documentation/DevGuide/Office_Development#ExtendedTypeDetection
+DESCR:Office Development - Filtering Process - ExtendedTypeDetection
 REF:
 com.sun.star.document.ExtendedTypeDetection
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XExtendedIndexEntrySupplier
-DESCR:OfficeDev - Overview and Using the API - XExtendedIndexEntrySupplier
+LINK:Documentation/DevGuide/Office_Development#XExtendedIndexEntrySupplier
+DESCR:Office Development - Overview and Using the API - XExtendedIndexEntrySupplier
 REF:
 com.sun.star.i18n.XIndexEntrySupplier
 com.sun.star.i18n.XInputSequenceChecker
@@ -3152,8 +3152,8 @@ TOPIC:
 com.sun.star.i18n.XInputSequenceChecker
 com.sun.star.i18n.XExtendedIndexEntrySupplier
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/The_Bridge_Services
-DESCR:ProUNO - Bridge - The Bridge Services
+LINK:Documentation/DevGuide/Professional_UNO#The_Bridge_Services
+DESCR:Professional UNO - Bridge - The Bridge Services
 REF:
 com.sun.star.bridge.XBridgeSupplier2
 com.sun.star.lang.XMultiServiceFactory
@@ -3162,8 +3162,8 @@ com.sun.star.bridge.oleautomation.Factory
 com.sun.star.bridge.oleautomation.BridgeSupplier
 com.sun.star.bridge.oleautomation.ApplicationRegistration
 
-LINK:Documentation/DevGuide/Config/Reading_Configuration_Data
-DESCR:Config - Reading Configuration Data
+LINK:Documentation/DevGuide/Configuration_Management#Reading_Configuration_Data
+DESCR:Configuration Management - Reading Configuration Data
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.container.XContainer
@@ -3182,8 +3182,8 @@ com.sun.star.beans.XMultiPropertySet
 TOPIC:
 com.sun.star.configuration.ConfigurationAccess
 
-LINK:Documentation/DevGuide/Drawings/Other_Drawing_Specific_View_Settings
-DESCR:Drawings - Other Drawing Specific View Settings
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Other_Drawing_Specific_View_Settings
+DESCR:Drawings and Presentations - Other Drawing Specific View Settings
 REF:
 com.sun.star.document.XViewDataSupplier
 com.sun.star.drawing.XDrawPage
@@ -3193,8 +3193,8 @@ TOPIC:
 com.sun.star.document.XViewDataSupplier
 com.sun.star.drawing.DrawingDocumentDrawView
 
-LINK:Documentation/DevGuide/Spreadsheets/Dimensions
-DESCR:Spreadsheets - Dimensions
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Dimensions
+DESCR:Spreadsheet Documents - Dimensions
 REF:
 com.sun.star.sheet.DataPilotSourceDimension
 com.sun.star.container.XNamed
@@ -3205,8 +3205,8 @@ com.sun.star.sheet.DataPilotSourceDimensions
 TOPIC:
 com.sun.star.sheet.DataPilotSourceDimensions
 
-LINK:Documentation/DevGuide/Text/Text_Fields
-DESCR:Text - Text Fields
+LINK:Documentation/DevGuide/Text_Documents#Text_Fields
+DESCR:Text Documents - Text Fields
 REF:
 com.sun.star.text.BibliographyDataField
 com.sun.star.text.textfield.User
@@ -3280,28 +3280,28 @@ com.sun.star.text.fieldmaster
 com.sun.star.text.TextField
 com.sun.star.text.XTextField
 
-LINK:Documentation/DevGuide/Forms/Model-View_Interaction
+LINK:Documentation/DevGuide/Forms#Model-View_Interaction
 DESCR:Forms - Model-View Interaction
 REF:
 com.sun.star.form.component.TextField
 com.sun.star.beans.XPropertyChangeListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Option_Button
-DESCR:Basic - Option Button
+LINK:Documentation/DevGuide/LibreOffice_Basic#Option_Button
+DESCR:LibreOffice Basic - Option Button
 REF:
 com.sun.star.awt.UnoControlRadioButton
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Using_Spellchecker#Relevant_properties
-DESCR:OfficeDev - Using Spellchecker - Relevant properties
+LINK:Documentation/DevGuide/Office_Development#Relevant_properties
+DESCR:Office Development - Using Spellchecker - Relevant properties
 REF:
 com.sun.star.linguistic2.XSpellAlternatives
 com.sun.star.linguistic2.LinguProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Using_UNO_Interfaces
-DESCR:ProUNO - Using UNO Interfaces
+LINK:Documentation/DevGuide/Professional_UNO#Using_UNO_Interfaces
+DESCR:Professional UNO - Using UNO Interfaces
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.drawing.Text
@@ -3311,14 +3311,14 @@ com.sun.star.bridge.UnoUrlResolver
 TOPIC:
 com.sun.star.uno.XInterface
 
-LINK:Documentation/DevGuide/Database/Piggyback_Connections
-DESCR:Database - Piggyback Connections
+LINK:Documentation/DevGuide/Database_Access#Piggyback_Connections
+DESCR:Database Access - Piggyback Connections
 REF:
 com.sun.star.sdb.RowSet
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Service_Names
-DESCR:Spreadsheets - Service Names
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Service_Names
+DESCR:Spreadsheet Documents - Service Names
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.sheet.AddIn
@@ -3326,8 +3326,8 @@ com.sun.star.lang.XServiceName
 TOPIC:
 com.sun.star.lang.XServiceInfo
 
-LINK:Documentation/DevGuide/Text/Editing_Text#Text_Contents_Other_Than_Strings
-DESCR:Text - Editing Text - Text Contents Other Than Strings
+LINK:Documentation/DevGuide/Text_Documents#Text_Contents_Other_Than_Strings
+DESCR:Text Documents - Editing Text - Text Contents Other Than Strings
 REF:
 com.sun.star.text.TextContent
 com.sun.star.lang.XComponent
@@ -3343,28 +3343,28 @@ TOPIC:
 com.sun.star.text.TextContent
 com.sun.star.text.XText
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Implementing_without_Helpers#Providing_a_Single_Factory
-DESCR:WritingUNO - C++ - Implementing without Helpers - Providing a Single Factory
+LINK:Documentation/DevGuide/Writing_UNO_Components#Providing_a_Single_Factory
+DESCR:Writing UNO Components - C++ - Implementing without Helpers - Providing a Single Factory
 REF:
 com.sun.star.uno.XComponentContext
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XInitialization
-DESCR:WritingUNO - XInitialization
+LINK:Documentation/DevGuide/Writing_UNO_Components#XInitialization
+DESCR:Writing UNO Components - XInitialization
 REF:
 com.sun.star.lang.XInitialization
 TOPIC:
 com.sun.star.lang.XInitialization
 
-LINK:Documentation/DevGuide/AppendixC/The_Hierarchy_Content_Provider#Creation_of_New_HCP_Content
-DESCR:AppendixC - The Hierarchy Content Provider - Creation of New HCP Content
+LINK:Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_HCP_Content
+DESCR:Appendix C. Universal Content Providers - The Hierarchy Content Provider - Creation of New HCP Content
 REF:
 com.sun.star.ucb.XContentCreator
 TOPIC:
 com.sun.star.ucb.XContentCreator
 
-LINK:Documentation/DevGuide/Text/Accessing_Existing_Tables
-DESCR:Text - Accessing Existing Tables
+LINK:Documentation/DevGuide/Text_Documents#Accessing_Existing_Tables
+DESCR:Text Documents - Accessing Existing Tables
 REF:
 com.sun.star.text.XTextTablesSupplier
 com.sun.star.text.TextTables
@@ -3372,7 +3372,7 @@ com.sun.star.container.XIndexAccess
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Forms_as_Row_Sets
+LINK:Documentation/DevGuide/Forms#Forms_as_Row_Sets
 DESCR:Forms - Forms as Row Sets
 REF:
 com.sun.star.sdb.RowSet
@@ -3380,8 +3380,8 @@ com.sun.star.form.component.DataForm
 TOPIC:
 com.sun.star.sdb.RowSet
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#XTypeDescription
-DESCR:AdvUNO - UNO Reflection API - CoreReflection Service - XTypeDescription
+LINK:Documentation/DevGuide/Advanced_UNO#XTypeDescription
+DESCR:Advanced UNO - UNO Reflection API - CoreReflection Service - XTypeDescription
 REF:
 com.sun.star.reflection.XEnumTypeDescription
 com.sun.star.reflection.TypeDescriptionManager
@@ -3396,21 +3396,21 @@ com.sun.star.reflection.XCompoundTypeDescription
 com.sun.star.container.XHierarchicalNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Controllers#XSelectionSupplier
-DESCR:OfficeDev - Component - Controllers - XSelectionSupplier
+LINK:Documentation/DevGuide/Office_Development#XSelectionSupplier
+DESCR:Office Development - Component - Controllers - XSelectionSupplier
 REF:
 com.sun.star.view.XSelectionSupplier
 com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.view.XSelectionSupplier
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Getting_Information_about_UNO_Objects#Inspecting_properties_during_debugging
-DESCR:ProUNO - Basic - Getting Information about UNO Objects - Inspecting properties during debugging
+LINK:Documentation/DevGuide/Professional_UNO#Inspecting_properties_during_debugging
+DESCR:Professional UNO - Basic - Getting Information about UNO Objects - Inspecting properties during debugging
 REF:
 com.sun.star.beans.XPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Control_Models_as_Bound_Components
+LINK:Documentation/DevGuide/Forms#Control_Models_as_Bound_Components
 DESCR:Forms - Control Models as Bound Components
 REF:
 com.sun.star.form.component.TextField
@@ -3418,8 +3418,8 @@ com.sun.star.form.component.NumericField
 com.sun.star.form.component.DataForm
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Capabilities_of_SheetCellRanges_Container
-DESCR:Spreadsheets - Capabilities of SheetCellRanges Container
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Capabilities_of_SheetCellRanges_Container
+DESCR:Spreadsheet Documents - Capabilities of SheetCellRanges Container
 REF:
 com.sun.star.sheet.XSheetCellRangeContainer
 com.sun.star.sheet.XCellRangesQuery
@@ -3431,21 +3431,21 @@ com.sun.star.container.XNameAccess
 com.sun.star.sheet.SheetRangesQuery
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Database_Import
-DESCR:Spreadsheets - Database Import
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Database_Import
+DESCR:Spreadsheet Documents - Database Import
 REF:
 com.sun.star.util.XImportable
 TOPIC:
 com.sun.star.sheet.DatabaseImportDescriptor
 
-LINK:Documentation/DevGuide/AppendixA/Special_Cases#Collection_Interfaces
-DESCR:AppendixA - Special Cases - Collection Interfaces
+LINK:Documentation/DevGuide/LibreOffice_API-Design-Guidelines#Collection_Interfaces
+DESCR:Appendix A. Guidelines and Specifications - Special Cases - Collection Interfaces
 REF:
 com.sun.star.text.TextDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Variable_Results
-DESCR:Spreadsheets - Variable Results
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Variable_Results
+DESCR:Spreadsheet Documents - Variable Results
 REF:
 com.sun.star.sheet.XVolatileResult
 com.sun.star.sheet.VolatileResult
@@ -3454,8 +3454,8 @@ com.sun.star.sheet.XResultListener
 TOPIC:
 com.sun.star.sheet.XVolatileResult
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#Converter_Service
-DESCR:AdvUNO - UNO Reflection API - Converter Service
+LINK:Documentation/DevGuide/Advanced_UNO#Converter_Service
+DESCR:Advanced UNO - UNO Reflection API - Converter Service
 REF:
 com.sun.star.script.XTypeConverter
 com.sun.star.uno.TypeClass
@@ -3463,8 +3463,8 @@ com.sun.star.script.Converter
 com.sun.star.script.CannotConvertException
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/The_SQLQueryComposer
-DESCR:Database - The SQLQueryComposer
+LINK:Documentation/DevGuide/Database_Access#The_SQLQueryComposer
+DESCR:Database Access - The SQLQueryComposer
 REF:
 com.sun.star.sdb.SingleSelectQueryComposer
 com.sun.star.sdb.XSQLQueryComposerFactory
@@ -3477,22 +3477,22 @@ com.sun.star.sdb.SQLQueryComposer
 TOPIC:
 com.sun.star.sdb.SQLQueryComposer
 
-LINK:Documentation/DevGuide/GUI/Roadmap_Control#Roadmap
-DESCR:GUI - Roadmap Control - null - Roadmap
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Roadmap
+DESCR:Graphical User Interfaces - Roadmap Control - Roadmap
 REF:
 com.sun.star.awt.XItemEventBroadcaster
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Absolute_Address
-DESCR:Spreadsheets - Absolute Address
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Absolute_Address
+DESCR:Spreadsheet Documents - Absolute Address
 REF:
 com.sun.star.sheet.XCellRangeAddressable
 com.sun.star.table.CellRangeAddress
 TOPIC:
 com.sun.star.sheet.XCellRangeAddressable
 
-LINK:Documentation/DevGuide/AppendixC/The_FTP_Content_Provider#Commands_and_Properties
-DESCR:AppendixC - The FTP Content Provider - Commands and Properties
+LINK:Documentation/DevGuide/Universal_Content_Providers#Commands_and_Properties_3
+DESCR:Appendix C. Universal Content Providers - The FTP Content Provider - Commands and Properties
 REF:
 com.sun.star.ucb.XContent
 com.sun.star.lang.XServiceInfo
@@ -3507,48 +3507,48 @@ com.sun.star.ucb.XCommandProcessor
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Manipulating_the_Data
-DESCR:Database - Manipulating the Data
+LINK:Documentation/DevGuide/Database_Access#Manipulating_the_Data
+DESCR:Database Access - Manipulating the Data
 REF:
 com.sun.star.sdb.RowSet
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XNativeNumberSupplier
-DESCR:OfficeDev - Overview and Using the API - XNativeNumberSupplier
+LINK:Documentation/DevGuide/Office_Development#XNativeNumberSupplier
+DESCR:Office Development - Overview and Using the API - XNativeNumberSupplier
 REF:
 com.sun.star.i18n.XNativeNumberSupplier
 TOPIC:
 com.sun.star.i18n.XNativeNumberSupplier
 
-LINK:Documentation/DevGuide/Database/Retrieving_Values_from_Result_Sets
-DESCR:Database - Retrieving Values from Result Sets
+LINK:Documentation/DevGuide/Database_Access#Retrieving_Values_from_Result_Sets
+DESCR:Database Access - Retrieving Values from Result Sets
 REF:
 com.sun.star.sdb.RowSet
 com.sun.star.sdb.ResultSet
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Database_Design#Retrieving_Information_about_a_Database
-DESCR:Database - Database Design - Retrieving Information about a Database
+LINK:Documentation/DevGuide/Database_Access#Retrieving_Information_about_a_Database
+DESCR:Database Access - Database Design - Retrieving Information about a Database
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 TOPIC:
 com.sun.star.sdbc.XDatabaseMetaData
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Ranges
-DESCR:Spreadsheets - Cell Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Ranges
+DESCR:Spreadsheet Documents - Cell Ranges
 REF:
 com.sun.star.sheet.SheetCellRange
 TOPIC:
 com.sun.star.sheet.SheetCellRange
 
-LINK:Documentation/DevGuide/WritingUNO/Writing_the_Specification
-DESCR:WritingUNO - Writing the Specification
+LINK:Documentation/DevGuide/Writing_UNO_Components#Writing_the_Specification
+DESCR:Writing UNO Components - Writing the Specification
 REF:
 com.sun.star.bridge.XUnoUrlResolver
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Connecting_Through_a_DataSource
-DESCR:Database - Connecting Through a DataSource
+LINK:Documentation/DevGuide/Database_Access#Connecting_Through_a_DataSource
+DESCR:Database Access - Connecting Through a DataSource
 REF:
 com.sun.star.sdbc.XDataSource
 com.sun.star.sdb.InteractionHandler
@@ -3556,15 +3556,15 @@ com.sun.star.sdb.XCompletedConnection
 TOPIC:
 com.sun.star.sdbc.XDataSource
 
-LINK:Documentation/DevGuide/GUI/Date_Field
-DESCR:GUI - Date Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Date_Field
+DESCR:Graphical User Interfaces - Date Field
 REF:
 com.sun.star.awt.UnoControlDateField
 com.sun.star.awt.UnoControlDateFieldModel
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Opening_a_Connection
-DESCR:ProUNO - Opening a Connection
+LINK:Documentation/DevGuide/Professional_UNO#Opening_a_Connection
+DESCR:Professional UNO - Opening a Connection
 REF:
 com.sun.star.connection.Acceptor
 com.sun.star.connection.Connector
@@ -3579,8 +3579,8 @@ com.sun.star.connection.XConnector
 com.sun.star.bridge.BridgeFactory
 com.sun.star.connection.XAcceptor
 
-LINK:Documentation/DevGuide/Database/Connection_Service
-DESCR:Database - Connection Service
+LINK:Documentation/DevGuide/Database_Access#Connection_Service
+DESCR:Database Access - Connection Service
 REF:
 com.sun.star.sdbc.Connection
 com.sun.star.sdbc.XDatabaseMetaData
@@ -3593,8 +3593,8 @@ com.sun.star.sdbc.Statement
 TOPIC:
 com.sun.star.sdbc.Connection
 
-LINK:Documentation/DevGuide/OfficeDev/Managing_Number_Formats
-DESCR:OfficeDev - Managing Number Formats
+LINK:Documentation/DevGuide/Office_Development#Managing_Number_Formats
+DESCR:Office Development - Managing Number Formats
 REF:
 com.sun.star.sdb.DatabaseEnvironment
 com.sun.star.beans.XPropertySet
@@ -3605,8 +3605,8 @@ com.sun.star.sdb.DatabaseAccess
 com.sun.star.util.XNumberFormatsSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Bookmarks
-DESCR:Text - Bookmarks
+LINK:Documentation/DevGuide/Text_Documents#Bookmarks
+DESCR:Text Documents - Bookmarks
 REF:
 com.sun.star.text.TextContent
 com.sun.star.container.XNamed
@@ -3620,8 +3620,8 @@ com.sun.star.text.Bookmarks
 TOPIC:
 com.sun.star.text.Bookmark
 
-LINK:Documentation/DevGuide/Database/Connections#Communication
-DESCR:Database - Connections - Understanding Connections - Communication
+LINK:Documentation/DevGuide/Database_Access#Communication
+DESCR:Database Access - Connections - Understanding Connections - Communication
 REF:
 com.sun.star.sdbc.Connection
 com.sun.star.sdbc.SQLWarning
@@ -3629,22 +3629,22 @@ com.sun.star.sdbc.XWarningsSupplier
 com.sun.star.sdbc.XConnection
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XExtendedCalendar
-DESCR:OfficeDev - Overview and Using the API - XExtendedCalendar
+LINK:Documentation/DevGuide/Office_Development#XExtendedCalendar
+DESCR:Office Development - Overview and Using the API - XExtendedCalendar
 REF:
 com.sun.star.i18n.XExtendedCalendar
 com.sun.star.i18n.XCalendar
 TOPIC:
 com.sun.star.i18n.XExtendedCalendar
 
-LINK:Documentation/DevGuide/Drawings/Glue_Points_and_Connectors
-DESCR:Drawings - Gluepoints and Connectors
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Glue_Points_and_Connectors
+DESCR:Drawings and Presentations - Gluepoints and Connectors
 REF:
 com.sun.star.drawing.ConnectorShape
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Columns_and_Rows
-DESCR:Spreadsheets - Columns and Rows
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Columns_and_Rows
+DESCR:Spreadsheet Documents - Columns and Rows
 REF:
 com.sun.star.table.XTableColumns
 com.sun.star.container.XNamed
@@ -3662,8 +3662,8 @@ TOPIC:
 com.sun.star.table.TableColumns
 com.sun.star.table.TableRows
 
-LINK:Documentation/DevGuide/Database/User_Service
-DESCR:Database - User Service
+LINK:Documentation/DevGuide/Database_Access#User_Service
+DESCR:Database Access - User Service
 REF:
 com.sun.star.sdbcx.XAuthorizable
 com.sun.star.sdbcx.User
@@ -3671,8 +3671,8 @@ com.sun.star.sdbcx.XUser
 TOPIC:
 com.sun.star.sdbcx.XUser
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Exceptions_and_Errorcodes
-DESCR:ProUNO - Bridge - Exceptions and Errorcodes
+LINK:Documentation/DevGuide/Professional_UNO#Exceptions_and_Errorcodes
+DESCR:Professional UNO - Bridge - Exceptions and Errorcodes
 REF:
 com.sun.star.lang.IllegalArgumentException
 com.sun.star.beans.UnknownPropertyException
@@ -3686,8 +3686,8 @@ com.sun.star.uno.RuntimeException
 com.sun.star.script.CannotConvertException
 com.sun.star.reflection.InvocationTargetException
 
-LINK:Documentation/DevGuide/OfficeDev/Desktop_Environment
-DESCR:OfficeDev - Desktop Environment
+LINK:Documentation/DevGuide/Office_Development#Desktop_Environment
+DESCR:Office Development - Desktop Environment
 REF:
 com.sun.star.document.TypeDetection
 com.sun.star.lang.XComponent
@@ -3696,48 +3696,48 @@ com.sun.star.frame.Desktop
 TOPIC:
 com.sun.star.frame.Desktop
 
-LINK:Documentation/DevGuide/GUI/Roadmap_Control#Roadmap_Controlmodel
-DESCR:GUI - Roadmap Control - null - Roadmap Controlmodel
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Roadmap_Controlmodel
+DESCR:Graphical User Interfaces - Roadmap Control - Roadmap Controlmodel
 REF:
 com.sun.star.awt.UnoControlRoadmapModel
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/C++/Using_Weak_References
-DESCR:ProUNO - C++ - Using Weak References
+LINK:Documentation/DevGuide/Professional_UNO#Using_Weak_References
+DESCR:Professional UNO - C++ - Using Weak References
 REF:
 com.sun.star.lang.XEventListener
 com.sun.star.uno.XWeak
 TOPIC:
 com.sun.star.uno.XWeak
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Getting_Information_about_UNO_Objects#Inspecting_Methods_During_Debugging
-DESCR:ProUNO - Basic - Getting Information about UNO Objects - Inspecting Methods During Debugging
+LINK:Documentation/DevGuide/Professional_UNO#Inspecting_Methods_During_Debugging
+DESCR:Professional UNO - Basic - Getting Information about UNO Objects - Inspecting Methods During Debugging
 REF:
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Formatted_Field
-DESCR:Basic - Formatted Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Formatted_Field
+DESCR:LibreOffice Basic - Formatted Field
 REF:
 com.sun.star.awt.UnoControlFormattedField
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/Implementing_UNO_Language_Bindings#Bootstrapping
-DESCR:AdvUNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - Bootstrapping
+LINK:Documentation/DevGuide/Advanced_UNO#Bootstrapping
+DESCR:Advanced UNO - Implementing UNO Language Bindings - Overview of Language Bindings and Bridges - Bootstrapping
 REF:
 com.sun.star.bridge.UnoUrlResolver
 TOPIC:
 com.sun.star.bridge.UnoUrlResolver
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/AppendixA/Services#Naming
-DESCR:AppendixA - Services - Naming
+LINK:Documentation/DevGuide/LibreOffice_API-Design-Guidelines#Naming_6
+DESCR:Appendix A. Guidelines and Specifications - Services - Naming
 REF:
 com.sun.star.text.TextDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Default_Mappings
-DESCR:ProUNO - Bridge - Default Mappings
+LINK:Documentation/DevGuide/Professional_UNO#Default_Mappings
+DESCR:Professional UNO - Bridge - Default Mappings
 REF:
 com.sun.star.bridge.oleautomation.SCode
 com.sun.star.uno.XInterface
@@ -3747,7 +3747,7 @@ com.sun.star.bridge.oleautomation.Currency
 com.sun.star.bridge.oleautomation.Decimal
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Validation
+LINK:Documentation/DevGuide/Forms#Validation
 DESCR:Forms - Validation
 REF:
 com.sun.star.form.component.TextField
@@ -3762,20 +3762,20 @@ com.sun.star.form.component.DateField
 TOPIC:
 com.sun.star.form.validation.XValidatable
 
-LINK:Documentation/DevGuide/Forms/Form_Components
+LINK:Documentation/DevGuide/Forms#Form_Components
 DESCR:Forms - Form Components
 REF:
 com.sun.star.form
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Image_Control
-DESCR:Basic - Image Control
+LINK:Documentation/DevGuide/LibreOffice_Basic#Image_Control
+DESCR:LibreOffice Basic - Image Control
 REF:
 com.sun.star.awt.UnoControlImageControl
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/C++/Establishing_Interprocess_Connections
-DESCR:ProUNO - C++ - Establishing Interprocess Connections
+LINK:Documentation/DevGuide/Professional_UNO#Establishing_Interprocess_Connections
+DESCR:Professional UNO - C++ - Establishing Interprocess Connections
 REF:
 com.sun.star.lang.XMultiServiceFactory
 TOPIC:
@@ -3786,27 +3786,27 @@ com.sun.star.bridge.UnoUrlResolver
 com.sun.star.lang.XMultiComponentFactory
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus#Register_and_Remove_an_Interceptor
-DESCR:WritingUNO - Intercepting Context Menus - Register and Remove an Interceptor
+LINK:Documentation/DevGuide/Writing_UNO_Components#Register_and_Remove_an_Interceptor
+DESCR:Writing UNO Components - Intercepting Context Menus - Register and Remove an Interceptor
 REF:
 com.sun.star.ui.XContextMenuInterception
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Understanding_the_API_Reference#Object_Composition
-DESCR:ProUNO - Understanding the API Reference - Object Composition
+LINK:Documentation/DevGuide/Professional_UNO#Object_Composition
+DESCR:Professional UNO - Understanding the API Reference - Object Composition
 REF:
 com.sun.star.uno.XInterface
 com.sun.star.text.XText
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Using_Hyphenator
-DESCR:OfficeDev - Using Hyphenator
+LINK:Documentation/DevGuide/Office_Development#Using_Hyphenator
+DESCR:Office Development - Using Hyphenator
 REF:
 com.sun.star.linguistic2.XHyphenator
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Conditional_Formats
-DESCR:Spreadsheets - Conditional Formats
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Conditional_Formats
+DESCR:Spreadsheet Documents - Conditional Formats
 REF:
 com.sun.star.sheet.XSheetConditionalEntry
 com.sun.star.sheet.XSheetCondition
@@ -3822,8 +3822,8 @@ com.sun.star.sheet.ConditionOperator
 com.sun.star.sheet.XSheetConditionalEntries
 com.sun.star.sheet.TableConditionalFormat
 
-LINK:Documentation/DevGuide/UCB/Creating
-DESCR:UCB - Creating
+LINK:Documentation/DevGuide/Universal_Content_Broker#Creating
+DESCR:Universal Content Broker - Creating
 REF:
 com.sun.star.ucb.XContentCreator
 com.sun.star.ucb.ContentInfo
@@ -3832,15 +3832,15 @@ TOPIC:
 com.sun.star.ucb.XContentCreator
 com.sun.star.ucb.ContentInfo
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Mapping_of_Interfaces_and_Structures
-DESCR:ProUNO - Bridge - Mapping of Interfaces and Structures
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Interfaces_and_Structures
+DESCR:Professional UNO - Bridge - Mapping of Interfaces and Structures
 REF:
 com.sun.star.script.XInvocation
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Capabilities_of_SheetCellRange
-DESCR:Spreadsheets - Capabilities of SheetCellRange
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Capabilities_of_SheetCellRange
+DESCR:Spreadsheet Documents - Capabilities of SheetCellRange
 REF:
 com.sun.star.sheet.XCellRangesQuery
 com.sun.star.table.XColumnRowRange
@@ -3867,15 +3867,15 @@ com.sun.star.table.XAutoFormattable
 com.sun.star.sheet.XSheetFilterable
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Frames#Frame_Setup
-DESCR:OfficeDev - Component - Frames - XFrame - Frame Setup
+LINK:Documentation/DevGuide/Office_Development#Frame_Setup
+DESCR:Office Development - Component - Frames - XFrame - Frame Setup
 REF:
 com.sun.star.frame.XFrame
 TOPIC:
 com.sun.star.frame.XFrame
 
-LINK:Documentation/DevGuide/Drawings/Setting_the_Current_Page
-DESCR:Drawings - Setting the Current Page
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Setting_the_Current_Page
+DESCR:Drawings and Presentations - Setting the Current Page
 REF:
 com.sun.star.view.XSelectionSupplier
 com.sun.star.frame.XController
@@ -3889,38 +3889,38 @@ TOPIC:
 com.sun.star.view.XSelectionSupplier
 com.sun.star.drawing.DrawingDocumentDrawView
 
-LINK:Documentation/DevGuide/Spreadsheets/Sheet_Outline
-DESCR:Spreadsheets - Sheet Outline
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Sheet_Outline
+DESCR:Spreadsheet Documents - Sheet Outline
 REF:
 com.sun.star.sheet.XSheetOutline
 com.sun.star.table.TableOrientation
 TOPIC:
 com.sun.star.sheet.XSheetOutline
 
-LINK:Documentation/DevGuide/Text/Example:_Visible_Cursor_Position
-DESCR:Text - Example: Visible Cursor Position
+LINK:Documentation/DevGuide/Text_Documents#Example:_Visible_Cursor_Position
+DESCR:Text Documents - Example: Visible Cursor Position
 REF:
 com.sun.star.frame.Desktop
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Driver_Service
-DESCR:Database - Driver Service
+LINK:Documentation/DevGuide/Database_Access#Driver_Service
+DESCR:Database Access - Driver Service
 REF:
 com.sun.star.sdbc.XDriver
 com.sun.star.sdbc.Driver
 TOPIC:
 com.sun.star.sdbc.Driver
 
-LINK:Documentation/DevGuide/Database/The_Descriptor_Pattern
-DESCR:Database - The Descriptor Pattern
+LINK:Documentation/DevGuide/Database_Access#The_Descriptor_Pattern
+DESCR:Database Access - The Descriptor Pattern
 REF:
 com.sun.star.sdbcx.XDataDescriptorFactory
 com.sun.star.sdbcx.TableDescriptor
 com.sun.star.beans.XPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Sheet_Links
-DESCR:Spreadsheets - Sheet Links
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Sheet_Links
+DESCR:Spreadsheet Documents - Sheet Links
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.sheet.SheetLink
@@ -3934,8 +3934,8 @@ com.sun.star.sheet.SheetLink
 com.sun.star.sheet.SheetLinks
 com.sun.star.sheet.XSheetLinkable
 
-LINK:Documentation/DevGuide/Spreadsheets/Levels
-DESCR:Spreadsheets - Levels
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Levels
+DESCR:Spreadsheet Documents - Levels
 REF:
 com.sun.star.sheet.MemberResultFlags
 com.sun.star.sheet.GeneralFunction
@@ -3946,28 +3946,28 @@ com.sun.star.sheet.XDataPilotMemberResults
 TOPIC:
 com.sun.star.sheet.DataPilotSourceLevel
 
-LINK:Documentation/DevGuide/Forms/Form_Layer_Views#Locating_Controls
+LINK:Documentation/DevGuide/Forms#Locating_Controls
 DESCR:Forms - Form Layer Views - Locating Controls
 REF:
 com.sun.star.view.XControlAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Java/Mapping_of_Singletons
-DESCR:ProUNO - Java - Mapping of Singletons
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Singletons
+DESCR:Professional UNO - Java - Mapping of Singletons
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.uno.DeploymentException
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/First_Contact#Failed_Connections
-DESCR:FirstSteps - First Contact - Getting Started - Failed Connections
+LINK:Documentation/DevGuide/First_Steps#Failed_Connections
+DESCR:First Steps - First Contact - Getting Started - Failed Connections
 REF:
 com.sun.star.lang.DisposedException
 TOPIC:
 com.sun.star.lang.DisposedException
 
-LINK:Documentation/DevGuide/Spreadsheets/Fill_Series
-DESCR:Spreadsheets - Fill Series
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Fill_Series
+DESCR:Spreadsheet Documents - Fill Series
 REF:
 com.sun.star.sheet.FillDateMode
 com.sun.star.sheet.XCellSeries
@@ -3976,16 +3976,16 @@ com.sun.star.sheet.FillMode
 TOPIC:
 com.sun.star.sheet.XCellSeries
 
-LINK:Documentation/DevGuide/ProUNO/Exceptions
-DESCR:ProUNO - Exceptions
+LINK:Documentation/DevGuide/Professional_UNO#Exceptions
+DESCR:Professional UNO - Exceptions
 REF:
 com.sun.star.uno.Exception
 com.sun.star.uno.XInterface
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Charts
-DESCR:Spreadsheets - Other Table Operations - Charts
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Charts
+DESCR:Spreadsheet Documents - Other Table Operations - Charts
 REF:
 com.sun.star.table.XTableCharts
 com.sun.star.container.XNamed
@@ -3997,8 +3997,8 @@ com.sun.star.table.XTableChart
 com.sun.star.table.TableChart
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Inserting_a_Paragraph_where_no_Cursor_can_go
-DESCR:Text - Inserting a Paragraph where no Cursor can go
+LINK:Documentation/DevGuide/Text_Documents#Inserting_a_Paragraph_where_no_Cursor_can_go
+DESCR:Text Documents - Inserting a Paragraph where no Cursor can go
 REF:
 com.sun.star.text.Text
 com.sun.star.text.Paragraph
@@ -4008,15 +4008,15 @@ com.sun.star.text.XRelativeTextContentInsert
 TOPIC:
 com.sun.star.text.XRelativeTextContentInsert
 
-LINK:Documentation/DevGuide/WritingUNO/Create_Instance_with_Arguments
-DESCR:WritingUNO - Create Instance with Arguments
+LINK:Documentation/DevGuide/Writing_UNO_Components#Create_Instance_with_Arguments
+DESCR:Writing UNO Components - Create Instance with Arguments
 REF:
 com.sun.star.lang.XSingleServiceFactory
 com.sun.star.lang.XInitialization
 com.sun.star.lang.XSingleComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Value_Bindings
+LINK:Documentation/DevGuide/Forms#Value_Bindings
 DESCR:Forms - Value Bindings
 REF:
 com.sun.star.form.binding.XBindableValue
@@ -4030,13 +4030,13 @@ TOPIC:
 com.sun.star.form.binding.XBindableValue
 com.sun.star.form.binding.XValueBinding
 
-LINK:Documentation/DevGuide/Scripting/Integration_with_Extension_Manager
-DESCR:Scripting - Integration with Extension Manager
+LINK:Documentation/DevGuide/Scripting_Framework#Integration_with_Extension_Manager
+DESCR:Scripting Framework - Integration with Extension Manager
 REF:
 com.sun.star.deployment.PackageRegistryBackend
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Logical_Forms
+LINK:Documentation/DevGuide/Forms#Logical_Forms
 DESCR:Forms - Logical Forms
 REF:
 com.sun.star.form.FormComponent
@@ -4045,16 +4045,16 @@ com.sun.star.form.component.Form
 TOPIC:
 com.sun.star.form.component.Form
 
-LINK:Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Argument_Conversion
-DESCR:AdvUNO - XInvocation Bridge - Scripting Existing UNO Objects - Argument Conversion
+LINK:Documentation/DevGuide/Advanced_UNO#Argument_Conversion
+DESCR:Advanced UNO - XInvocation Bridge - Scripting Existing UNO Objects - Argument Conversion
 REF:
 com.sun.star.beans.XMaterialHolder
 com.sun.star.reflection.CoreReflection
 com.sun.star.script.Invocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Protecting_Spreadsheets
-DESCR:Spreadsheets - Protecting Spreadsheets
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Protecting_Spreadsheets
+DESCR:Spreadsheet Documents - Protecting Spreadsheets
 REF:
 com.sun.star.util.XProtectable
 com.sun.star.document.XActionLockable
@@ -4062,13 +4062,13 @@ TOPIC:
 com.sun.star.util.XProtectable
 com.sun.star.document.XActionLockable
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Controllers#XContextMenuInterception
-DESCR:OfficeDev - Component - Controllers - XContextMenuInterception
+LINK:Documentation/DevGuide/Office_Development#XContextMenuInterception
+DESCR:Office Development - Component - Controllers - XContextMenuInterception
 REF:
 com.sun.star.ui.XContextMenuInterception
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/HTML_Forms
+LINK:Documentation/DevGuide/Forms#HTML_Forms
 DESCR:Forms - HTML Forms
 REF:
 com.sun.star.form.XReset
@@ -4077,8 +4077,8 @@ com.sun.star.form.component.HTMLForm
 TOPIC:
 com.sun.star.form.component.HTMLForm
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_and_Cell_Range_Access
-DESCR:Spreadsheets - Cell and Cell Range Access
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_and_Cell_Range_Access
+DESCR:Spreadsheet Documents - Cell and Cell Range Access
 REF:
 com.sun.star.sheet.XSheetCellRange
 com.sun.star.sheet.XSpreadsheet
@@ -4088,8 +4088,8 @@ com.sun.star.sheet.XSheetCellRange
 com.sun.star.sheet.SheetCellRange
 com.sun.star.table.XCellRange
 
-LINK:Documentation/DevGuide/ProUNO/CLI/Important_Interfaces_and_Implementations
-DESCR:ProUNO - CLI - Important Interfaces and Implementations
+LINK:Documentation/DevGuide/Professional_UNO#Important_Interfaces_and_Implementations_.28Helper_Classes.29
+DESCR:Professional UNO - CLI - Important Interfaces and Implementations (Helper Classes)
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.beans.XPropertySet
@@ -4098,8 +4098,8 @@ com.sun.star.uno.XWeak
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Printing_Text_Documents#Printer_and_Print_Job_Settings
-DESCR:Text - Printing Text Documents - Printer and Print Job Settings
+LINK:Documentation/DevGuide/Text_Documents#Printer_and_Print_Job_Settings
+DESCR:Text Documents - Printing Text Documents - Printer and Print Job Settings
 REF:
 com.sun.star.awt.Size
 com.sun.star.view.PaperOrientation
@@ -4110,7 +4110,7 @@ com.sun.star.view.PaperFormat
 TOPIC:
 com.sun.star.view.XPrintable
 
-LINK:Documentation/DevGuide/Forms/Control_Models_Forms
+LINK:Documentation/DevGuide/Forms#Control_Models_Forms
 DESCR:Forms - Control Models Forms
 REF:
 com.sun.star.lang.XServiceInfo
@@ -4127,39 +4127,39 @@ com.sun.star.form.XForm
 com.sun.star.awt.XTabControllerModel
 com.sun.star.form.component.HTMLForm
 
-LINK:Documentation/DevGuide/GUI/Events#Mouse_Listeners
-DESCR:GUI - Events - Mouse Listeners
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Mouse_Listeners
+DESCR:Graphical User Interfaces - Events - Mouse Listeners
 REF:
 com.sun.star.awt.XMouseListener
 com.sun.star.awt.XMouseMotionListener
 com.sun.star.awt.MenuEvent
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#InvocationAdapterFactory
-DESCR:AdvUNO - UNO Reflection API - CoreReflection Service - InvocationAdapterFactory
+LINK:Documentation/DevGuide/Advanced_UNO#InvocationAdapterFactory
+DESCR:Advanced UNO - UNO Reflection API - CoreReflection Service - InvocationAdapterFactory
 REF:
 com.sun.star.script.XInvocationAdapterFactory2
 com.sun.star.script.XInvocationAdapterFactory
 com.sun.star.script.InvocationAdapterFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Merging_Cell_Ranges_into_a_Single_Cell
-DESCR:Spreadsheets - Merging Cell Ranges into a Single Cell
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Merging_Cell_Ranges_into_a_Single_Cell
+DESCR:Spreadsheet Documents - Merging Cell Ranges into a Single Cell
 REF:
 com.sun.star.util.XMergeable
 TOPIC:
 com.sun.star.util.XMergeable
 
-LINK:Documentation/DevGuide/Database/Group_Service
-DESCR:Database - Group Service
+LINK:Documentation/DevGuide/Database_Access#Group_Service
+DESCR:Database Access - Group Service
 REF:
 com.sun.star.sdbcx.XAuthorizable
 com.sun.star.sdbcx.Group
 com.sun.star.sdbcx.XUsersSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Table_Service
-DESCR:Database - Table Service
+LINK:Documentation/DevGuide/Database_Access#Table_Service
+DESCR:Database Access - Table Service
 REF:
 com.sun.star.sdbcx.XDataDescriptorFactory
 com.sun.star.sdbcx.XKeysSupplier
@@ -4169,14 +4169,14 @@ com.sun.star.sdbcx.XAlterTable
 com.sun.star.sdbcx.XRename
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Accessing_Dialogs
-DESCR:WritingUNO - Accessing Dialogs
+LINK:Documentation/DevGuide/Writing_UNO_Components#Accessing_Dialogs
+DESCR:Writing UNO Components - Accessing Dialogs
 REF:
 com.sun.star.awt.XDialogProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Handling_Documents#Target_Frame
-DESCR:OfficeDev - Handling Documents - Loading Documents - Target Frame
+LINK:Documentation/DevGuide/Office_Development#Target_Frame
+DESCR:Office Development - Handling Documents - Loading Documents - Target Frame
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.lang.XComponent
@@ -4186,16 +4186,16 @@ com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.frame.FrameSearchFlag
 
-LINK:Documentation/DevGuide/GUI/Instantiation_of_a_Dialog
-DESCR:GUI - Instantiation of a Dialog
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Instantiation_of_a_Dialog
+DESCR:Graphical User Interfaces - Instantiation of a Dialog
 REF:
 com.sun.star.awt.XControlContainer
 com.sun.star.container.XNameContainer
 com.sun.star.awt.XControl
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Operations
-DESCR:Spreadsheets - Operations
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Operations
+DESCR:Spreadsheet Documents - Operations
 REF:
 com.sun.star.sheet.GeneralFunction
 com.sun.star.sheet.CellFlags
@@ -4203,28 +4203,28 @@ com.sun.star.sheet.XSheetOperation
 TOPIC:
 com.sun.star.sheet.XSheetOperation
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Controllers#XDispatchProvider
-DESCR:OfficeDev - Component - Controllers - XDispatchProvider
+LINK:Documentation/DevGuide/Office_Development#XDispatchProvider
+DESCR:Office Development - Component - Controllers - XDispatchProvider
 REF:
 com.sun.star.frame.XDispatchProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/FormComponents_Service
+LINK:Documentation/DevGuide/Forms#FormComponents_Service
 DESCR:Forms - FormComponents Service
 REF:
 com.sun.star.form.FormComponents
 TOPIC:
 com.sun.star.form.FormComponents
 
-LINK:Documentation/DevGuide/Spreadsheets/Compatibility_Names
-DESCR:Spreadsheets - Compatibility Names
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Compatibility_Names
+DESCR:Spreadsheet Documents - Compatibility Names
 REF:
 com.sun.star.sheet.XCompatibilityNames
 TOPIC:
 com.sun.star.sheet.XCompatibilityNames
 
-LINK:Documentation/DevGuide/Text/Printing_Text_Documents#Printing_Multiple_Pages_on_one_Page
-DESCR:Text - Printing Text Documents - Printing Multiple Pages on one Page
+LINK:Documentation/DevGuide/Text_Documents#Printing_Multiple_Pages_on_one_Page
+DESCR:Text Documents - Printing Text Documents - Printing Multiple Pages on one Page
 REF:
 com.sun.star.text.XPagePrintable
 com.sun.star.beans.PropertyValue
@@ -4232,28 +4232,28 @@ com.sun.star.text.PagePrintSettings
 TOPIC:
 com.sun.star.text.XPagePrintable
 
-LINK:Documentation/DevGuide/Database/Database_Design#SQL_Objects_and_their_Attributes
-DESCR:Database - Database Design - Retrieving Information about a Database - SQL Objects and their Attributes
+LINK:Documentation/DevGuide/Database_Access#SQL_Objects_and_their_Attributes
+DESCR:Database Access - Database Design - Retrieving Information about a Database - SQL Objects and their Attributes
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus
-DESCR:WritingUNO - Intercepting Context Menus
+LINK:Documentation/DevGuide/Writing_UNO_Components#Intercepting_Context_Menus
+DESCR:Writing UNO Components - Intercepting Context Menus
 REF:
 com.sun.star.frame.Controller
 com.sun.star.ui.XContextMenuInterception
 TOPIC:
 com.sun.star.ui.XContextMenuInterception
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#XTypeProvider_Interface
-DESCR:AdvUNO - UNO Reflection API - XTypeProvider Interface
+LINK:Documentation/DevGuide/Advanced_UNO#XTypeProvider_Interface
+DESCR:Advanced UNO - UNO Reflection API - XTypeProvider Interface
 REF:
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Proxying_a_UNO_Object
-DESCR:AdvUNO - XInvocation Bridge - Scripting Existing UNO Objects - Proxying a UNO Object
+LINK:Documentation/DevGuide/Advanced_UNO#Proxying_a_UNO_Object
+DESCR:Advanced UNO - XInvocation Bridge - Scripting Existing UNO Objects - Proxying a UNO Object
 REF:
 com.sun.star.lang.XSingleServiceFactory
 com.sun.star.script.XInvocation
@@ -4261,8 +4261,8 @@ com.sun.star.bridge.UnoUrlResolver
 com.sun.star.script.Invocation
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Folders#Accessing_the_Children_of_a_Folder
-DESCR:UCB - Folders - Accessing the Children of a Folder
+LINK:Documentation/DevGuide/Universal_Content_Broker#Accessing_the_Children_of_a_Folder
+DESCR:Universal Content Broker - Folders - Accessing the Children of a Folder
 REF:
 com.sun.star.sdbc.XRow
 com.sun.star.ucb.XContentAccess
@@ -4275,31 +4275,31 @@ TOPIC:
 com.sun.star.ucb.OpenCommandArgument2
 com.sun.star.ucb.DynamicResultSet
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Returning_Results
-DESCR:WritingUNO - Jobs - Returning Results
+LINK:Documentation/DevGuide/Writing_UNO_Components#Returning_Results
+DESCR:Writing UNO Components - Jobs - Returning Results
 REF:
 com.sun.star.beans.NamedValue
 com.sun.star.frame.DispatchResultEvent
 com.sun.star.task.XJobListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Line_Numbering_and_Outline_Numbering#Number_Formats
-DESCR:Text - Line Numbering and Outline Numbering - Number Formats
+LINK:Documentation/DevGuide/Text_Documents#Number_Formats
+DESCR:Text Documents - Line Numbering and Outline Numbering - Number Formats
 REF:
 com.sun.star.util.XNumberFormatsSupplier
 TOPIC:
 com.sun.star.util.XNumberFormatsSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/XML_Based_Filter_Development#Introduction
-DESCR:OfficeDev - XML Based Filter Development - Introduction
+LINK:Documentation/DevGuide/Office_Development#Introduction_3
+DESCR:Office Development - XML Based Filter Development - Introduction
 REF:
 com.sun.star.document.XFilter
 com.sun.star.xml.sax.XDocumentHandler
 TOPIC:
 com.sun.star.document.XFilter
 
-LINK:Documentation/DevGuide/ProUNO/Collections_and_Containers
-DESCR:ProUNO - Collections and Containers
+LINK:Documentation/DevGuide/Professional_UNO#Collections_and_Containers
+DESCR:Professional UNO - Collections and Containers
 REF:
 com.sun.star.container.XContainer
 com.sun.star.container
@@ -4317,20 +4317,20 @@ com.sun.star.container.XIndexAccess
 com.sun.star.container.XNameAccess
 com.sun.star.container.XIndexContainer
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Create_Instance_with_Arguments
-DESCR:WritingUNO - C++ - Create Instance with Arguments
+LINK:Documentation/DevGuide/Writing_UNO_Components#Create_Instance_with_Arguments_2
+DESCR:Writing UNO Components - C++ - Create Instance with Arguments
 REF:
 com.sun.star.lang.XInitialization
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Date_Field
-DESCR:Basic - Date Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Date_Field
+DESCR:LibreOffice Basic - Date Field
 REF:
 com.sun.star.awt.UnoControlDateField
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/UNO_Interprocess_Connections
-DESCR:ProUNO - UNO Interprocess Connections
+LINK:Documentation/DevGuide/Professional_UNO#UNO_Interprocess_Connections
+DESCR:Professional UNO - UNO Interprocess Connections
 REF:
 TOPIC:
 com.sun.star.uno.XComponentContext
@@ -4340,42 +4340,42 @@ com.sun.star.bridge.UnoUrlResolver
 com.sun.star.lang.XMultiComponentFactory
 com.sun.star.lang.ServiceManager
 
-LINK:Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component#XExportFilter
-DESCR:OfficeDev - Writing the Filtering Component - XExportFilter
+LINK:Documentation/DevGuide/Office_Development#XExportFilter
+DESCR:Office Development - Writing the Filtering Component - XExportFilter
 REF:
 com.sun.star.xml.XExportFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/Implementation_Loader#Shared_Library_Loader
-DESCR:AdvUNO - Implementation Loader - Shared Library Loader
+LINK:Documentation/DevGuide/Advanced_UNO#Shared_Library_Loader
+DESCR:Advanced UNO - Implementation Loader - Shared Library Loader
 REF:
 com.sun.star.loader.SharedLibrary
 TOPIC:
 com.sun.star.loader.SharedLibrary
 
-LINK:Documentation/DevGuide/Database/The_SDBC_Driver_for_ADO
-DESCR:Database - The SDBC Driver for ADO
+LINK:Documentation/DevGuide/Database_Access#The_SDBC_Driver_for_ADO
+DESCR:Database Access - The SDBC Driver for ADO
 REF:
 com.sun.star.sdbcx.Driver
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Closing_a_Connection
-DESCR:ProUNO - Closing a Connection
+LINK:Documentation/DevGuide/Professional_UNO#Closing_a_Connection
+DESCR:Professional UNO - Closing a Connection
 REF:
 com.sun.star.lang.XEventListener
 com.sun.star.lang.DisposedException
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Hierarchies
-DESCR:Spreadsheets - Hierarchies
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Hierarchies
+DESCR:Spreadsheet Documents - Hierarchies
 REF:
 com.sun.star.sheet.DataPilotSourceDimension
 com.sun.star.sheet.DataPilotSourceHierarchy
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Properties_of_a_FrameLoader
-DESCR:OfficeDev - Properties of a FrameLoader
+LINK:Documentation/DevGuide/Office_Development#Properties_of_a_FrameLoader
+DESCR:Office Development - Properties of a FrameLoader
 REF:
 com.sun.star.document.FilterFactory
 com.sun.star.frame.SynchronousFrameLoader
@@ -4385,8 +4385,8 @@ com.sun.star.frame.FrameLoaderFactory
 com.sun.star.frame.FrameLoader
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Connecting_Using_the_DriverManager_and_a_Database_URL
-DESCR:Database - Connecting Using the DriverManager and a Database URL
+LINK:Documentation/DevGuide/Database_Access#Connecting_Using_the_DriverManager_and_a_Database_URL
+DESCR:Database Access - Connecting Using the DriverManager and a Database URL
 REF:
 com.sun.star.sdbc.XDriverManager
 com.sun.star.sdbc.DriverManager
@@ -4394,57 +4394,57 @@ com.sun.star.beans.PropertyValue
 TOPIC:
 com.sun.star.sdbc.DriverManager
 
-LINK:Documentation/DevGuide/UCB/Obtaining_Content_Properties
-DESCR:UCB - Obtaining Content Properties
+LINK:Documentation/DevGuide/Universal_Content_Broker#Obtaining_Content_Properties
+DESCR:Universal Content Broker - Obtaining Content Properties
 REF:
 com.sun.star.sdbc.XRow
 com.sun.star.ucb.Command
 com.sun.star.beans.Property
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Defining_an_Interface#Attributes
-DESCR:WritingUNO - Defining an Interface - Attributes
+LINK:Documentation/DevGuide/Writing_UNO_Components#Attributes
+DESCR:Writing UNO Components - Defining an Interface - Attributes
 REF:
 com.sun.star.awt.Size
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Usage_of_Types#Structs
-DESCR:ProUNO - Bridge - Usage of Types - Structs
+LINK:Documentation/DevGuide/Professional_UNO#Structs_2
+DESCR:Professional UNO - Bridge - Usage of Types - Structs
 REF:
 com.sun.star.reflection.XIdlClass
 com.sun.star.reflection.CoreReflection
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Getting_the_Dialog_Model
-DESCR:Basic - Getting the Dialog Model
+LINK:Documentation/DevGuide/LibreOffice_Basic#Getting_the_Dialog_Model
+DESCR:LibreOffice Basic - Getting the Dialog Model
 REF:
 com.sun.star.awt.XControl
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Overall_Document_Features#Page_Styles
-DESCR:Text - Overall Document Features - Styles - Page Styles
+LINK:Documentation/DevGuide/Text_Documents#Page_Styles
+DESCR:Text Documents - Overall Document Features - Styles - Page Styles
 REF:
 com.sun.star.style.PageStyle
 com.sun.star.lang.XMultiServiceFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Common_Properties
-DESCR:GUI - Common Properties
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Common_Properties
+DESCR:Graphical User Interfaces - Common Properties
 REF:
 com.sun.star.awt.XWindow
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Ranges_and_Cells_Container
-DESCR:Spreadsheets - Cell Ranges and Cells Container
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Ranges_and_Cells_Container
+DESCR:Spreadsheet Documents - Cell Ranges and Cells Container
 REF:
 com.sun.star.sheet.SheetCellRanges
 com.sun.star.sheet.SheetRangesQuery
 TOPIC:
 com.sun.star.sheet.SheetCellRanges
 
-LINK:Documentation/DevGuide/Drawings/Presentation_Settings
-DESCR:Drawings - Presentation Settings
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Presentation_Settings
+DESCR:Drawings and Presentations - Presentation Settings
 REF:
 com.sun.star.presentation.Presentation
 com.sun.star.presentation.XPresentation
@@ -4452,16 +4452,16 @@ com.sun.star.presentation.XPresentationSupplier
 TOPIC:
 com.sun.star.presentation.XPresentation
 
-LINK:Documentation/DevGuide/WritingUNO/XComponent
-DESCR:WritingUNO - XComponent
+LINK:Documentation/DevGuide/Writing_UNO_Components#XComponent
+DESCR:Writing UNO Components - XComponent
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.lang.XEventListener
 TOPIC:
 com.sun.star.lang.XComponent
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Controllers#XController
-DESCR:OfficeDev - Component - Controllers - XController
+LINK:Documentation/DevGuide/Office_Development#XController
+DESCR:Office Development - Component - Controllers - XController
 REF:
 com.sun.star.frame.XController
 com.sun.star.lang.XComponent
@@ -4470,71 +4470,71 @@ com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.frame.Controller
 
-LINK:Documentation/DevGuide/Spreadsheets/Overall_Document_Features#Styles
-DESCR:Spreadsheets - Overall Document Features - Styles
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Styles
+DESCR:Spreadsheet Documents - Overall Document Features - Styles
 REF:
 com.sun.star.style.XStyleFamiliesSupplier
 TOPIC:
 com.sun.star.style.XStyleFamiliesSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/Command_URL
-DESCR:OfficeDev - Command URL
+LINK:Documentation/DevGuide/Office_Development#Command_URL
+DESCR:Office Development - Command URL
 REF:
 com.sun.star.util.URL
 TOPIC:
 com.sun.star.util.URL
 
-LINK:Documentation/DevGuide/AppendixA/General_Design_Rules#Inheritance
-DESCR:AppendixA - General Design Rules - Inheritance
+LINK:Documentation/DevGuide/LibreOffice_API-Design-Guidelines#Inheritance
+DESCR:Appendix A. Guidelines and Specifications - General Design Rules - Inheritance
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Process#Getting_a_Dispatch_Object
-DESCR:OfficeDev - Dispatch Process - Getting a Dispatch Object
+LINK:Documentation/DevGuide/Office_Development#Getting_a_Dispatch_Object
+DESCR:Office Development - Dispatch Process - Getting a Dispatch Object
 REF:
 com.sun.star.frame.XDispatchProvider
 com.sun.star.frame.XDispatch
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Weak_Objects_and_References
-DESCR:ProUNO - Weak Objects and References
+LINK:Documentation/DevGuide/Professional_UNO#Weak_Objects_and_References
+DESCR:Professional UNO - Weak Objects and References
 REF:
 com.sun.star.uno.XAdapter
 com.sun.star.uno.XReference
 com.sun.star.uno.XWeak
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Indexes_and_Index_Marks
-DESCR:Text - Indexes and Index Marks
+LINK:Documentation/DevGuide/Text_Documents#Indexes_and_Index_Marks
+DESCR:Text Documents - Indexes and Index Marks
 REF:
 TOPIC:
 com.sun.star.text.BaseIndex
 com.sun.star.text.XDocumentIndex
 
-LINK:Documentation/DevGuide/WritingUNO/The_UNO_Executable
-DESCR:WritingUNO - The UNO Executable
+LINK:Documentation/DevGuide/Writing_UNO_Components#The_UNO_Executable
+DESCR:Writing UNO Components - The UNO Executable
 REF:
 com.sun.star.lang.XMain
 TOPIC:
 com.sun.star.lang.XMain
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Window_Interfaces#XTopWindow
-DESCR:OfficeDev - Component - Window Interfaces - XTopWindow
+LINK:Documentation/DevGuide/Office_Development#XTopWindow
+DESCR:Office Development - Component - Window Interfaces - XTopWindow
 REF:
 com.sun.star.awt.WindowEvent
 com.sun.star.awt.XMenuBar
 com.sun.star.awt.XTopWindow
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Progress_Bar
-DESCR:Basic - Progress Bar
+LINK:Documentation/DevGuide/LibreOffice_Basic#Progress_Bar
+DESCR:LibreOffice Basic - Progress Bar
 REF:
 com.sun.star.awt.UnoControlProgressBar
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Processing_Chain
-DESCR:OfficeDev - Processing Chain
+LINK:Documentation/DevGuide/Office_Development#Processing_Chain
+DESCR:Office Development - Processing Chain
 REF:
 com.sun.star.frame.FeatureStateEvent
 com.sun.star.frame.XDispatchProviderInterception
@@ -4544,38 +4544,38 @@ com.sun.star.util.URLTransformer
 com.sun.star.frame.XDispatch
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Filtering_Process#TypeDetection
-DESCR:OfficeDev - Filtering Process - TypeDetection
+LINK:Documentation/DevGuide/Office_Development#TypeDetection
+DESCR:Office Development - Filtering Process - TypeDetection
 REF:
 com.sun.star.document.TypeDetection
 com.sun.star.frame.FrameLoaderFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Update
-DESCR:Database - Update
+LINK:Documentation/DevGuide/Database_Access#Update
+DESCR:Database Access - Update
 REF:
 com.sun.star.sdbc.XRowUpdate
 com.sun.star.sdbc.XResultSetUpdate
 TOPIC:
 com.sun.star.sdbc.XRowUpdate
 
-LINK:Documentation/DevGuide/Spreadsheets/Equally_Formatted_Cell_Ranges#Cell_Format_Ranges
-DESCR:Spreadsheets - Equally Formatted Cell Ranges - Cell Format Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Format_Ranges
+DESCR:Spreadsheet Documents - Equally Formatted Cell Ranges - Cell Format Ranges
 REF:
 com.sun.star.sheet.CellFormatRanges
 TOPIC:
 com.sun.star.sheet.CellFormatRanges
 
-LINK:Documentation/DevGuide/Database/Creating_a_User
-DESCR:Database - Creating a User
+LINK:Documentation/DevGuide/Database_Access#Creating_a_User
+DESCR:Database Access - Creating a User
 REF:
 com.sun.star.sdbcx.UserDescriptor
 com.sun.star.sdbcx.XDataDescriptorFactory
 TOPIC:
 com.sun.star.sdbcx.UserDescriptor
 
-LINK:Documentation/DevGuide/Database/The_DataSource_Service#Adding_and_Editing_Datasources
-DESCR:Database - The DataSource Service - Adding and Editing Datasources
+LINK:Documentation/DevGuide/Database_Access#Adding_and_Editing_Datasources
+DESCR:Database Access - The DataSource Service - Adding and Editing Datasources
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.beans.XPropertySet
@@ -4585,21 +4585,21 @@ com.sun.star.container.XNameAccess
 com.sun.star.uno.XNamingService
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Predefined_Variables
-DESCR:OfficeDev - Predefined Variables
+LINK:Documentation/DevGuide/Office_Development#Predefined_Variables
+DESCR:Office Development - Predefined Variables
 REF:
 com.sun.star.util.PathSubstitution
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Label_Field
-DESCR:GUI - Label Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Label_Field
+DESCR:Graphical User Interfaces - Label Field
 REF:
 com.sun.star.awt.UnoControlFixedTextModel
 com.sun.star.awt.UnoControlFixedText
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Working_with_Presentation_Documents
-DESCR:Drawings - Working with Presentation Documents
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Working_with_Presentation_Documents
+DESCR:Drawings and Presentations - Working with Presentation Documents
 REF:
 com.sun.star.presentation.DrawPage
 com.sun.star.drawing.XDrawPagesSupplier
@@ -4608,8 +4608,8 @@ TOPIC:
 com.sun.star.presentation.DrawPage
 com.sun.star.presentation.XPresentation
 
-LINK:Documentation/DevGuide/OfficeDev/Filter
-DESCR:OfficeDev - Filter
+LINK:Documentation/DevGuide/Office_Development#Filter
+DESCR:Office Development - Filter
 REF:
 com.sun.star.document.FilterFactory
 com.sun.star.document.XFilter
@@ -4622,8 +4622,8 @@ com.sun.star.document.XExporter
 com.sun.star.document.ExportFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Linguistics
-DESCR:OfficeDev - Linguistics
+LINK:Documentation/DevGuide/Office_Development#Linguistics
+DESCR:Office Development - Linguistics
 REF:
 TOPIC:
 com.sun.star.linguistic2.Hyphenator
@@ -4633,20 +4633,20 @@ com.sun.star.linguistic2.DictionaryList
 com.sun.star.linguistic2.LinguProperties
 com.sun.star.linguistic2.Thesaurus
 
-LINK:Documentation/DevGuide/WritingUNO/Write_Registration_Info_Using_a_Helper_Method
-DESCR:WritingUNO - Write Registration Info Using a Helper Method
+LINK:Documentation/DevGuide/Writing_UNO_Components#Write_Registration_Info_Using_a_Helper_Method
+DESCR:Writing UNO Components - Write Registration Info Using a Helper Method
 REF:
 com.sun.star.registry.XRegistryKey
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/The_SDBC_Driver_for_ODBC
-DESCR:Database - The SDBC Driver for ODBC
+LINK:Documentation/DevGuide/Database_Access#The_SDBC_Driver_for_ODBC
+DESCR:Database Access - The SDBC Driver for ODBC
 REF:
 com.sun.star.sdbc.ODBCConnectionProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Using_Dialogs_in_Components#Instantiate_and_display_a_dialog
-DESCR:WritingUNO - Using Dialogs in Components - Instantiate and display a dialog
+LINK:Documentation/DevGuide/Writing_UNO_Components#Instantiate_and_display_a_dialog
+DESCR:Writing UNO Components - Using Dialogs in Components - Instantiate and display a dialog
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.awt.XDialog
@@ -4656,8 +4656,8 @@ com.sun.star.awt.DialogProvider
 com.sun.star.frame.XModel
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Handling_Documents#Loading_Documents
-DESCR:OfficeDev - Handling Documents - Loading Documents
+LINK:Documentation/DevGuide/Office_Development#Loading_Documents
+DESCR:Office Development - Handling Documents - Loading Documents
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.document.MediaDescriptor
@@ -4665,16 +4665,16 @@ com.sun.star.frame.Desktop
 TOPIC:
 com.sun.star.frame.XComponentLoader
 
-LINK:Documentation/DevGuide/Spreadsheets/Function_Handling#Calculating_Function_Results
-DESCR:Spreadsheets - Function Handling - Calculating Function Results
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Calculating_Function_Results
+DESCR:Spreadsheet Documents - Function Handling - Calculating Function Results
 REF:
 com.sun.star.sheet.XFunctionAccess
 com.sun.star.sheet.FunctionAccess
 TOPIC:
 com.sun.star.sheet.FunctionAccess
 
-LINK:Documentation/DevGuide/GUI/File_Control
-DESCR:GUI - File Control
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#File_Control
+DESCR:Graphical User Interfaces - File Control
 REF:
 com.sun.star.awt.UnoControlEdit
 com.sun.star.awt.UnoControlFileControl
@@ -4682,38 +4682,38 @@ com.sun.star.ui.dialogs.FilePicker
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Other_Common_Properties
-DESCR:GUI - Other Common Properties
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Other_Common_Properties
+DESCR:Graphical User Interfaces - Other Common Properties
 REF:
 com.sun.star.util.Color
 com.sun.star.awt.VisualEffect
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/The_RowSet_Service
-DESCR:Database - The RowSet Service
+LINK:Documentation/DevGuide/Database_Access#The_RowSet_Service
+DESCR:Database Access - The RowSet Service
 REF:
 com.sun.star.sdb.RowSet
 com.sun.star.sdb.ResultSet
 TOPIC:
 com.sun.star.sdb.RowSet
 
-LINK:Documentation/DevGuide/Spreadsheets/Indentation
-DESCR:Spreadsheets - Indentation
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Indentation
+DESCR:Spreadsheet Documents - Indentation
 REF:
 com.sun.star.util.XIndent
 TOPIC:
 com.sun.star.util.XIndent
 
-LINK:Documentation/DevGuide/GUI/Displaying_Dialogs
-DESCR:GUI - Displaying Dialogs
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Displaying_Dialogs
+DESCR:Graphical User Interfaces - Displaying Dialogs
 REF:
 com.sun.star.awt.XDialog
 com.sun.star.awt.XWindow
 com.sun.star.awt.XWindowPeer
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Result_Sets
-DESCR:Database - Result Sets
+LINK:Documentation/DevGuide/Database_Access#Result_Sets
+DESCR:Database Access - Result Sets
 REF:
 com.sun.star.sdbcx.Container
 com.sun.star.sdbc.XRow
@@ -4731,15 +4731,15 @@ com.sun.star.sdbcx.ResultSet
 com.sun.star.sdbc.ResultSet
 com.sun.star.sdb.ResultSet
 
-LINK:Documentation/DevGuide/Basic/Command_Button
-DESCR:Basic - Command Button
+LINK:Documentation/DevGuide/LibreOffice_Basic#Command_Button
+DESCR:LibreOffice Basic - Command Button
 REF:
 com.sun.star.awt.XButton
 com.sun.star.awt.UnoControlButton
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Slide_Transition
-DESCR:Drawings - Slide Transition
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Slide_Transition
+DESCR:Drawings and Presentations - Slide Transition
 REF:
 com.sun.star.presentation.DrawPage
 com.sun.star.presentation.AnimationSpeed
@@ -4748,14 +4748,14 @@ TOPIC:
 com.sun.star.presentation.DrawPage
 com.sun.star.presentation.FadeEffect
 
-LINK:Documentation/DevGuide/ProUNO/Services#Referencing_Interfaces
-DESCR:ProUNO - Services - Referencing Interfaces
+LINK:Documentation/DevGuide/Professional_UNO#Referencing_Interfaces
+DESCR:Professional UNO - Services - Referencing Interfaces
 REF:
 com.sun.star.text.TextDocument
 TOPIC:
 
-LINK:Documentation/DevGuide/Glossary/Glossary
-DESCR:Glossary - Glossary
+LINK:Documentation/DevGuide/Glossary
+DESCR:Glossary
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.sdbc.XDriverManager
@@ -4771,7 +4771,7 @@ com.sun.star.awt
 com.sun.star.lang.ServiceManager
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Setting_the_Chart_Type
+LINK:Documentation/DevGuide/Charts#Setting_the_Chart_Type
 DESCR:Charts - Setting the Chart Type
 REF:
 com.sun.star.chart.XChartDocument
@@ -4780,20 +4780,20 @@ TOPIC:
 com.sun.star.chart.XYDiagram
 com.sun.star.chart.Diagram
 
-LINK:Documentation/DevGuide/GUI/Time_Field
-DESCR:GUI - Time Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Time_Field
+DESCR:Graphical User Interfaces - Time Field
 REF:
 com.sun.star.awt.UnoControlTimeFieldModel
 com.sun.star.awt.UnoControlTimeField
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/View_Service
-DESCR:Database - View Service
+LINK:Documentation/DevGuide/Database_Access#View_Service
+DESCR:Database Access - View Service
 REF:
 com.sun.star.sdbcx.CheckOption
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Working_With_Charts#Document_Structure
+LINK:Documentation/DevGuide/Charts#Document_Structure
 DESCR:Charts - Working With Charts - Document Structure
 REF:
 com.sun.star.chart.XChartDocument
@@ -4812,51 +4812,51 @@ com.sun.star.chart.ChartData
 com.sun.star.drawing.OLE2Shape
 com.sun.star.chart.ChartDocument
 
-LINK:Documentation/DevGuide/ProUNO/C++/Mapping_of_Services
-DESCR:ProUNO - C++ - Mapping of Services
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Services_2
+DESCR:Professional UNO - C++ - Mapping of Services
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.uno.DeploymentException
 com.sun.star.lang.XMultiComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Showing_a_Dialog
-DESCR:Basic - Showing a Dialog
+LINK:Documentation/DevGuide/LibreOffice_Basic#Showing_a_Dialog
+DESCR:LibreOffice Basic - Showing a Dialog
 REF:
 com.sun.star.awt.XDialog
 com.sun.star.io.XInputStreamProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/File_Control
-DESCR:Basic - File Control
+LINK:Documentation/DevGuide/LibreOffice_Basic#File_Control
+DESCR:LibreOffice Basic - File Control
 REF:
 com.sun.star.awt.UnoControlFileControl
 com.sun.star.ui.dialogs.FilePicker
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Accessing_Libraries_from_Basic#Library_Container_API
-DESCR:Basic - Accessing Libraries from Basic - Library Container API
+LINK:Documentation/DevGuide/LibreOffice_Basic#Library_Container_API
+DESCR:LibreOffice Basic - Accessing Libraries from Basic - Library Container API
 REF:
 com.sun.star.script.XLibraryContainer2
 com.sun.star.container.XNameContainer
 com.sun.star.script.XLibraryContainer
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Object_Identity
-DESCR:ProUNO - Object Identity
+LINK:Documentation/DevGuide/Professional_UNO#Object_Identity
+DESCR:Professional UNO - Object Identity
 REF:
 com.sun.star.lang.XComponent
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Element_Access#Name_Access
-DESCR:FirstSteps - Element Access - Name Access
+LINK:Documentation/DevGuide/First_Steps#Name_Access
+DESCR:First Steps - Element Access - Name Access
 REF:
 com.sun.star.sheet.XSpreadsheets
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Character_and_Paragraph_Format
-DESCR:Spreadsheets - Character and Paragraph Format
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Character_and_Paragraph_Format
+DESCR:Spreadsheet Documents - Character and Paragraph Format
 REF:
 com.sun.star.table.XCell
 com.sun.star.style.ParagraphProperties
@@ -4865,55 +4865,55 @@ com.sun.star.style.CharacterPropertiesAsian
 com.sun.star.style.CharacterProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Frames#Communication_through_Dispatch_Framework
-DESCR:OfficeDev - Frames - Communication through Dispatch Framework
+LINK:Documentation/DevGuide/Office_Development#Communication_through_Dispatch_Framework
+DESCR:Office Development - Frames - Communication through Dispatch Framework
 REF:
 com.sun.star.frame.XDispatchProvider
 com.sun.star.frame.XFrame
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet#Properties_of_Spreadsheet
-DESCR:Spreadsheets - Spreadsheet - Properties of Spreadsheet
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Properties_of_Spreadsheet
+DESCR:Spreadsheet Documents - Spreadsheet - Properties of Spreadsheet
 REF:
 com.sun.star.sheet.Spreadsheet
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Configuration
-DESCR:WritingUNO - Configuration
+LINK:Documentation/DevGuide/Writing_UNO_Components#Configuration
+DESCR:Writing UNO Components - Configuration
 REF:
 com.sun.star.frame.ProtocolHandler
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Using_DBMS_Features#Transaction_Handling
-DESCR:Database - Using DBMS Features - Transaction Handling
+LINK:Documentation/DevGuide/Database_Access#Transaction_Handling
+DESCR:Database Access - Using DBMS Features - Transaction Handling
 REF:
 com.sun.star.sdbc.TransactionIsolation
 com.sun.star.sdbc.XConnection
 TOPIC:
 com.sun.star.sdbc.TransactionIsolation
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Automation_Objects_with_UNO_Interfaces
-DESCR:ProUNO - Bridge - Automation Objects with UNO Interfaces
+LINK:Documentation/DevGuide/Professional_UNO#Automation_Objects_with_UNO_Interfaces
+DESCR:Professional UNO - Bridge - Automation Objects with UNO Interfaces
 REF:
 TOPIC:
 com.sun.star.lang.XEventListener
 
-LINK:Documentation/DevGuide/ProUNO/Exception_Handling
-DESCR:ProUNO - Exception Handling
+LINK:Documentation/DevGuide/Professional_UNO#Exception_Handling
+DESCR:Professional UNO - Exception Handling
 REF:
 com.sun.star.uno.Exception
 TOPIC:
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
 
-LINK:Documentation/DevGuide/ProUNO/Java/Mapping_of_Enum_Types
-DESCR:ProUNO - Java - Mapping of Enum Types
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Enum_Types
+DESCR:Professional UNO - Java - Mapping of Enum Types
 REF:
 com.sun.star.uno.TypeClass
 TOPIC:
 
-LINK:Documentation/DevGuide/AppendixC/The_Hierarchy_Content_Provider#Commands_and_Properties
-DESCR:AppendixC - The Hierarchy Content Provider - Commands and Properties
+LINK:Documentation/DevGuide/Universal_Content_Providers#Commands_and_Properties
+DESCR:Appendix C. Universal Content Providers - The Hierarchy Content Provider - Commands and Properties
 REF:
 com.sun.star.ucb.XContent
 com.sun.star.lang.XServiceInfo
@@ -4928,8 +4928,8 @@ com.sun.star.ucb.XCommandProcessor
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Tables#Table_Architecture
-DESCR:Text - Tables - Table Architecture
+LINK:Documentation/DevGuide/Text_Documents#Table_Architecture
+DESCR:Text Documents - Tables - Table Architecture
 REF:
 com.sun.star.chart.XChartDataArray
 com.sun.star.text.XTextTable
@@ -4943,8 +4943,8 @@ com.sun.star.table.XAutoFormattable
 TOPIC:
 com.sun.star.text.TextTable
 
-LINK:Documentation/DevGuide/Drawings/Exporting
-DESCR:Drawings - Exporting
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Exporting
+DESCR:Drawings and Presentations - Exporting
 REF:
 com.sun.star.document.XFilter
 com.sun.star.document.XMimeTypeInfo
@@ -4953,8 +4953,8 @@ com.sun.star.document.XExporter
 TOPIC:
 com.sun.star.drawing.GraphicExportFilter
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Getting_Frames%2C_Controllers_and_Models_from_Each_Other
-DESCR:OfficeDev - Component - Getting Frames, Controllers and Models from Each Other
+LINK:Documentation/DevGuide/Office_Development#Getting_Frames%2C_Controllers_and_Models_from_Each_Other
+DESCR:Office Development - Component - Getting Frames, Controllers and Models from Each Other
 REF:
 com.sun.star.frame.XController
 com.sun.star.lang.XComponent
@@ -4965,8 +4965,8 @@ com.sun.star.frame.XController
 com.sun.star.frame.XFrame
 com.sun.star.frame.XModel
 
-LINK:Documentation/DevGuide/Database/Adding_and_Editing_Predefined_Queries
-DESCR:Database - Adding and Editing Predefined Queries
+LINK:Documentation/DevGuide/Database_Access#Adding_and_Editing_Predefined_Queries
+DESCR:Database Access - Adding and Editing Predefined Queries
 REF:
 com.sun.star.sdb.DefinitionContainer
 com.sun.star.lang.XSingleServiceFactory
@@ -4979,8 +4979,8 @@ com.sun.star.util.XRefreshable
 TOPIC:
 com.sun.star.sdb.DefinitionContainer
 
-LINK:Documentation/DevGuide/Database/Clones_of_the_RowSet_Service
-DESCR:Database - Clones of the RowSet Service
+LINK:Documentation/DevGuide/Database_Access#Clones_of_the_RowSet_Service
+DESCR:Database Access - Clones of the RowSet Service
 REF:
 com.sun.star.sdb.XResultSetAccess
 com.sun.star.sdb.ResultSet
@@ -4988,8 +4988,8 @@ TOPIC:
 com.sun.star.sdb.XResultSetAccess
 com.sun.star.sdb.ResultSet
 
-LINK:Documentation/DevGuide/OfficeDev/Using_the_Desktop
-DESCR:OfficeDev - Using the Desktop
+LINK:Documentation/DevGuide/Office_Development#Using_the_Desktop
+DESCR:Office Development - Using the Desktop
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.frame.XComponentLoader
@@ -5017,101 +5017,101 @@ com.sun.star.document.XEventBroadcaster
 com.sun.star.frame.XDesktop
 com.sun.star.frame.Desktop
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Process#Listening_for_Context_Changes
-DESCR:OfficeDev - Dispatch Process - Listening for Context Changes
+LINK:Documentation/DevGuide/Office_Development#Listening_for_Context_Changes
+DESCR:Office Development - Dispatch Process - Listening for Context Changes
 REF:
 com.sun.star.frame.FrameActionEvent
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/The_Service_Manager_Component#From_UNO_Objects_to_Automation_Objects
-DESCR:ProUNO - Bridge - The Service Manager Component - From UNO Objects to Automation Objects
+LINK:Documentation/DevGuide/Professional_UNO#From_UNO_Objects_to_Automation_Objects
+DESCR:Professional UNO - Bridge - The Service Manager Component - From UNO Objects to Automation Objects
 REF:
 com.sun.star.bridge.oleautomation.BridgeSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Filter_Options
-DESCR:Drawings - Filter Options
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Filter_Options
+DESCR:Drawings and Presentations - Filter Options
 REF:
 com.sun.star.document.MediaDescriptor
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Inserting_Text_Files
-DESCR:Text - Inserting Text Files
+LINK:Documentation/DevGuide/Text_Documents#Inserting_Text_Files
+DESCR:Text Documents - Inserting Text Files
 REF:
 com.sun.star.document.MediaDescriptor
 com.sun.star.document.XDocumentInsertable
 TOPIC:
 com.sun.star.document.XDocumentInsertable
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XCollator
-DESCR:OfficeDev - Implementing a New Locale - XCollator
+LINK:Documentation/DevGuide/Office_Development#XCollator
+DESCR:Office Development - Implementing a New Locale - XCollator
 REF:
 com.sun.star.i18n.XCollator
 TOPIC:
 com.sun.star.i18n.XCollator
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Using_Automation_Objects_from_UNO
-DESCR:ProUNO - Bridge - Using Automation Objects from UNO
+LINK:Documentation/DevGuide/Professional_UNO#Using_Automation_Objects_from_UNO
+DESCR:Professional UNO - Bridge - Using Automation Objects from UNO
 REF:
 com.sun.star.script.XInvocation
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/acquire()_and_release()
-DESCR:ProUNO - acquire() and release()
+LINK:Documentation/DevGuide/Professional_UNO#acquire()_and_release()
+DESCR:Professional UNO - acquire() and release()
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Settings#Creating_Default_Settings
-DESCR:Text - Settings - Creating Default Settings
+LINK:Documentation/DevGuide/Text_Documents#Creating_Default_Settings
+DESCR:Text Documents - Settings - Creating Default Settings
 REF:
 com.sun.star.text.Defaults
 com.sun.star.lang.XMultiServiceFactory
 TOPIC:
 com.sun.star.text.Defaults
 
-LINK:Documentation/DevGuide/Database/Using_DDL_to_Change_the_Database_Design
-DESCR:Database - Using DDL to Change the Database Design
+LINK:Documentation/DevGuide/Database_Access#Using_DDL_to_Change_the_Database_Design
+DESCR:Database Access - Using DDL to Change the Database Design
 REF:
 com.sun.star.sdbc.XStatement
 com.sun.star.sdbc.DataType
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/CLI/Writing_Client_Programs
-DESCR:ProUNO - CLI - Writing Client Programs
+LINK:Documentation/DevGuide/Professional_UNO#Writing_Client_Programs
+DESCR:Professional UNO - CLI - Writing Client Programs
 REF:
 com.sun.star.bridge.UnoUrlResolver
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Storing_Documents#Printing_Documents
-DESCR:OfficeDev - Storing Documents - Printing Documents
+LINK:Documentation/DevGuide/Office_Development#Printing_Documents
+DESCR:Office Development - Storing Documents - Printing Documents
 REF:
 com.sun.star.view.XPrintable
 TOPIC:
 com.sun.star.view.XPrintable
 
-LINK:Documentation/DevGuide/Drawings/Ordering
-DESCR:Drawings - Ordering
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Ordering
+DESCR:Drawings and Presentations - Ordering
 REF:
 com.sun.star.drawing.Shape
 TOPIC:
 
-LINK:Documentation/DevGuide/AppendixC/The_File_Content_Provider#Creation_of_New_File_Contents
-DESCR:AppendixC - The File Content Provider - Creation of New File Contents
+LINK:Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_File_Contents
+DESCR:Appendix C. Universal Content Providers - The File Content Provider - Creation of New File Contents
 REF:
 com.sun.star.ucb.XContentCreator
 com.sun.star.io.XInputStream
 TOPIC:
 com.sun.star.ucb.XContentCreator
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Mapping_of_Hyper_and_Decimal
-DESCR:ProUNO - Bridge - Mapping of Hyper and Decimal
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Hyper_and_Decimal
+DESCR:Professional UNO - Bridge - Mapping of Hyper and Decimal
 REF:
 com.sun.star.bridge.oleautomation.Decimal
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/DDE_Links
-DESCR:Spreadsheets - DDE Links
+LINK:Documentation/DevGuide/Spreadsheet_Documents#DDE_Links
+DESCR:Spreadsheet Documents - DDE Links
 REF:
 com.sun.star.sheet.XDDELink
 com.sun.star.sheet.DDELink
@@ -5120,30 +5120,30 @@ com.sun.star.util.XRefreshable
 TOPIC:
 com.sun.star.sheet.DDELink
 
-LINK:Documentation/DevGuide/Basic/Dialog_Properties
-DESCR:Basic - Dialog Properties
+LINK:Documentation/DevGuide/LibreOffice_Basic#Dialog_Properties
+DESCR:LibreOffice Basic - Dialog Properties
 REF:
 com.sun.star.awt.XDialog
 com.sun.star.beans.XPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Detective
-DESCR:Spreadsheets - Detective
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Detective
+DESCR:Spreadsheet Documents - Detective
 REF:
 com.sun.star.sheet.XSheetAuditing
 TOPIC:
 com.sun.star.sheet.XSheetAuditing
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Initialization
-DESCR:WritingUNO - Jobs - Initialization
+LINK:Documentation/DevGuide/Writing_UNO_Components#Initialization
+DESCR:Writing UNO Components - Jobs - Initialization
 REF:
 com.sun.star.beans.NamedValue
 com.sun.star.frame.XFrame
 com.sun.star.frame.XModel
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Closing_Documents#XCloseable
-DESCR:OfficeDev - Closing Documents - XCloseable
+LINK:Documentation/DevGuide/Office_Development#XCloseable
+DESCR:Office Development - Closing Documents - XCloseable
 REF:
 com.sun.star.frame.XStorable
 com.sun.star.util.XCloseListener
@@ -5154,8 +5154,8 @@ com.sun.star.util.CloseVetoException
 com.sun.star.util.XCloseable
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XBreakIterator
-DESCR:OfficeDev - Overview and Using the API - XBreakIterator
+LINK:Documentation/DevGuide/Office_Development#XBreakIterator
+DESCR:Office Development - Overview and Using the API - XBreakIterator
 REF:
 com.sun.star.i18n.XLocaleData
 com.sun.star.linguistic2.XHyphenator
@@ -5163,8 +5163,8 @@ com.sun.star.i18n.XBreakIterator
 TOPIC:
 com.sun.star.i18n.XBreakIterator
 
-LINK:Documentation/DevGuide/Basic/Technical_Background
-DESCR:Basic - Technical Background
+LINK:Documentation/DevGuide/LibreOffice_Basic#Technical_Background
+DESCR:LibreOffice Basic - Technical Background
 REF:
 com.sun.star.resource
 com.sun.star.resource.StringResource
@@ -5175,23 +5175,23 @@ com.sun.star.resource.StringResourceWithStorage
 com.sun.star.resource.StringResourceWithLocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Scripting/Writing_a_LanguageScriptProvider_UNO_Component_From_Scratch
-DESCR:Scripting - Writing a LanguageScriptProvider UNO Component From Scratch
+LINK:Documentation/DevGuide/Scripting_Framework#Writing_a_LanguageScriptProvider_UNO_Component_From_Scratch
+DESCR:Scripting Framework - Writing a LanguageScriptProvider UNO Component From Scratch
 REF:
 com.sun.star.script.provider.LanguageScriptProvider
 com.sun.star.script.browse.BrowseNode
 com.sun.star.script.provider.XScript
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/C++/Transparent_Use_of_Office_UNO_Components
-DESCR:ProUNO - C++ - Transparent Use of Office UNO Components
+LINK:Documentation/DevGuide/Professional_UNO#Transparent_Use_of_Office_UNO_Components_2
+DESCR:Professional UNO - C++ - Transparent Use of Office UNO Components
 REF:
 TOPIC:
 com.sun.star.uno.XComponentContext
 com.sun.star.lang.XMultiComponentFactory
 
-LINK:Documentation/DevGuide/Text/Table_Naming%2C_Sorting%2C_Charting_and_Autoformatting
-DESCR:Text - Table Naming, Sorting, Charting and Autoformatting
+LINK:Documentation/DevGuide/Text_Documents#Table_Naming%2C_Sorting%2C_Charting_and_Autoformatting
+DESCR:Text Documents - Table Naming, Sorting, Charting and Autoformatting
 REF:
 com.sun.star.chart.XChartDataArray
 com.sun.star.chart.XChartData
@@ -5202,16 +5202,16 @@ com.sun.star.sheet.TableAutoFormats
 com.sun.star.table.XAutoFormattable
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Print_Areas
-DESCR:Spreadsheets - Printing Spreadsheet Documents - Print Areas
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Print_Areas
+DESCR:Spreadsheet Documents - Printing Spreadsheet Documents - Print Areas
 REF:
 com.sun.star.sheet.XPrintAreas
 com.sun.star.table.CellRangeAddress
 TOPIC:
 com.sun.star.sheet.XPrintAreas
 
-LINK:Documentation/DevGuide/Spreadsheets/Equally_Formatted_Cell_Ranges#Unique_Cell_Format_Ranges
-DESCR:Spreadsheets - Equally Formatted Cell Ranges - Unique Cell Format Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Unique_Cell_Format_Ranges
+DESCR:Spreadsheet Documents - Equally Formatted Cell Ranges - Unique Cell Format Ranges
 REF:
 com.sun.star.sheet.SheetCellRanges
 com.sun.star.sheet.UniqueCellFormatRanges
@@ -5219,15 +5219,15 @@ com.sun.star.sheet.CellFormatRanges
 TOPIC:
 com.sun.star.sheet.UniqueCellFormatRanges
 
-LINK:Documentation/DevGuide/GUI/Numeric_Field
-DESCR:GUI - Numeric Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Numeric_Field
+DESCR:Graphical User Interfaces - Numeric Field
 REF:
 com.sun.star.awt.UnoControlNumericField
 com.sun.star.awt.UnoControlNumericFieldModel
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Text_Document_Controller
-DESCR:Text - Text Document Controller
+LINK:Documentation/DevGuide/Text_Documents#Text_Document_Controller
+DESCR:Text Documents - Text Document Controller
 REF:
 com.sun.star.frame.XController
 com.sun.star.ui.XContextMenuInterceptor
@@ -5238,40 +5238,40 @@ com.sun.star.frame.Controller
 com.sun.star.document.XViewDataSupplier
 com.sun.star.frame.XModel
 
-LINK:Documentation/DevGuide/Database/Example:_Querying_the_Bibliography_Database
-DESCR:Database - Example: Querying the Bibliography Database
+LINK:Documentation/DevGuide/Database_Access#Example:_Querying_the_Bibliography_Database
+DESCR:Database Access - Example: Querying the Bibliography Database
 REF:
 com.sun.star.sdb.RowSet
 TOPIC:
 com.sun.star.sdb.RowSet
 
-LINK:Documentation/DevGuide/ProUNO/Children_of_the_XEventListener_Interface
-DESCR:ProUNO - Children of the XEventListener Interface
+LINK:Documentation/DevGuide/Professional_UNO#Children_of_the_XEventListener_Interface
+DESCR:Professional UNO - Children of the XEventListener Interface
 REF:
 com.sun.star.lang.XEventListener
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XUnoTunnel
-DESCR:WritingUNO - XUnoTunnel
+LINK:Documentation/DevGuide/Writing_UNO_Components#XUnoTunnel
+DESCR:Writing UNO Components - XUnoTunnel
 REF:
 com.sun.star.lang.XUnoTunnel
 TOPIC:
 com.sun.star.lang.XUnoTunnel
 
-LINK:Documentation/DevGuide/OfficeDev/General_Notes
-DESCR:OfficeDev - General Notes
+LINK:Documentation/DevGuide/Office_Development#General_Notes
+DESCR:Office Development - General Notes
 REF:
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Navigating
-DESCR:Drawings - Navigating
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Navigating
+DESCR:Drawings and Presentations - Navigating
 REF:
 com.sun.star.container.XNamed
 TOPIC:
 com.sun.star.container.XNamed
 
-LINK:Documentation/DevGuide/Forms/Scripting_and_Events
+LINK:Documentation/DevGuide/Forms#Scripting_and_Events
 DESCR:Forms - Scripting and Events
 REF:
 com.sun.star.awt.XItemListener
@@ -5283,8 +5283,8 @@ com.sun.star.form.FormComponents
 com.sun.star.awt.XCheckBox
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/TextViewCursor
-DESCR:Text - TextViewCursor
+LINK:Documentation/DevGuide/Text_Documents#TextViewCursor
+DESCR:Text Documents - TextViewCursor
 REF:
 com.sun.star.view.XViewCursor
 com.sun.star.text.TextViewCursor
@@ -5296,8 +5296,8 @@ com.sun.star.view.XScreenCursor
 TOPIC:
 com.sun.star.text.TextViewCursor
 
-LINK:Documentation/DevGuide/GUI/Progress_Bar
-DESCR:GUI - Progress Bar
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Progress_Bar
+DESCR:Graphical User Interfaces - Progress Bar
 REF:
 com.sun.star.awt.XReschedule
 com.sun.star.awt.XProgressBar
@@ -5305,21 +5305,21 @@ com.sun.star.awt.UnoControlProgressBar
 com.sun.star.awt.UnoControlProgressBarModel
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Applying_Number_Formats#XNumberformatPreviewer
-DESCR:OfficeDev - Applying Number Formats - NumberFormatter Service - XNumberformatPreviewer
+LINK:Documentation/DevGuide/Office_Development#XNumberformatPreviewer
+DESCR:Office Development - Applying Number Formats - NumberFormatter Service - XNumberformatPreviewer
 REF:
 com.sun.star.util.XNumberFormatPreviewer
 com.sun.star.util.NumberFormats
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Service_Manager
-DESCR:ProUNO - Service Manager
+LINK:Documentation/DevGuide/Professional_UNO#Service_Manager
+DESCR:Professional UNO - Service Manager
 REF:
 com.sun.star.lang.ServiceManager
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Overall_Document_Features#Page_Styles
-DESCR:Spreadsheets - Overall Document Features - Styles - Page Styles
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Page_Styles
+DESCR:Spreadsheet Documents - Overall Document Features - Styles - Page Styles
 REF:
 com.sun.star.style.PageStyle
 com.sun.star.sheet.HeaderFooterContent
@@ -5329,13 +5329,13 @@ com.sun.star.sheet.TablePageStyle
 TOPIC:
 com.sun.star.sheet.TablePageStyle
 
-LINK:Documentation/DevGuide/Basic/Group_Box
-DESCR:Basic - Group Box
+LINK:Documentation/DevGuide/LibreOffice_Basic#Group_Box
+DESCR:LibreOffice Basic - Group Box
 REF:
 com.sun.star.awt.UnoControlGroupBox
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Parameters
+LINK:Documentation/DevGuide/Forms#Parameters
 DESCR:Forms - Parameters
 REF:
 com.sun.star.sdbc.XParameters
@@ -5347,28 +5347,28 @@ TOPIC:
 com.sun.star.form.XDatabaseParameterListener
 com.sun.star.form.XDatabaseParameterBroadcaster
 
-LINK:Documentation/DevGuide/WritingUNO/XInterface
-DESCR:WritingUNO - XInterface
+LINK:Documentation/DevGuide/Writing_UNO_Components#XInterface
+DESCR:Writing UNO Components - XInterface
 REF:
 com.sun.star.uno.TypeClass
 com.sun.star.uno.XInterface
 TOPIC:
 com.sun.star.uno.XInterface
 
-LINK:Documentation/DevGuide/FirstSteps/Objects%2C_Interfaces%2C_and_Services#Interfaces
-DESCR:FirstSteps - Objects, Interfaces, and Services - Interfaces
+LINK:Documentation/DevGuide/First_Steps#Interfaces
+DESCR:First Steps - Objects, Interfaces, and Services - Interfaces
 REF:
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Applying_Number_Formats#XNumberformatter
-DESCR:OfficeDev - Applying Number Formats - NumberFormatter Service - XNumberformatter
+LINK:Documentation/DevGuide/Office_Development#XNumberformatter
+DESCR:Office Development - Applying Number Formats - NumberFormatter Service - XNumberformatter
 REF:
 com.sun.star.util.XNumberFormatter
 TOPIC:
 
-LINK:Documentation/DevGuide/Config/Object_Model
-DESCR:Config - Object Model
+LINK:Documentation/DevGuide/Configuration_Management#Object_Model
+DESCR:Configuration Management - Object Model
 REF:
 com.sun.star.configuration.ConfigurationUpdateAccess
 com.sun.star.configuration.ConfigurationProvider
@@ -5378,8 +5378,8 @@ com.sun.star.configuration.ConfigurationUpdateAccess
 com.sun.star.configuration.ConfigurationProvider
 com.sun.star.configuration.ConfigurationAccess
 
-LINK:Documentation/DevGuide/Text/Formatting
-DESCR:Text - Formatting
+LINK:Documentation/DevGuide/Text_Documents#Formatting
+DESCR:Text Documents - Formatting
 REF:
 com.sun.star.style.LineSpacing
 com.sun.star.style.CaseMap
@@ -5431,8 +5431,8 @@ com.sun.star.text.TextDocument
 com.sun.star.style.CharacterPropertiesAsian
 com.sun.star.style.CharacterProperties
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Handling_UNO_Objects#Accessing_UNO_Services
-DESCR:ProUNO - Basic - Handling UNO Objects - Accessing UNO Services
+LINK:Documentation/DevGuide/Professional_UNO#Accessing_UNO_Services
+DESCR:Professional UNO - Basic - Handling UNO Objects - Accessing UNO Services
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.container.XNameContainer
@@ -5441,15 +5441,15 @@ com.sun.star.container.XNameReplace
 com.sun.star.beans.Introspection
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Initializing_Bound_Controls
+LINK:Documentation/DevGuide/Forms#Initializing_Bound_Controls
 DESCR:Forms - Initializing Bound Controls
 REF:
 com.sun.star.form.XReset
 com.sun.star.form.component.DateField
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Element_Access
-DESCR:FirstSteps - Element Access
+LINK:Documentation/DevGuide/First_Steps#Element_Access
+DESCR:First Steps - Element Access
 REF:
 com.sun.star.container.XNameContainer
 com.sun.star.sheet.Spreadsheets
@@ -5459,15 +5459,15 @@ com.sun.star.container.XEnumeration
 com.sun.star.container.XIndexContainer
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Saving_Text_Documents#Storing
-DESCR:Text - Saving Text Documents - Storing
+LINK:Documentation/DevGuide/Text_Documents#Storing
+DESCR:Text Documents - Saving Text Documents - Storing
 REF:
 com.sun.star.frame.XStorable
 TOPIC:
 com.sun.star.frame.XStorable
 
-LINK:Documentation/DevGuide/Drawings/Working_with_Drawing_Documents#Document_Structure
-DESCR:Drawings - Working with Drawing Documents - Document Structure
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Document_Structure
+DESCR:Drawings and Presentations - Working with Drawing Documents - Document Structure
 REF:
 com.sun.star.drawing.DrawPage
 com.sun.star.drawing.Layer
@@ -5476,8 +5476,8 @@ com.sun.star.drawing.MasterPage
 TOPIC:
 com.sun.star.drawing.DrawPage
 
-LINK:Documentation/DevGuide/Drawings/Settings
-DESCR:Drawings - Settings
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Settings
+DESCR:Drawings and Presentations - Settings
 REF:
 com.sun.star.beans.PropertySet
 com.sun.star.lang.XMultiServiceFactory
@@ -5487,26 +5487,26 @@ com.sun.star.drawing.DocumentSettings
 TOPIC:
 com.sun.star.beans.PropertySet
 
-LINK:Documentation/DevGuide/OfficeDev/Handling_Documents#URL_Parameter
-DESCR:OfficeDev - Handling Documents - Loading Documents - URL Parameter
+LINK:Documentation/DevGuide/Office_Development#URL_Parameter
+DESCR:Office Development - Handling Documents - Loading Documents - URL Parameter
 REF:
 TOPIC:
 com.sun.star.util.URLTransformer
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Using_Automation_Objects_from_UNO#Accessing_Automation_Objects
-DESCR:ProUNO - Bridge - Using Automation Objects from UNO - Instantiation - Accessing Automation Objects
+LINK:Documentation/DevGuide/Professional_UNO#Accessing_Automation_Objects
+DESCR:Professional UNO - Bridge - Using Automation Objects from UNO - Instantiation - Accessing Automation Objects
 REF:
 com.sun.star.script.XInvocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Extensions/Adding_a_Leaf_to_an_Existing_Node
+LINK:Documentation/DevGuide/Extensions#Adding_a_Leaf_to_an_Existing_Node
 DESCR:Extensions - Adding a Leaf to an Existing Node
 REF:
 com.sun.star.container.XHierarchicalNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/TextView
-DESCR:Text - TextView
+LINK:Documentation/DevGuide/Text_Documents#TextView
+DESCR:Text Documents - TextView
 REF:
 com.sun.star.text.ViewSettings
 com.sun.star.text.XRubySelection
@@ -5521,16 +5521,16 @@ com.sun.star.view.DocumentZoomType
 TOPIC:
 com.sun.star.view.XSelectionSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XCharacterClassification
-DESCR:OfficeDev - Overview and Using the API - XCharacterClassification
+LINK:Documentation/DevGuide/Office_Development#XCharacterClassification
+DESCR:Office Development - Overview and Using the API - XCharacterClassification
 REF:
 com.sun.star.i18n.XLocaleData
 com.sun.star.i18n.XCharacterClassification
 TOPIC:
 com.sun.star.i18n.XCharacterClassification
 
-LINK:Documentation/DevGuide/Text/Ruby
-DESCR:Text - Ruby
+LINK:Documentation/DevGuide/Text_Documents#Ruby
+DESCR:Text Documents - Ruby
 REF:
 com.sun.star.text.XRubySelection
 com.sun.star.style.CharacterProperties
@@ -5538,8 +5538,8 @@ TOPIC:
 com.sun.star.text.XRubySelection
 com.sun.star.style.CharacterProperties
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Execution_Environment
-DESCR:WritingUNO - Jobs - Execution Environment
+LINK:Documentation/DevGuide/Writing_UNO_Components#Execution_Environment
+DESCR:Writing UNO Components - Jobs - Execution Environment
 REF:
 com.sun.star.util.XCloseListener
 com.sun.star.document.OfficeDocument
@@ -5547,16 +5547,16 @@ com.sun.star.frame.Frame
 com.sun.star.frame.Desktop
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Exception_Handling#Runtime_Exceptions
-DESCR:ProUNO - Exception Handling - Runtime Exceptions
+LINK:Documentation/DevGuide/Professional_UNO#Runtime_Exceptions
+DESCR:Professional UNO - Exception Handling - Runtime Exceptions
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.uno.Exception
 com.sun.star.uno.RuntimeException
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Windows
-DESCR:OfficeDev - Windows
+LINK:Documentation/DevGuide/Office_Development#Windows
+DESCR:Office Development - Windows
 REF:
 com.sun.star.awt.XWindow
 com.sun.star.awt.XWindowPeer
@@ -5565,13 +5565,13 @@ com.sun.star.awt.XWindow
 com.sun.star.awt.XWindowPeer
 com.sun.star.awt.XTopWindow
 
-LINK:Documentation/DevGuide/OfficeDev/Path_Variables
-DESCR:OfficeDev - Path Variables
+LINK:Documentation/DevGuide/Office_Development#Path_Variables
+DESCR:Office Development - Path Variables
 REF:
 com.sun.star.util.PathSubstitution
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Creating_a_Chart_OLE_Object_in_Draw_and_Impress
+LINK:Documentation/DevGuide/Charts#Creating_a_Chart_OLE_Object_in_Draw_and_Impress
 DESCR:Charts - Creating a Chart OLE Object in Draw and Impress
 REF:
 com.sun.star.drawing.XDrawPagesSupplier
@@ -5581,36 +5581,36 @@ com.sun.star.sheet.Spreadsheet
 TOPIC:
 com.sun.star.drawing.XDrawPagesSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/XML_Filter_Detection
-DESCR:OfficeDev - XML Filter Detection
+LINK:Documentation/DevGuide/Office_Development#XML_Filter_Detection
+DESCR:Office Development - XML Filter Detection
 REF:
 com.sun.star.document.ExtendedTypeDetection
 TOPIC:
 com.sun.star.document.ExtendedTypeDetection
 
-LINK:Documentation/DevGuide/JavaBean/OfficeWindow_Interface
-DESCR:JavaBean - OfficeWindow Interface
+LINK:Documentation/DevGuide/JavaBean_for_Office_Components#OfficeWindow_Interface
+DESCR:JavaBean for Office Components - OfficeWindow Interface
 REF:
 com.sun.star.awt.XWindowPeer
 TOPIC:
 com.sun.star.awt.XWindowPeer
 
-LINK:Documentation/DevGuide/ProUNO/Services#Service_Constructors
-DESCR:ProUNO - Services - Service Constructors
+LINK:Documentation/DevGuide/Professional_UNO#Service_Constructors
+DESCR:Professional UNO - Services - Service Constructors
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.uno.DeploymentException
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XMain
-DESCR:WritingUNO - XMain
+LINK:Documentation/DevGuide/Writing_UNO_Components#XMain
+DESCR:Writing UNO Components - XMain
 REF:
 com.sun.star.lang.XMain
 TOPIC:
 com.sun.star.lang.XMain
 
-LINK:Documentation/DevGuide/Drawings/Shape_Types
-DESCR:Drawings - Shape Types
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Shape_Types
+DESCR:Drawings and Presentations - Shape Types
 REF:
 com.sun.star.drawing.LineShape
 com.sun.star.drawing.CircleKind
@@ -5656,23 +5656,23 @@ com.sun.star.drawing.OLE2Shape
 TOPIC:
 com.sun.star.drawing.Shape
 
-LINK:Documentation/DevGuide/UCB/Universal_Content_Broker#Capabilities
-DESCR:UCB - Universal Content Broker - Capabilities
+LINK:Documentation/DevGuide/Universal_Content_Broker#Capabilities
+DESCR:Universal Content Broker - Universal Content Broker - Capabilities
 REF:
 com.sun.star.frame.Desktop
 TOPIC:
 com.sun.star.frame.Desktop
 com.sun.star.ucb.UniversalContentBroker
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Implementing_without_Helpers#XTypeProvider_Implementation
-DESCR:WritingUNO - C++ - Implementing without Helpers - XTypeProvider Implementation
+LINK:Documentation/DevGuide/Writing_UNO_Components#XTypeProvider_Implementation
+DESCR:Writing UNO Components - C++ - Implementing without Helpers - XTypeProvider Implementation
 REF:
 com.sun.star.uno.XInterface
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Interception
-DESCR:OfficeDev - Dispatch Interception
+LINK:Documentation/DevGuide/Office_Development#Dispatch_Interception
+DESCR:Office Development - Dispatch Interception
 REF:
 com.sun.star.frame.FeatureStateEvent
 com.sun.star.frame.XDispatchProviderInterception
@@ -5682,14 +5682,14 @@ com.sun.star.frame.XDispatch
 TOPIC:
 com.sun.star.frame.XDispatchProviderInterceptor
 
-LINK:Documentation/DevGuide/GUI/Creating_Menus#Accessibility
-DESCR:GUI - Creating Menus - Accessibility
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Accessibility
+DESCR:Graphical User Interfaces - Creating Menus - Accessibility
 REF:
 com.sun.star.awt.XVclWindowPeer
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Subtotals
-DESCR:Spreadsheets - Subtotals
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Subtotals
+DESCR:Spreadsheet Documents - Subtotals
 REF:
 com.sun.star.sheet.SubTotalColumn
 com.sun.star.sheet.SubTotalDescriptor
@@ -5703,28 +5703,28 @@ com.sun.star.sheet.SubTotalDescriptor
 com.sun.star.sheet.SubTotalField
 com.sun.star.sheet.XSubTotalCalculatable
 
-LINK:Documentation/DevGuide/FirstSteps/How_do_I_know_Which_Type_I_Have?
-DESCR:FirstSteps - How do I know Which Type I Have?
+LINK:Documentation/DevGuide/First_Steps#How_do_I_know_Which_Type_I_Have?
+DESCR:First Steps - How do I know Which Type I Have?
 REF:
 com.sun.star.lang.XComponent
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Modifiable_Result_Sets
-DESCR:Database - Modifiable Result Sets
+LINK:Documentation/DevGuide/Database_Access#Modifiable_Result_Sets
+DESCR:Database Access - Modifiable Result Sets
 REF:
 com.sun.star.sdbc.XRowUpdate
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Members
-DESCR:Spreadsheets - Members
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Members
+DESCR:Spreadsheet Documents - Members
 REF:
 com.sun.star.beans.XPropertySet
 com.sun.star.sheet.DataPilotSourceMember
 TOPIC:
 com.sun.star.sheet.DataPilotSourceMember
 
-LINK:Documentation/DevGuide/OfficeDev/Linguistics#Services_Overview
-DESCR:OfficeDev - Linguistics - Services Overview
+LINK:Documentation/DevGuide/Office_Development#Services_Overview
+DESCR:Office Development - Linguistics - Services Overview
 REF:
 com.sun.star.linguistic2.XSupportedLocales
 com.sun.star.linguistic2.Hyphenator
@@ -5736,8 +5736,8 @@ com.sun.star.linguistic2.XLinguServiceManager
 com.sun.star.linguistic2.Thesaurus
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XCollator
-DESCR:OfficeDev - Overview and Using the API - XCollator
+LINK:Documentation/DevGuide/Office_Development#XCollator
+DESCR:Office Development - Overview and Using the API - XCollator
 REF:
 com.sun.star.i18n.XLocaleData
 com.sun.star.i18n.XTransliteration
@@ -5745,8 +5745,8 @@ com.sun.star.i18n.XCollator
 TOPIC:
 com.sun.star.i18n.XCollator
 
-LINK:Documentation/DevGuide/Database/Tables_and_Columns
-DESCR:Database - Tables and Columns
+LINK:Documentation/DevGuide/Database_Access#Tables_and_Columns
+DESCR:Database Access - Tables and Columns
 REF:
 com.sun.star.sdb.Connection
 com.sun.star.sdbcx.Column
@@ -5772,27 +5772,27 @@ TOPIC:
 com.sun.star.sdb.Column
 com.sun.star.sdb.Table
 
-LINK:Documentation/DevGuide/ProUNO/CLI/Type_Mappings#XInterface
-DESCR:ProUNO - CLI - Type Mappings - XInterface
+LINK:Documentation/DevGuide/Professional_UNO#XInterface
+DESCR:Professional UNO - CLI - Type Mappings - XInterface
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/The_Toolkit_Service#Dockable_Windows
-DESCR:GUI - The Toolkit Service - Dockable Windows
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Dockable_Windows
+DESCR:Graphical User Interfaces - The Toolkit Service - Dockable Windows
 REF:
 com.sun.star.awt.XDockableWindow
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Example:_Editing_Spreadsheet_Cells
-DESCR:Spreadsheets - Example: Editing Spreadsheet Cells
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Example:_Editing_Spreadsheet_Cells
+DESCR:Spreadsheet Documents - Example: Editing Spreadsheet Cells
 REF:
 com.sun.star.table.XCellRange
 com.sun.star.sheet.XSpreadsheet
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Handling_Spreadsheet_Documents_Files#Creating_and_Loading_Spreadsheet_Documents
-DESCR:Spreadsheets - Handling Spreadsheet Documents Files - Creating and Loading Spreadsheet Documents
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Creating_and_Loading_Spreadsheet_Documents
+DESCR:Spreadsheet Documents - Handling Spreadsheet Documents Files - Creating and Loading Spreadsheet Documents
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.lang.XComponent
@@ -5801,34 +5801,34 @@ com.sun.star.frame.Desktop
 TOPIC:
 com.sun.star.frame.XComponentLoader
 
-LINK:Documentation/DevGuide/GUI/File_Picker
-DESCR:GUI - File Picker
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#File_Picker
+DESCR:Graphical User Interfaces - File Picker
 REF:
 com.sun.star.ui.dialogs.FilePicker
 com.sun.star.ui.dialogs.FolderPicker
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Connections#Data_Definition
-DESCR:Database - Connections - Understanding Connections - Data Definition
+LINK:Documentation/DevGuide/Database_Access#Data_Definition
+DESCR:Database Access - Connections - Understanding Connections - Data Definition
 REF:
 com.sun.star.sdbcx.DatabaseDefinition
 TOPIC:
 com.sun.star.sdbcx.DatabaseDefinition
 
-LINK:Documentation/DevGuide/GUI/Graphical_User_Interfaces#Implementation_Details
-DESCR:GUI - Graphical User Interfaces - Implementation Details
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Implementation_Details
+DESCR:Graphical User Interfaces - Graphical User Interfaces - Implementation Details
 REF:
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/CLI/Lifetime_Management_and_Obtaining_Interfaces
-DESCR:ProUNO - CLI - Lifetime Management and Obtaining Interfaces
+LINK:Documentation/DevGuide/Professional_UNO#Lifetime_Management_and_Obtaining_Interfaces
+DESCR:Professional UNO - CLI - Lifetime Management and Obtaining Interfaces
 REF:
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Core_Interfaces_to_Implement
-DESCR:WritingUNO - Core Interfaces to Implement
+LINK:Documentation/DevGuide/Writing_UNO_Components#Core_Interfaces_to_Implement
+DESCR:Writing UNO Components - Core Interfaces to Implement
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.uno.XAggregation
@@ -5850,8 +5850,8 @@ com.sun.star.lang.XMain
 com.sun.star.uno.XWeak
 com.sun.star.lang.XTypeProvider
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet_Document_Controller#Spreadsheet_View
-DESCR:Spreadsheets - Spreadsheet Document Controller - Spreadsheet View
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_View
+DESCR:Spreadsheet Documents - Spreadsheet Document Controller - Spreadsheet View
 REF:
 com.sun.star.frame.Controller
 com.sun.star.sheet.SheetCell
@@ -5873,21 +5873,21 @@ com.sun.star.container.XIndexAccess
 TOPIC:
 com.sun.star.sheet.SpreadsheetView
 
-LINK:Documentation/DevGuide/WritingUNO/Defining_a_Struct
-DESCR:WritingUNO - Defining a Struct
+LINK:Documentation/DevGuide/Writing_UNO_Components#Defining_a_Struct
+DESCR:Writing UNO Components - Defining a Struct
 REF:
 com.sun.star.lang.EventObject
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Applying_Number_Formats#NumberFormatter_Service
-DESCR:OfficeDev - Applying Number Formats - NumberFormatter Service
+LINK:Documentation/DevGuide/Office_Development#NumberFormatter_Service
+DESCR:Office Development - Applying Number Formats - NumberFormatter Service
 REF:
 com.sun.star.util.XNumberFormatter
 com.sun.star.util.XNumberFormatPreviewer
 com.sun.star.util.NumberFormatter
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Validation_and_Bindings
+LINK:Documentation/DevGuide/Forms#Validation_and_Bindings
 DESCR:Forms - Validation and Bindings
 REF:
 com.sun.star.form.binding.XBindableValue
@@ -5897,14 +5897,14 @@ com.sun.star.form.binding.BindableControlModel
 com.sun.star.form.validation.ValidatableBindableControlModel
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Time_Field
-DESCR:Basic - Time Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Time_Field
+DESCR:LibreOffice Basic - Time Field
 REF:
 com.sun.star.awt.UnoControlDateField
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Example:_Fields_in_a_Template
-DESCR:Text - Example: Fields in a Template
+LINK:Documentation/DevGuide/Text_Documents#Example:_Fields_in_a_Template
+DESCR:Text Documents - Example: Fields in a Template
 REF:
 com.sun.star.text.textfield.User
 com.sun.star.text.XTextFieldsSupplier
@@ -5913,8 +5913,8 @@ com.sun.star.text.XBookmarksSupplier
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Standalone_Use_Case
-DESCR:WritingUNO - Standalone Use Case
+LINK:Documentation/DevGuide/Writing_UNO_Components#Standalone_Use_Case
+DESCR:Writing UNO Components - Standalone Use Case
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.lang.XInitialization
@@ -5922,37 +5922,37 @@ com.sun.star.bridge.XBridge
 com.sun.star.lang.XMain
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Filter_Options
-DESCR:OfficeDev - Filter Options
+LINK:Documentation/DevGuide/Office_Development#Filter_Options
+DESCR:Office Development - Filter Options
 REF:
 com.sun.star.beans.XPropertyAccess
 com.sun.star.ui.dialogs.FilterOptionsDialog
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Using_Hyphenator#Relevant_properties
-DESCR:OfficeDev - Using Hyphenator - Relevant properties
+LINK:Documentation/DevGuide/Office_Development#Relevant_properties_2
+DESCR:Office Development - Using Hyphenator - Relevant properties
 REF:
 com.sun.star.linguistic2.XHyphenatedWord
 com.sun.star.linguistic2.XPossibleHyphens
 com.sun.star.linguistic2.LinguProperties
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XIndexEntrySupplier
-DESCR:OfficeDev - Implementing a New Locale - XIndexEntrySupplier
+LINK:Documentation/DevGuide/Office_Development#XIndexEntrySupplier
+DESCR:Office Development - Implementing a New Locale - XIndexEntrySupplier
 REF:
 com.sun.star.i18n.XIndexEntrySupplier
 TOPIC:
 com.sun.star.i18n.XIndexEntrySupplier
 
-LINK:Documentation/DevGuide/Extensions/Saving_and_Reading_Data_for_the_Options_Page
+LINK:Documentation/DevGuide/Extensions#Saving_and_Reading_Data_for_the_Options_Page
 DESCR:Extensions - Saving and Reading Data for the Options Page
 REF:
 com.sun.star.awt.XWindow
 com.sun.star.awt.XContainerWindowEventHandler
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Scrollable_Result_Sets
-DESCR:Database - Scrollable Result Sets
+LINK:Documentation/DevGuide/Database_Access#Scrollable_Result_Sets
+DESCR:Database Access - Scrollable Result Sets
 REF:
 com.sun.star.sdbc.ResultSetType
 com.sun.star.sdbc.ResultSetConcurrency
@@ -5960,8 +5960,8 @@ com.sun.star.sdbc.XResultSet
 TOPIC:
 com.sun.star.sdbc.XResultSet
 
-LINK:Documentation/DevGuide/Spreadsheets/Capabilities_of_Spreadsheet
-DESCR:Spreadsheets - Capabilities of Spreadsheet
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Capabilities_of_Spreadsheet
+DESCR:Spreadsheet Documents - Capabilities of Spreadsheet
 REF:
 com.sun.star.table.XTableChartsSupplier
 com.sun.star.sheet.XSheetPageBreak
@@ -5979,22 +5979,22 @@ com.sun.star.sheet.XScenariosSupplier
 com.sun.star.sheet.XDataPilotTablesSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Server_Use_Case
-DESCR:WritingUNO - Server Use Case
+LINK:Documentation/DevGuide/Writing_UNO_Components#Server_Use_Case
+DESCR:Writing UNO Components - Server Use Case
 REF:
 com.sun.star.io.Pipe
 com.sun.star.io.XInputStream
 com.sun.star.io.XOutputStream
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Required_Files
-DESCR:WritingUNO - Required Files
+LINK:Documentation/DevGuide/Writing_UNO_Components#Required_Files
+DESCR:Writing UNO Components - Required Files
 REF:
 com.sun.star.lang.XMain
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API
-DESCR:AdvUNO - UNO Reflection API
+LINK:Documentation/DevGuide/Advanced_UNO#UNO_Reflection_API
+DESCR:Advanced UNO - UNO Reflection API
 REF:
 TOPIC:
 com.sun.star.reflection.CoreReflection
@@ -6006,14 +6006,14 @@ com.sun.star.script.Invocation
 com.sun.star.beans.Introspection
 com.sun.star.lang.XTypeProvider
 
-LINK:Documentation/DevGuide/ProUNO/C++/Mapping_of_Struct_Types
-DESCR:ProUNO - C++ - Mapping of Struct Types
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Struct_Types_2
+DESCR:Professional UNO - C++ - Mapping of Struct Types
 REF:
 com.sun.star.beans.Optional
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Text_Table_Properties
-DESCR:Text - Text Table Properties
+LINK:Documentation/DevGuide/Text_Documents#Text_Table_Properties
+DESCR:Text Documents - Text Table Properties
 REF:
 com.sun.star.text.TableColumnSeparator
 com.sun.star.table.ShadowFormat
@@ -6024,20 +6024,20 @@ com.sun.star.style.BreakType
 com.sun.star.table.TableBorder
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Building_and_Testing_C++_Components#Test_Registration_and_Use
-DESCR:WritingUNO - C++ - Building and Testing C++ Components - Test Registration and Use
+LINK:Documentation/DevGuide/Writing_UNO_Components#Test_Registration_and_Use
+DESCR:Writing UNO Components - C++ - Building and Testing C++ Components - Test Registration and Use
 REF:
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/External_Value_Suppliers
+LINK:Documentation/DevGuide/Forms#External_Value_Suppliers
 DESCR:Forms - External Value Suppliers
 REF:
 com.sun.star.form.binding
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Documents#Reading_a_Document_Content
-DESCR:UCB - Documents - Reading a Document Content
+LINK:Documentation/DevGuide/Universal_Content_Broker#Reading_a_Document_Content
+DESCR:Universal Content Broker - Documents - Reading a Document Content
 REF:
 com.sun.star.ucb.OpenCommandArgument2
 com.sun.star.io.XInputStream
@@ -6045,14 +6045,14 @@ com.sun.star.io.XOutputStream
 com.sun.star.io.XActiveDataSink
 TOPIC:
 
-LINK:Documentation/DevGuide/Scripting/Writing_a_LanguageScriptProvider_UNO_Component_using_the_Java_Helper_Classes
-DESCR:Scripting - Writing a LanguageScriptProvider UNO Component using the Java Helper Classes
+LINK:Documentation/DevGuide/Scripting_Framework#Writing_a_LanguageScriptProvider_UNO_Component_using_the_Java_Helper_Classes
+DESCR:Scripting Framework - Writing a LanguageScriptProvider UNO Component using the Java Helper Classes
 REF:
 com.sun.star.script.provider.XScript
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Text_Frames
-DESCR:Text - Text Frames
+LINK:Documentation/DevGuide/Text_Documents#Text_Frames
+DESCR:Text Documents - Text Frames
 REF:
 com.sun.star.text.BaseFrame
 com.sun.star.text.Text
@@ -6063,22 +6063,22 @@ com.sun.star.text.XTextContent
 com.sun.star.text.TextFrame
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/Pattern_Field
-DESCR:Basic - Pattern Field
+LINK:Documentation/DevGuide/LibreOffice_Basic#Pattern_Field
+DESCR:LibreOffice Basic - Pattern Field
 REF:
 com.sun.star.awt.UnoControlPatternField
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cells_Absolute_Address
-DESCR:Spreadsheets - Cells Absolute Address
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cells_Absolute_Address
+DESCR:Spreadsheet Documents - Cells Absolute Address
 REF:
 com.sun.star.sheet.XCellAddressable
 com.sun.star.table.CellAddress
 TOPIC:
 com.sun.star.sheet.XCellAddressable
 
-LINK:Documentation/DevGuide/ProUNO/Service_Manager#XContentEnumerationAccess_Interface
-DESCR:ProUNO - Service Manager - XContentEnumerationAccess Interface
+LINK:Documentation/DevGuide/Professional_UNO#XContentEnumerationAccess_Interface
+DESCR:Professional UNO - Service Manager - XContentEnumerationAccess Interface
 REF:
 com.sun.star.container.XContentEnumerationAccess
 com.sun.star.lang.XSingleServiceFactory
@@ -6086,8 +6086,8 @@ com.sun.star.container.XEnumeration
 TOPIC:
 com.sun.star.container.XContentEnumerationAccess
 
-LINK:Documentation/DevGuide/Database/Runtime_Settings_For_Predefined_Queries
-DESCR:Database - Runtime Settings For Predefined Queries
+LINK:Documentation/DevGuide/Database_Access#Runtime_Settings_For_Predefined_Queries
+DESCR:Database Access - Runtime Settings For Predefined Queries
 REF:
 com.sun.star.sdbcx.Container
 com.sun.star.sdb.Query
@@ -6103,23 +6103,23 @@ com.sun.star.sdbcx.XRename
 com.sun.star.sdb.DataSettings
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Applying_Number_Formats
-DESCR:OfficeDev - Applying Number Formats
+LINK:Documentation/DevGuide/Office_Development#Applying_Number_Formats
+DESCR:Office Development - Applying Number Formats
 REF:
 com.sun.star.util.XNumberFormatter
 com.sun.star.util.NumberFormatter
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Access_to_Formulas%2C_Values_and_Errors
-DESCR:Spreadsheets - Access to Formulas, Values and Errors
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Access_to_Formulas%2C_Values_and_Errors
+DESCR:Spreadsheet Documents - Access to Formulas, Values and Errors
 REF:
 com.sun.star.table.XCell
 com.sun.star.table.CellContentType
 com.sun.star.table.XCellRange
 TOPIC:
 
-LINK:Documentation/DevGuide/GUI/Formatted_Field
-DESCR:GUI - Formatted Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Formatted_Field
+DESCR:Graphical User Interfaces - Formatted Field
 REF:
 com.sun.star.awt.XSpinListener
 com.sun.star.awt.UnoControlFormattedField
@@ -6127,16 +6127,16 @@ com.sun.star.awt.UnoControlFormattedFieldModel
 com.sun.star.util.XNumberFormatsSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Line_Numbering_and_Outline_Numbering#Line_Numbering
-DESCR:Text - Line Numbering and Outline Numbering - Line Numbering
+LINK:Documentation/DevGuide/Text_Documents#Line_Numbering
+DESCR:Text Documents - Line Numbering and Outline Numbering - Line Numbering
 REF:
 com.sun.star.text.XLineNumberingProperties
 com.sun.star.text.LineNumberingProperties
 TOPIC:
 com.sun.star.text.LineNumberingProperties
 
-LINK:Documentation/DevGuide/Scripting/Implementation
-DESCR:Scripting - Implementation
+LINK:Documentation/DevGuide/Scripting_Framework#Implementation
+DESCR:Scripting Framework - Implementation
 REF:
 com.sun.star.script.provider.XScriptProvider
 com.sun.star.script.browse.BrowseNodeTypes
@@ -6149,23 +6149,23 @@ com.sun.star.script.provider.XScript
 com.sun.star.script.provider.XScriptContext
 TOPIC:
 
-LINK:Documentation/DevGuide/FirstSteps/Element_Access#Index_Access
-DESCR:FirstSteps - Element Access - Index Access
+LINK:Documentation/DevGuide/First_Steps#Index_Access
+DESCR:First Steps - Element Access - Index Access
 REF:
 com.sun.star.container.XIndexAccess
 com.sun.star.sheet.Spreadsheet
 com.sun.star.sheet.XSpreadsheets
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Pie_Charts
+LINK:Documentation/DevGuide/Charts#Pie_Charts
 DESCR:Charts - Pie Charts
 REF:
 com.sun.star.chart.ChartPieSegmentProperties
 TOPIC:
 com.sun.star.chart.ChartPieSegmentProperties
 
-LINK:Documentation/DevGuide/GUI/Creating_Menus
-DESCR:GUI - Creating Menus
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Creating_Menus
+DESCR:Graphical User Interfaces - Creating Menus
 REF:
 com.sun.star.awt.XMenu
 com.sun.star.awt.XMenuBar
@@ -6174,21 +6174,21 @@ com.sun.star.awt.MenuItemStyle
 com.sun.star.awt.MenuEvent
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Form_Layer_Views#Focusing_Controls
+LINK:Documentation/DevGuide/Forms#Focusing_Controls
 DESCR:Forms - Form Layer Views - Focusing Controls
 REF:
 com.sun.star.awt.XWindow
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet_Add-Ins
-DESCR:Spreadsheets - Spreadsheet Add-Ins
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Add-Ins
+DESCR:Spreadsheet Documents - Spreadsheet Add-Ins
 REF:
 com.sun.star.sheet.AddIn
 TOPIC:
 com.sun.star.sheet.AddIn
 
-LINK:Documentation/DevGuide/GUI/Creating_Menus#Rendering
-DESCR:GUI - Creating Menus - Rendering
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Rendering
+DESCR:Graphical User Interfaces - Creating Menus - Rendering
 REF:
 com.sun.star.awt.XDevice
 com.sun.star.awt.RasterOperation
@@ -6198,7 +6198,7 @@ com.sun.star.awt.XGraphics
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/FormComponent_Service
+LINK:Documentation/DevGuide/Forms#FormComponent_Service
 DESCR:Forms - FormComponent Service
 REF:
 com.sun.star.lang.XComponent
@@ -6206,30 +6206,30 @@ com.sun.star.form.FormComponent
 com.sun.star.container.XChild
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XTypeProvider
-DESCR:WritingUNO - XTypeProvider
+LINK:Documentation/DevGuide/Writing_UNO_Components#XTypeProvider
+DESCR:Writing UNO Components - XTypeProvider
 REF:
 com.sun.star.lang.XTypeProvider
 TOPIC:
 com.sun.star.lang.XTypeProvider
 
-LINK:Documentation/DevGuide/AdvUNO/XInvocation_Bridge#Scripting_Existing_UNO_Objects
-DESCR:AdvUNO - XInvocation Bridge - Scripting Existing UNO Objects
+LINK:Documentation/DevGuide/Advanced_UNO#Scripting_Existing_UNO_Objects
+DESCR:Advanced UNO - XInvocation Bridge - Scripting Existing UNO Objects
 REF:
 com.sun.star.script.Invocation
 TOPIC:
 com.sun.star.script.Invocation
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Mapping_of_Enums_and_Constant_Groups
-DESCR:ProUNO - Basic - Mapping of Enums and Constant Groups
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Enums_and_Constant_Groups
+DESCR:Professional UNO - Basic - Mapping of Enums and Constant Groups
 REF:
 com.sun.star.beans.PropertyState
 com.sun.star.beans.XPropertySet
 com.sun.star.beans.PropertyConcept
 TOPIC:
 
-LINK:Documentation/DevGuide/AppendixC/The_WebDAV_Content_Provider#Commands_and_Properties
-DESCR:AppendixC - The WebDAV Content Provider - Commands and Properties
+LINK:Documentation/DevGuide/Universal_Content_Providers#Commands_and_Properties_4
+DESCR:Appendix C. Universal Content Providers - The WebDAV Content Provider - Commands and Properties
 REF:
 com.sun.star.ucb.XContent
 com.sun.star.lang.XServiceInfo
@@ -6244,8 +6244,8 @@ com.sun.star.ucb.XCommandProcessor
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Config/Updating_Configuration_Data
-DESCR:Config - Updating Configuration Data
+LINK:Documentation/DevGuide/Configuration_Management#Updating_Configuration_Data
+DESCR:Configuration Management - Updating Configuration Data
 REF:
 com.sun.star.beans.NamedValue
 com.sun.star.beans.XPropertyState
@@ -6270,8 +6270,8 @@ com.sun.star.beans.Property
 TOPIC:
 com.sun.star.configuration.ConfigurationUpdateAccess
 
-LINK:Documentation/DevGuide/Text/Line_Numbering_and_Outline_Numbering#Paragraph_and_Outline_Numbering
-DESCR:Text - Line Numbering and Outline Numbering - Paragraph and Outline Numbering
+LINK:Documentation/DevGuide/Text_Documents#Paragraph_and_Outline_Numbering
+DESCR:Text Documents - Line Numbering and Outline Numbering - Paragraph and Outline Numbering
 REF:
 com.sun.star.text.NumberingRules
 com.sun.star.style.ParagraphProperties
@@ -6285,14 +6285,14 @@ com.sun.star.text.HoriOrientation
 com.sun.star.text.XChapterNumberingSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Handling_Presentation_Document_Files#Creating_and_Loading_Presentation_Documents
-DESCR:Drawings - Handling Presentation Document Files - Creating and Loading Presentation Documents
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Creating_and_Loading_Presentation_Documents
+DESCR:Drawings and Presentations - Handling Presentation Document Files - Creating and Loading Presentation Documents
 REF:
 com.sun.star.document.MediaDescriptor
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/Implementation_Loader
-DESCR:AdvUNO - Implementation Loader
+LINK:Documentation/DevGuide/Advanced_UNO#Implementation_Loader
+DESCR:Advanced UNO - Implementation Loader
 REF:
 com.sun.star.registry.ImplementationRegistration
 com.sun.star.loader.XImplementationLoader
@@ -6301,15 +6301,15 @@ com.sun.star.lang.ServiceManager
 TOPIC:
 com.sun.star.loader.XImplementationLoader
 
-LINK:Documentation/DevGuide/OfficeDev/Writing_the_Filtering_Component#XDocumentHandler
-DESCR:OfficeDev - Writing the Filtering Component - XDocumentHandler
+LINK:Documentation/DevGuide/Office_Development#XDocumentHandler
+DESCR:Office Development - Writing the Filtering Component - XDocumentHandler
 REF:
 com.sun.star.xml.sax.XDocumentHandler
 TOPIC:
 com.sun.star.xml.sax.XDocumentHandler
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_Spell_Checker
-DESCR:OfficeDev - Implementing a Spell Checker
+LINK:Documentation/DevGuide/Office_Development#Implementing_a_Spell_Checker
+DESCR:Office Development - Implementing a Spell Checker
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.lang.XComponent
@@ -6322,8 +6322,8 @@ com.sun.star.linguistic2.SpellFailure
 com.sun.star.lang.XTypeProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Service_Manager#XSet_Interface
-DESCR:ProUNO - Service Manager - XSet Interface
+LINK:Documentation/DevGuide/Professional_UNO#XSet_Interface
+DESCR:Professional UNO - Service Manager - XSet Interface
 REF:
 com.sun.star.lang.XServiceInfo
 com.sun.star.lang.XSingleServiceFactory
@@ -6331,8 +6331,8 @@ com.sun.star.container.XSet
 com.sun.star.lang.XSingleComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Executing_Content_Commands
-DESCR:UCB - Executing Content Commands
+LINK:Documentation/DevGuide/Universal_Content_Broker#Executing_Content_Commands
+DESCR:Universal Content Broker - Executing Content Commands
 REF:
 com.sun.star.ucb.Content
 com.sun.star.ucb.XCommandEnvironment
@@ -6343,8 +6343,8 @@ TOPIC:
 com.sun.star.ucb.Command
 com.sun.star.ucb.XCommandProcessor
 
-LINK:Documentation/DevGuide/OfficeDev/Handling_Documents#MediaDescriptor
-DESCR:OfficeDev - Handling Documents - Loading Documents - MediaDescriptor
+LINK:Documentation/DevGuide/Office_Development#MediaDescriptor
+DESCR:Office Development - Handling Documents - Loading Documents - MediaDescriptor
 REF:
 com.sun.star.document.TypeDetection
 com.sun.star.task.XStatusIndicator
@@ -6361,15 +6361,15 @@ com.sun.star.document.MediaDescriptor
 TOPIC:
 com.sun.star.document.MediaDescriptor
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Jobs
-DESCR:WritingUNO - Jobs - Jobs
+LINK:Documentation/DevGuide/Writing_UNO_Components#Jobs
+DESCR:Writing UNO Components - Jobs - Jobs
 REF:
 com.sun.star.task.JobExecutor
 TOPIC:
 com.sun.star.task.JobExecutor
 
-LINK:Documentation/DevGuide/Database/Data_Sources_in_OpenOffice.org_API#DatabaseContext
-DESCR:Database - Data Sources in OpenOffice.org API - DatabaseContext
+LINK:Documentation/DevGuide/Database_Access#DatabaseContext
+DESCR:Database Access - Data Sources in LibreOffice API - DatabaseContext
 REF:
 com.sun.star.sdb.Connection
 com.sun.star.sdb.DatabaseContext
@@ -6380,15 +6380,15 @@ com.sun.star.container.XEnumeration
 TOPIC:
 com.sun.star.sdb.DatabaseContext
 
-LINK:Documentation/DevGuide/Text/Working_with_Text_Documents#Word_Processing
-DESCR:Text - Working with Text Documents - Word Processing
+LINK:Documentation/DevGuide/Text_Documents#Word_Processing
+DESCR:Text Documents - Working with Text Documents - Word Processing
 REF:
 com.sun.star.text.Text
 TOPIC:
 com.sun.star.text.Text
 
-LINK:Documentation/DevGuide/Database/Forms_and_Reports
-DESCR:Database - Forms and Reports
+LINK:Documentation/DevGuide/Database_Access#Forms_and_Reports
+DESCR:Database Access - Forms and Reports
 REF:
 com.sun.star.frame.XComponentLoader
 com.sun.star.container.XHierarchicalNameContainer
@@ -6412,54 +6412,54 @@ TOPIC:
 com.sun.star.sdb.XReportDocumentsSupplier
 com.sun.star.sdb.XFormDocumentsSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/Document_API_Filter_Development#Introduction
-DESCR:OfficeDev - Document API Filter Development - Introduction
+LINK:Documentation/DevGuide/Office_Development#Introduction_3
+DESCR:Office Development - Document API Filter Development - Introduction
 REF:
 com.sun.star.document.MediaDescriptor
 com.sun.star.document.ImportFilter
 com.sun.star.document.ExportFilter
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XDocumentPropertiesSupplier
-DESCR:OfficeDev - Component - Models - XDocumentPropertiesSupplier
+LINK:Documentation/DevGuide/Office_Development#XDocumentPropertiesSupplier
+DESCR:Office Development - Component - Models - XDocumentPropertiesSupplier
 REF:
 com.sun.star.document.XDocumentPropertiesSupplier
 TOPIC:
 com.sun.star.document.XDocumentPropertiesSupplier
 
-LINK:Documentation/DevGuide/FirstSteps/Struct
-DESCR:FirstSteps - Struct
+LINK:Documentation/DevGuide/First_Steps#Struct
+DESCR:First Steps - Struct
 REF:
 com.sun.star.reflection.CoreReflection
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Automation_Objects_with_UNO_Interfaces#Examples
-DESCR:ProUNO - Bridge - Automation Objects with UNO Interfaces - null - Examples
+LINK:Documentation/DevGuide/Professional_UNO#Examples
+DESCR:Professional UNO - Bridge - Automation Objects with UNO Interfaces - Examples
 REF:
 com.sun.star.lang.XEventListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/The_Model-View_Paradigm
+LINK:Documentation/DevGuide/Forms#The_Model-View_Paradigm
 DESCR:Forms - The Model-View Paradigm
 REF:
 com.sun.star.beans.XPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/C++/Class_Definition_with_Helper_Template_Classes#XServiceInfo
-DESCR:WritingUNO - C++ - Class Definition with Helper Template Classes - XServiceInfo
+LINK:Documentation/DevGuide/Writing_UNO_Components#XServiceInfo_3
+DESCR:Writing UNO Components - C++ - Class Definition with Helper Template Classes - XServiceInfo
 REF:
 com.sun.star.lang.XServiceInfo
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Process#Listening_for_Status_Information
-DESCR:OfficeDev - Dispatch Process - Listening for Status Information
+LINK:Documentation/DevGuide/Office_Development#Listening_for_Status_Information
+DESCR:Office Development - Dispatch Process - Listening for Status Information
 REF:
 com.sun.star.frame.FeatureStateEvent
 com.sun.star.frame.XStatusListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Working_with_Drawing_Documents#Page_Handling
-DESCR:Drawings - Working with Drawing Documents - Page Handling
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Page_Handling
+DESCR:Drawings and Presentations - Working with Drawing Documents - Page Handling
 REF:
 com.sun.star.drawing.XDrawPagesSupplier
 com.sun.star.drawing.XMasterPageTarget
@@ -6470,8 +6470,8 @@ TOPIC:
 com.sun.star.drawing.XDrawPages
 com.sun.star.drawing.XDrawPageDuplicator
 
-LINK:Documentation/DevGuide/Spreadsheets/Table_Auto_Formats
-DESCR:Spreadsheets - Table Auto Formats
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Table_Auto_Formats
+DESCR:Spreadsheet Documents - Table Auto Formats
 REF:
 com.sun.star.sheet.TableAutoFormatField
 com.sun.star.container.XIndexAccess
@@ -6483,8 +6483,8 @@ com.sun.star.sheet.TableAutoFormatField
 com.sun.star.sheet.TableAutoFormat
 com.sun.star.table.XAutoFormattable
 
-LINK:Documentation/DevGuide/Database/Using_the_getXXX_Methods
-DESCR:Database - Using the getXXX Methods
+LINK:Documentation/DevGuide/Database_Access#Using_the_getXXX_Methods
+DESCR:Database Access - Using the getXXX Methods
 REF:
 com.sun.star.sdbc.XRow
 com.sun.star.util.Date
@@ -6492,29 +6492,29 @@ com.sun.star.sdbc.DataType
 TOPIC:
 com.sun.star.sdbc.XRow
 
-LINK:Documentation/DevGuide/AppendixA/Exceptions#Naming
-DESCR:AppendixA - Exceptions - Naming
+LINK:Documentation/DevGuide/LibreOffice_API-Design-Guidelines#Naming_7
+DESCR:Appendix A. Guidelines and Specifications - Exceptions - Naming
 REF:
 com.sun.star.lang.IllegalArgumentException
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Intercepting_Context_Menus#Finishing_Interception
-DESCR:WritingUNO - Intercepting Context Menus - Writing an Interceptor - Finishing Interception
+LINK:Documentation/DevGuide/Writing_UNO_Components#Finishing_Interception
+DESCR:Writing UNO Components - Intercepting Context Menus - Writing an Interceptor - Finishing Interception
 REF:
 com.sun.star.ui.XContextMenuInterceptor
 com.sun.star.ui.ContextMenuInterceptorAction
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Java_Window_Integration#Legal_Solution
-DESCR:OfficeDev - Java Window Integration - Using the Window Handle - Legal Solution
+LINK:Documentation/DevGuide/Office_Development#Legal_Solution
+DESCR:Office Development - Java Window Integration - Using the Window Handle - Legal Solution
 REF:
 com.sun.star.awt.XWindow
 com.sun.star.awt.Toolkit
 com.sun.star.awt.XSystemChildFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Access_to_Text_Content
-DESCR:Spreadsheets - Access to Text Content
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Access_to_Text_Content
+DESCR:Spreadsheet Documents - Access to Text Content
 REF:
 com.sun.star.text.Text
 com.sun.star.text.XTextFieldsSupplier
@@ -6523,44 +6523,44 @@ com.sun.star.text.XText
 com.sun.star.text.textfield.URL
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Framework
-DESCR:OfficeDev - Dispatch Framework
+LINK:Documentation/DevGuide/Office_Development#Dispatch_Framework
+DESCR:Office Development - Dispatch Framework
 REF:
 com.sun.star.frame.XDispatchProviderInterception
 com.sun.star.frame.XDispatchProvider
 TOPIC:
 com.sun.star.frame.XDispatchProvider
 
-LINK:Documentation/DevGuide/OfficeDev/Common_Application_Features#Copying_Data
-DESCR:OfficeDev - Common Application Features - Clipboard - Using the Clipboard - Copying Data
+LINK:Documentation/DevGuide/Office_Development#Copying_Data
+DESCR:Office Development - Common Application Features - Clipboard - Using the Clipboard - Copying Data
 REF:
 com.sun.star.datatransfer.XTransferable
 com.sun.star.datatransfer.clipboard.XClipboardOwner
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Importing_a_UNO_Object
-DESCR:ProUNO - Importing a UNO Object
+LINK:Documentation/DevGuide/Professional_UNO#Importing_a_UNO_Object
+DESCR:Professional UNO - Importing a UNO Object
 REF:
 com.sun.star.bridge.XUnoUrlResolver
 com.sun.star.bridge.UnoUrlResolver
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/Deployment_Options_for_Components
-DESCR:WritingUNO - Deployment Options for Components
+LINK:Documentation/DevGuide/Writing_UNO_Components#Deployment_Options_for_Components
+DESCR:Writing UNO Components - Deployment Options for Components
 REF:
 com.sun.star.reflection.TypeDescriptionProvider
 com.sun.star.registry.SimpleRegistry
 TOPIC:
 
-LINK:Documentation/DevGuide/Database/Adding_an_Index
-DESCR:Database - Adding an Index
+LINK:Documentation/DevGuide/Database_Access#Adding_an_Index
+DESCR:Database Access - Adding an Index
 REF:
 com.sun.star.sdbcx.XDataDescriptorFactory
 com.sun.star.sdbc.SQLException
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Ranges_and_Cells_Container#Access_to_Single_Cell_Ranges_in_SheetCellRanges_Container
-DESCR:Spreadsheets - Cell Ranges and Cells Container - Access to Single Cell Ranges in SheetCellRanges Container
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Access_to_Single_Cell_Ranges_in_SheetCellRanges_Container
+DESCR:Spreadsheet Documents - Cell Ranges and Cells Container - Access to Single Cell Ranges in SheetCellRanges Container
 REF:
 com.sun.star.sheet.XSheetCellRangeContainer
 com.sun.star.chart.XChartDataArray
@@ -6576,29 +6576,29 @@ com.sun.star.util.XIndent
 TOPIC:
 com.sun.star.sheet.Cells
 
-LINK:Documentation/DevGuide/OfficeDev/XML_Filter_Detection#The_ExtendedTypeDetection_Service_Implementation
-DESCR:OfficeDev - XML Filter Detection - The ExtendedTypeDetection Service Implementation
+LINK:Documentation/DevGuide/Office_Development#The_ExtendedTypeDetection_Service_Implementation
+DESCR:Office Development - XML Filter Detection - The ExtendedTypeDetection Service Implementation
 REF:
 com.sun.star.document.XExtendedFilterDetection
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models
-DESCR:OfficeDev - Component - Models
+LINK:Documentation/DevGuide/Office_Development#Models
+DESCR:Office Development - Component - Models
 REF:
 com.sun.star.document.OfficeDocument
 com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.frame.XModel
 
-LINK:Documentation/DevGuide/Spreadsheets/Data_Array
-DESCR:Spreadsheets - Data Array
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Data_Array
+DESCR:Spreadsheet Documents - Data Array
 REF:
 com.sun.star.sheet.XCellRangeData
 TOPIC:
 com.sun.star.sheet.XCellRangeData
 
-LINK:Documentation/DevGuide/GUI/Events
-DESCR:GUI - Events
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Events
+DESCR:Graphical User Interfaces - Events
 REF:
 com.sun.star.awt.MouseEvent
 com.sun.star.awt.FocusEvent
@@ -6608,7 +6608,7 @@ com.sun.star.lang.EventObject
 com.sun.star.awt.XControl
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Control_Models
+LINK:Documentation/DevGuide/Forms#Control_Models
 DESCR:Forms - Control Models
 REF:
 com.sun.star.form.component.TextField
@@ -6627,8 +6627,8 @@ com.sun.star.form.FormComponent
 com.sun.star.awt.UnoControlModel
 com.sun.star.form.FormControlModel
 
-LINK:Documentation/DevGuide/Basic/Dialog_as_Control_Container
-DESCR:Basic - Dialog as Control Container
+LINK:Documentation/DevGuide/LibreOffice_Basic#Dialog_as_Control_Container
+DESCR:LibreOffice Basic - Dialog as Control Container
 REF:
 com.sun.star.awt.UnoControlDialogModel
 com.sun.star.awt.XControlContainer
@@ -6636,8 +6636,8 @@ com.sun.star.awt.UnoControlDialog
 com.sun.star.container.XNameContainer
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Label_Ranges
-DESCR:Spreadsheets - Label Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Label_Ranges
+DESCR:Spreadsheet Documents - Label Ranges
 REF:
 com.sun.star.sheet.LabelRanges
 com.sun.star.sheet.XLabelRanges
@@ -6646,8 +6646,8 @@ com.sun.star.sheet.LabelRange
 TOPIC:
 com.sun.star.sheet.LabelRanges
 
-LINK:Documentation/DevGuide/WritingUNO/Defining_a_Service
-DESCR:WritingUNO - Defining a Service
+LINK:Documentation/DevGuide/Writing_UNO_Components#Defining_a_Service
+DESCR:Writing UNO Components - Defining a Service
 REF:
 com.sun.star.document.XFilter
 com.sun.star.beans.XPropertySet
@@ -6659,8 +6659,8 @@ com.sun.star.beans.XPropertyContainer
 com.sun.star.beans.XPropertyChangeListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Annotations
-DESCR:Spreadsheets - Cell Annotations
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Cell_Annotations
+DESCR:Spreadsheet Documents - Cell Annotations
 REF:
 com.sun.star.sheet.CellAnnotations
 com.sun.star.sheet.CellAnnotation
@@ -6678,20 +6678,20 @@ com.sun.star.sheet.CellAnnotation
 com.sun.star.sheet.XSheetAnnotation
 com.sun.star.sheet.XSheetAnnotationAnchor
 
-LINK:Documentation/DevGuide/OfficeDev/Using_the_Dispatch_Framework
-DESCR:OfficeDev - Using the Dispatch Framework
+LINK:Documentation/DevGuide/Office_Development#Using_the_Dispatch_Framework
+DESCR:Office Development - Using the Dispatch Framework
 REF:
 TOPIC:
 com.sun.star.frame.XDispatchProviderInterceptor
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Calling_Functions_and_Accessing_Properties
-DESCR:ProUNO - Bridge - Calling Functions and Accessing Properties
+LINK:Documentation/DevGuide/Professional_UNO#Calling_Functions_and_Accessing_Properties
+DESCR:Professional UNO - Bridge - Calling Functions and Accessing Properties
 REF:
 com.sun.star.beans.XPropertySet
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Footnotes_and_Endnotes
-DESCR:Text - Footnotes and Endnotes
+LINK:Documentation/DevGuide/Text_Documents#Footnotes_and_Endnotes
+DESCR:Text Documents - Footnotes and Endnotes
 REF:
 com.sun.star.text.TextContent
 com.sun.star.beans.XPropertySet
@@ -6706,7 +6706,7 @@ com.sun.star.text.XEndnotesSupplier
 TOPIC:
 com.sun.star.text.Footnote
 
-LINK:Documentation/DevGuide/Charts/Creating_and_Adding_a_Chart_to_a_Spreadsheet
+LINK:Documentation/DevGuide/Charts#Creating_and_Adding_a_Chart_to_a_Spreadsheet
 DESCR:Charts - Creating and Adding a Chart to a Spreadsheet
 REF:
 com.sun.star.table.XTableChartsSupplier
@@ -6715,16 +6715,16 @@ com.sun.star.sheet.Spreadsheet
 TOPIC:
 com.sun.star.table.XTableChartsSupplier
 
-LINK:Documentation/DevGuide/Spreadsheets/Cell_Cursor#Used_Area
-DESCR:Spreadsheets - Cell Cursor - Used Area
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Used_Area
+DESCR:Spreadsheet Documents - Cell Cursor - Used Area
 REF:
 com.sun.star.sheet.XSpreadsheet
 com.sun.star.sheet.XUsedAreaCursor
 TOPIC:
 com.sun.star.sheet.XUsedAreaCursor
 
-LINK:Documentation/DevGuide/Spreadsheets/Database_Ranges
-DESCR:Spreadsheets - Database Ranges
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Database_Ranges
+DESCR:Spreadsheet Documents - Database Ranges
 REF:
 com.sun.star.sheet.XDatabaseRanges
 com.sun.star.sheet.SpreadsheetDocument
@@ -6736,26 +6736,26 @@ com.sun.star.container.XNameAccess
 TOPIC:
 com.sun.star.sheet.XDatabaseRanges
 
-LINK:Documentation/DevGuide/Database/Seeing_Changes_in_Result_Sets
-DESCR:Database - Seeing Changes in Result Sets
+LINK:Documentation/DevGuide/Database_Access#Seeing_Changes_in_Result_Sets
+DESCR:Database Access - Seeing Changes in Result Sets
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 TOPIC:
 
-LINK:Documentation/DevGuide/Forms/Programmatic_Assignment_of_Scripts_to_Events
+LINK:Documentation/DevGuide/Forms#Programmatic_Assignment_of_Scripts_to_Events
 DESCR:Forms - Programmatic Assignment of Scripts to Events
 REF:
 com.sun.star.awt.XItemListener
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/CLI/Type_Mappings#exception
-DESCR:ProUNO - CLI - Type Mappings - exception
+LINK:Documentation/DevGuide/Professional_UNO#exception
+DESCR:Professional UNO - CLI - Type Mappings - exception
 REF:
 com.sun.star.uno.Exception
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Capabilities_of_Columns_and_Rows
-DESCR:Spreadsheets - Capabilities of Columns and Rows
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Capabilities_of_Columns_and_Rows
+DESCR:Spreadsheet Documents - Capabilities of Columns and Rows
 REF:
 com.sun.star.table.XTableColumns
 com.sun.star.table.XColumnRowRange
@@ -6767,15 +6767,15 @@ com.sun.star.table.TableRow
 com.sun.star.table.TableRows
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/Example_Python_Bridge_PyUNO
-DESCR:AdvUNO - Example Python Bridge PyUNO
+LINK:Documentation/DevGuide/Advanced_UNO#Example_Python_Bridge_PyUNO
+DESCR:Advanced UNO - Example Python Bridge PyUNO
 REF:
 com.sun.star.script.Converter
 com.sun.star.script.Invocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Printing_Spreadsheet_Documents#Printer_and_Print_Job_Settings
-DESCR:Spreadsheets - Printing Spreadsheet Documents - Printer and Print Job Settings
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Printer_and_Print_Job_Settings
+DESCR:Spreadsheet Documents - Printing Spreadsheet Documents - Printer and Print Job Settings
 REF:
 com.sun.star.awt.Size
 com.sun.star.view.PaperOrientation
@@ -6788,16 +6788,16 @@ com.sun.star.view.PrintOptions
 com.sun.star.view.PrinterDescriptor
 com.sun.star.view.XPrintable
 
-LINK:Documentation/DevGuide/WritingUNO/XServiceInfo#Supported_Service_Names
-DESCR:WritingUNO - XServiceInfo - Supported Service Names
+LINK:Documentation/DevGuide/Writing_UNO_Components#Supported_Service_Names
+DESCR:Writing UNO Components - XServiceInfo - Supported Service Names
 REF:
 com.sun.star.container.XContentEnumerationAccess
 com.sun.star.lang.XSingleServiceFactory
 com.sun.star.lang.XSingleComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Animations_and_Interactions
-DESCR:Drawings - Animations and Interactions
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Animations_and_Interactions
+DESCR:Drawings and Presentations - Animations and Interactions
 REF:
 com.sun.star.presentation.AnimationSpeed
 com.sun.star.presentation.Shape
@@ -6807,14 +6807,14 @@ TOPIC:
 com.sun.star.presentation.Shape
 com.sun.star.presentation.AnimationEffect
 
-LINK:Documentation/DevGuide/GUI/Events#Keyboard_Listener
-DESCR:GUI - Events - Keyboard Listener
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Keyboard_Listener
+DESCR:Graphical User Interfaces - Events - Keyboard Listener
 REF:
 com.sun.star.awt.XKeyListener
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Using_the_Component_Framework
-DESCR:OfficeDev - Using the Component Framework
+LINK:Documentation/DevGuide/Office_Development#Using_the_Component_Framework
+DESCR:Office Development - Using the Component Framework
 REF:
 com.sun.star.frame.Controller
 com.sun.star.lang.XComponent
@@ -6825,16 +6825,16 @@ com.sun.star.frame.XModel
 TOPIC:
 com.sun.star.lang.XComponent
 
-LINK:Documentation/DevGuide/Text/Settings#General_Document_Information
-DESCR:Text - Settings - General Document Information
+LINK:Documentation/DevGuide/Text_Documents#General_Document_Information
+DESCR:Text Documents - Settings - General Document Information
 REF:
 com.sun.star.document.DocumentProperties
 com.sun.star.document.XDocumentPropertiesSupplier
 TOPIC:
 com.sun.star.document.XDocumentPropertiesSupplier
 
-LINK:Documentation/DevGuide/Text/Sorting_Text
-DESCR:Text - Sorting Text
+LINK:Documentation/DevGuide/Text_Documents#Sorting_Text
+DESCR:Text Documents - Sorting Text
 REF:
 com.sun.star.text.TextSortDescriptor
 com.sun.star.beans.PropertyValue
@@ -6842,8 +6842,8 @@ com.sun.star.util.XSortable
 TOPIC:
 com.sun.star.util.XSortable
 
-LINK:Documentation/DevGuide/ProUNO/Java/Mapping_of_Struct_Types
-DESCR:ProUNO - Java - Mapping of Struct Types
+LINK:Documentation/DevGuide/Professional_UNO#Mapping_of_Struct_Types
+DESCR:Professional UNO - Java - Mapping of Struct Types
 REF:
 com.sun.star.beans.Optional
 com.sun.star.beans.Ambiguous
@@ -6851,23 +6851,23 @@ com.sun.star.uno.XInterface
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/UCB/Instantiating_the_UCB
-DESCR:UCB - Instantiating the UCB
+LINK:Documentation/DevGuide/Universal_Content_Broker#Instantiating_the_UCB
+DESCR:Universal Content Broker - Instantiating the UCB
 REF:
 com.sun.star.ucb.UniversalContentBroker
 TOPIC:
 com.sun.star.ucb.UniversalContentBroker
 
-LINK:Documentation/DevGuide/AppendixC/The_Package_Content_Provider#Creation_of_New_PCP_Contents
-DESCR:AppendixC - The Package Content Provider - Creation of New PCP Contents
+LINK:Documentation/DevGuide/Universal_Content_Providers#Creation_of_New_PCP_Contents
+DESCR:Appendix C. Universal Content Providers - The Package Content Provider - Creation of New PCP Contents
 REF:
 com.sun.star.ucb.XContentCreator
 com.sun.star.io.XInputStream
 TOPIC:
 com.sun.star.ucb.XContentCreator
 
-LINK:Documentation/DevGuide/Text/Overall_Document_Features#Styles
-DESCR:Text - Overall Document Features - Styles
+LINK:Documentation/DevGuide/Text_Documents#Styles
+DESCR:Text Documents - Overall Document Features - Styles
 REF:
 com.sun.star.style.Style
 com.sun.star.container.XNamed
@@ -6886,21 +6886,21 @@ com.sun.star.style.StyleFamilies
 com.sun.star.style.XStyle
 com.sun.star.style.StyleFamily
 
-LINK:Documentation/DevGuide/Basic/Combo_Box
-DESCR:Basic - Combo Box
+LINK:Documentation/DevGuide/LibreOffice_Basic#Combo_Box
+DESCR:LibreOffice Basic - Combo Box
 REF:
 com.sun.star.awt.UnoControlComboBox
 com.sun.star.awt.XComboBox
 TOPIC:
 
-LINK:Documentation/DevGuide/Extensions/Creating_the_GUI_of_the_Options_Page
+LINK:Documentation/DevGuide/Extensions#Creating_the_GUI_of_the_Options_Page
 DESCR:Extensions - Creating the GUI of the Options Page
 REF:
 com.sun.star.awt.ContainerWindowProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Function_Handling#Information_about_Functions
-DESCR:Spreadsheets - Function Handling - Information about Functions
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Information_about_Functions
+DESCR:Spreadsheet Documents - Function Handling - Information about Functions
 REF:
 com.sun.star.sheet.FunctionArgument
 com.sun.star.sheet.FunctionDescriptions
@@ -6915,21 +6915,21 @@ TOPIC:
 com.sun.star.sheet.FunctionDescriptions
 com.sun.star.sheet.FunctionDescription
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Models#XStorable
-DESCR:OfficeDev - Component - Models - XStorable
+LINK:Documentation/DevGuide/Office_Development#XStorable
+DESCR:Office Development - Component - Models - XStorable
 REF:
 com.sun.star.frame.XStorable
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Editing_Text
-DESCR:Text - Editing Text
+LINK:Documentation/DevGuide/Text_Documents#Editing_Text
+DESCR:Text Documents - Editing Text
 REF:
 com.sun.star.text.XText
 TOPIC:
 com.sun.star.text.XText
 
-LINK:Documentation/DevGuide/Database/The_SingleSelectQueryComposer
-DESCR:Database - The SingleSelectQueryComposer
+LINK:Documentation/DevGuide/Database_Access#The_SingleSelectQueryComposer
+DESCR:Database Access - The SingleSelectQueryComposer
 REF:
 com.sun.star.sdb.SingleSelectQueryAnalyzer
 com.sun.star.sdb.SingleSelectQueryComposer
@@ -6944,35 +6944,35 @@ com.sun.star.sdb.SQLQueryComposer
 TOPIC:
 com.sun.star.sdb.SingleSelectQueryComposer
 
-LINK:Documentation/DevGuide/OfficeDev/Closing_Documents#How_to_Trigger_Closing
-DESCR:OfficeDev - Closing Documents - How to Trigger Closing
+LINK:Documentation/DevGuide/Office_Development#How_to_Trigger_Closing
+DESCR:Office Development - Closing Documents - How to Trigger Closing
 REF:
 com.sun.star.util.XModifiable
 com.sun.star.util.XCloseable
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Chart_Document_Controller
+LINK:Documentation/DevGuide/Charts#Chart_Document_Controller
 DESCR:Charts - Chart Document Controller
 REF:
 com.sun.star.frame.XModel
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Implementing_a_New_Locale#XNativeNumberSupplier
-DESCR:OfficeDev - Implementing a New Locale - XNativeNumberSupplier
+LINK:Documentation/DevGuide/Office_Development#XNativeNumberSupplier
+DESCR:Office Development - Implementing a New Locale - XNativeNumberSupplier
 REF:
 com.sun.star.i18n.NativeNumberMode
 com.sun.star.i18n.XNativeNumberSupplier
 TOPIC:
 com.sun.star.i18n.XNativeNumberSupplier
 
-LINK:Documentation/DevGuide/OfficeDev/Creating_Frames_Manually#Setting_Components_into_Frame_Hierarchies
-DESCR:OfficeDev - Creating Frames Manually - Setting Components into Frame Hierarchies
+LINK:Documentation/DevGuide/Office_Development#Setting_Components_into_Frame_Hierarchies
+DESCR:Office Development - Creating Frames Manually - Setting Components into Frame Hierarchies
 REF:
 TOPIC:
 com.sun.star.frame.XFramesSupplier
 
-LINK:Documentation/DevGuide/Spreadsheets/Sorting#Table_Sort_Descriptor
-DESCR:Spreadsheets - Sorting - Table Sort Descriptor
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Table_Sort_Descriptor
+DESCR:Spreadsheet Documents - Sorting - Table Sort Descriptor
 REF:
 com.sun.star.sheet.GlobalSheetSettings
 com.sun.star.sheet.SheetSortDescriptor2
@@ -6984,21 +6984,21 @@ com.sun.star.i18n.Collator
 TOPIC:
 com.sun.star.sheet.SheetSortDescriptor2
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Frames#XDispatchProvider_and_XDispatchProviderInterception
-DESCR:OfficeDev - Component - Frames - XDispatchProvider and XDispatchProviderInterception
+LINK:Documentation/DevGuide/Office_Development#XDispatchProvider_and_XDispatchProviderInterception
+DESCR:Office Development - Component - Frames - XDispatchProvider and XDispatchProviderInterception
 REF:
 com.sun.star.frame.XDispatchProviderInterception
 com.sun.star.frame.XDispatchProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Case_Sensitivity
-DESCR:ProUNO - Basic - Case Sensitivity
+LINK:Documentation/DevGuide/Professional_UNO#Case_Sensitivity
+DESCR:Professional UNO - Basic - Case Sensitivity
 REF:
 com.sun.star.container.XNameAccess
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Drawing_Shapes
-DESCR:Text - Drawing Shapes
+LINK:Documentation/DevGuide/Text_Documents#Drawing_Shapes
+DESCR:Text Documents - Drawing Shapes
 REF:
 com.sun.star.drawing.HomogenMatrix
 com.sun.star.text.XTextRange
@@ -7010,23 +7010,23 @@ com.sun.star.style.XStyle
 com.sun.star.drawing.Shape
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Overview_and_Using_the_API#XTransliteration
-DESCR:OfficeDev - Overview and Using the API - XTransliteration
+LINK:Documentation/DevGuide/Office_Development#XTransliteration
+DESCR:Office Development - Overview and Using the API - XTransliteration
 REF:
 com.sun.star.i18n.XLocaleData
 com.sun.star.i18n.XTransliteration
 TOPIC:
 com.sun.star.i18n.XTransliteration
 
-LINK:Documentation/DevGuide/Drawings/Working_with_Drawing_Documents#Page_Partitioning
-DESCR:Drawings - Working with Drawing Documents - Page Partitioning
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Page_Partitioning
+DESCR:Drawings and Presentations - Working with Drawing Documents - Page Partitioning
 REF:
 com.sun.star.view.PaperOrientation
 com.sun.star.drawing.GenericDrawPage
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Basic/Listeners
-DESCR:ProUNO - Basic - Listeners
+LINK:Documentation/DevGuide/Professional_UNO#Listeners
+DESCR:Professional UNO - Basic - Listeners
 REF:
 com.sun.star.container.ContainerEvent
 com.sun.star.lang.XEventListener
@@ -7035,27 +7035,27 @@ com.sun.star.container.XContainerListener
 TOPIC:
 com.sun.star.lang.XEventListener
 
-LINK:Documentation/DevGuide/Spreadsheets/Filter_Options
-DESCR:Spreadsheets - Filter Options
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Filter_Options
+DESCR:Spreadsheet Documents - Filter Options
 REF:
 com.sun.star.beans.PropertyValue
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Framework_API
-DESCR:OfficeDev - Framework API
+LINK:Documentation/DevGuide/Office_Development#Framework_API
+DESCR:Office Development - Framework API
 REF:
 com.sun.star.awt
 TOPIC:
 
-LINK:Documentation/DevGuide/Basic/HorizontalVertical_Scroll_Bar
-DESCR:Basic - HorizontalVertical Scroll Bar
+LINK:Documentation/DevGuide/LibreOffice_Basic#HorizontalVertical_Scroll_Bar
+DESCR:LibreOffice Basic - HorizontalVertical Scroll Bar
 REF:
 com.sun.star.awt.UnoControlScrollBar
 com.sun.star.awt.AdjustmentEvent
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Controllers
-DESCR:OfficeDev - Controllers
+LINK:Documentation/DevGuide/Office_Development#Controllers
+DESCR:Office Development - Controllers
 REF:
 com.sun.star.frame.XController
 com.sun.star.sheet.XSpreadsheetView
@@ -7064,14 +7064,14 @@ TOPIC:
 com.sun.star.frame.Controller
 com.sun.star.frame.XController
 
-LINK:Documentation/DevGuide/AppendixC/The_Help_Content_Provider#Module_Content
-DESCR:AppendixC - The Help Content Provider - Properties and Commands - Module Content
+LINK:Documentation/DevGuide/Universal_Content_Providers#Module_Content
+DESCR:Appendix C. Universal Content Providers - The Help Content Provider - Properties and Commands - Module Content
 REF:
 com.sun.star.ucb.XDynamicResultSet
 TOPIC:
 
-LINK:Documentation/DevGuide/AdvUNO/UNO_Reflection_API#CoreReflection_Service
-DESCR:AdvUNO - UNO Reflection API - CoreReflection Service
+LINK:Documentation/DevGuide/Advanced_UNO#CoreReflection_Service
+DESCR:Advanced UNO - UNO Reflection API - CoreReflection Service
 REF:
 com.sun.star.reflection.XIdlClass
 com.sun.star.reflection.CoreReflection
@@ -7079,14 +7079,14 @@ com.sun.star.reflection.XIdlReflection
 com.sun.star.reflection.XIdlField2
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet
-DESCR:Spreadsheets - Spreadsheet
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet
+DESCR:Spreadsheet Documents - Spreadsheet
 REF:
 com.sun.star.sheet.Spreadsheet
 TOPIC:
 
-LINK:Documentation/DevGuide/Text/Reference_Marks
-DESCR:Text - Reference Marks
+LINK:Documentation/DevGuide/Text_Documents#Reference_Marks
+DESCR:Text Documents - Reference Marks
 REF:
 com.sun.star.container.XNamed
 com.sun.star.text.textfield.GetReference
@@ -7098,27 +7098,27 @@ com.sun.star.text.XTextContent
 TOPIC:
 com.sun.star.text.ReferenceMark
 
-LINK:Documentation/DevGuide/Database/Database_Design#Retrieving_General_Information
-DESCR:Database - Database Design - Retrieving Information about a Database - Retrieving General Information
+LINK:Documentation/DevGuide/Database_Access#Retrieving_General_Information
+DESCR:Database Access - Database Design - Retrieving Information about a Database - Retrieving General Information
 REF:
 com.sun.star.sdbc.XDatabaseMetaData
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Service_Manager#XMultiServiceFactory_Interface
-DESCR:ProUNO - Service Manager - XMultiServiceFactory Interface
+LINK:Documentation/DevGuide/Professional_UNO#XMultiServiceFactory_Interface
+DESCR:Professional UNO - Service Manager - XMultiServiceFactory Interface
 REF:
 com.sun.star.lang.XInitialization
 com.sun.star.lang.XMultiServiceFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Bridge/Type_Mappings
-DESCR:ProUNO - Bridge - Type Mappings
+LINK:Documentation/DevGuide/Professional_UNO#Type_Mappings_3
+DESCR:Professional UNO - Bridge - Type Mappings
 REF:
 com.sun.star.script.XInvocation
 TOPIC:
 
-LINK:Documentation/DevGuide/Drawings/Overall_Document_Features#Graphics_Styles
-DESCR:Drawings - Overall Document Features - Styles - Graphics Styles
+LINK:Documentation/DevGuide/Drawing_Documents_and_Presentation_Documents#Graphics_Styles
+DESCR:Drawings and Presentations - Overall Document Features - Styles - Graphics Styles
 REF:
 com.sun.star.drawing.ShadowProperties
 com.sun.star.drawing.ConnectorProperties
@@ -7135,8 +7135,8 @@ com.sun.star.style.CharacterProperties
 TOPIC:
 com.sun.star.style.XStyle
 
-LINK:Documentation/DevGuide/WritingUNO/Jobs/Using_the_vnd.sun.star.jobs:_URL_Schema
-DESCR:WritingUNO - Jobs - Using the vnd.sun.star.jobs: URL Schema
+LINK:Documentation/DevGuide/Writing_UNO_Components#Using_the_vnd.sun.star.jobs:_URL_Schema
+DESCR:Writing UNO Components - Jobs - Using the vnd.sun.star.jobs: URL Schema
 REF:
 com.sun.star.task.XAsyncJob
 com.sun.star.task.XJob
@@ -7144,44 +7144,44 @@ com.sun.star.task.Job
 com.sun.star.task.AsyncJob
 TOPIC:
 
-LINK:Documentation/DevGuide/WritingUNO/XAggregation
-DESCR:WritingUNO - XAggregation
+LINK:Documentation/DevGuide/Writing_UNO_Components#XAggregation
+DESCR:Writing UNO Components - XAggregation
 REF:
 com.sun.star.uno.XAggregation
 TOPIC:
 com.sun.star.uno.XAggregation
 
-LINK:Documentation/DevGuide/OfficeDev/Component/Frames#Frame_Hierarchies
-DESCR:OfficeDev - Component - Frames - XFrame - Frame Hierarchies
+LINK:Documentation/DevGuide/Office_Development#Frame_Hierarchies
+DESCR:Office Development - Component - Frames - XFrame - Frame Hierarchies
 REF:
 com.sun.star.frame.XFrames
 com.sun.star.frame.FrameSearchFlag
 com.sun.star.frame.XFramesSupplier
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Component_Context#Compatibility_Issues_and_Migration_Path
-DESCR:ProUNO - Component Context - Compatibility Issues and Migration Path
+LINK:Documentation/DevGuide/Professional_UNO#Compatibility_Issues_and_Migration_Path
+DESCR:Professional UNO - Component Context - Compatibility Issues and Migration Path
 REF:
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.lang.XMultiComponentFactory
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Java/Handling_Interfaces
-DESCR:ProUNO - Java - Handling Interfaces
+LINK:Documentation/DevGuide/Professional_UNO#Handling_Interfaces
+DESCR:Professional UNO - Java - Handling Interfaces
 REF:
 com.sun.star.lang.XMultiServiceFactory
 com.sun.star.uno.XInterface
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Java/Transparent_Use_of_Office_UNO_Components
-DESCR:ProUNO - Java - Transparent Use of Office UNO Components
+LINK:Documentation/DevGuide/Professional_UNO#Transparent_Use_of_Office_UNO_Components
+DESCR:Professional UNO - Java - Transparent Use of Office UNO Components
 REF:
 TOPIC:
 com.sun.star.uno.XComponentContext
 com.sun.star.lang.XMultiComponentFactory
 
-LINK:Documentation/DevGuide/GUI/Command_Button
-DESCR:GUI - Command Button
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Command_Button
+DESCR:Graphical User Interfaces - Command Button
 REF:
 com.sun.star.awt.XActionListener
 com.sun.star.awt.PushButtonType
@@ -7190,14 +7190,14 @@ com.sun.star.awt.UnoControlButton
 com.sun.star.awt.UnoControlButtonModel
 TOPIC:
 
-LINK:Documentation/DevGuide/ProUNO/Singletons
-DESCR:ProUNO - Singletons
+LINK:Documentation/DevGuide/Professional_UNO#Singletons
+DESCR:Professional UNO - Singletons
 REF:
 com.sun.star.uno.XComponentContext
 com.sun.star.uno.DeploymentException
 TOPIC:
 
-LINK:Documentation/DevGuide/Charts/Common_Parts_of_all_Chart_Types#Diagram
+LINK:Documentation/DevGuide/Charts#Diagram
 DESCR:Charts - Common Parts of all Chart Types - Diagram
 REF:
 com.sun.star.chart.ChartStatistics
@@ -7209,8 +7209,8 @@ com.sun.star.chart.LineDiagram
 com.sun.star.chart.AreaDiagram
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/View_Panes
-DESCR:Spreadsheets - View Panes
+LINK:Documentation/DevGuide/Spreadsheet_Documents#View_Panes
+DESCR:Spreadsheet Documents - View Panes
 REF:
 com.sun.star.sheet.XViewPane
 com.sun.star.table.CellRangeAddress
@@ -7220,8 +7220,8 @@ com.sun.star.sheet.SpreadsheetViewPane
 TOPIC:
 com.sun.star.sheet.SpreadsheetViewPane
 
-LINK:Documentation/DevGuide/ProUNO/Creating_the_Bridge
-DESCR:ProUNO - Creating the Bridge
+LINK:Documentation/DevGuide/Professional_UNO#Creating_the_Bridge
+DESCR:Professional UNO - Creating the Bridge
 REF:
 com.sun.star.lang.XComponent
 com.sun.star.bridge.XBridgeFactory
@@ -7231,16 +7231,16 @@ com.sun.star.bridge.BridgeFactory
 com.sun.star.bridge.XInstanceProvider
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Dispatch_Results
-DESCR:OfficeDev - Dispatch Results
+LINK:Documentation/DevGuide/Office_Development#Dispatch_Results
+DESCR:Office Development - Dispatch Results
 REF:
 com.sun.star.frame.DispatchResultEvent
 com.sun.star.frame.XNotifyingDispatch
 com.sun.star.frame.XDispatchResultListener
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Search_and_Replace
-DESCR:Spreadsheets - Search and Replace
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Search_and_Replace
+DESCR:Spreadsheet Documents - Search and Replace
 REF:
 com.sun.star.util.XReplaceable
 com.sun.star.util.XReplaceDescriptor
@@ -7248,7 +7248,7 @@ com.sun.star.util.XSearchable
 TOPIC:
 com.sun.star.util.XReplaceable
 
-LINK:Documentation/DevGuide/Forms/Form_Controls_accepting_Value_Bindings
+LINK:Documentation/DevGuide/Forms#Form_Controls_accepting_Value_Bindings
 DESCR:Forms - Form Controls accepting Value Bindings
 REF:
 com.sun.star.form.DataAwareControlModel
@@ -7257,8 +7257,8 @@ com.sun.star.form.binding.BindableControlModel
 com.sun.star.form.binding.BindableDataAwareControlModel
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Spreadsheet_Documents
-DESCR:Spreadsheets - Spreadsheet Documents
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Spreadsheet_Documents
+DESCR:Spreadsheet Documents - Spreadsheet Documents
 REF:
 com.sun.star.sheet.SheetCell
 com.sun.star.table
@@ -7273,15 +7273,15 @@ com.sun.star.sheet.Cells
 TOPIC:
 com.sun.star.sheet.SpreadsheetDocument
 
-LINK:Documentation/DevGuide/GUI/Currency_Field
-DESCR:GUI - Currency Field
+LINK:Documentation/DevGuide/Graphical_User_Interfaces#Currency_Field
+DESCR:Graphical User Interfaces - Currency Field
 REF:
 com.sun.star.awt.UnoControlNumericField
 com.sun.star.awt.UnoControlCurrencyField
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Capabilities_of_SheetCell
-DESCR:Spreadsheets - Capabilities of SheetCell
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Capabilities_of_SheetCell
+DESCR:Spreadsheet Documents - Capabilities of SheetCell
 REF:
 com.sun.star.sheet.SheetCell
 com.sun.star.table.XCell
@@ -7295,23 +7295,23 @@ com.sun.star.table.CellAddress
 com.sun.star.sheet.XSheetAnnotationAnchor
 TOPIC:
 
-LINK:Documentation/DevGuide/OfficeDev/Frame-Controller-Model_Paradigm_in_OpenOffice.org
-DESCR:OfficeDev - Frame-Controller-Model Paradigm in OpenOffice.org
+LINK:Documentation/DevGuide/Office_Development#Frame-Controller-Model_Paradigm_in_LibreOffice
+DESCR:Office Development - Frame-Controller-Model Paradigm in LibreOffice
 REF:
 TOPIC:
 com.sun.star.frame.XController
 com.sun.star.frame.XFrame
 com.sun.star.frame.XModel
 
-LINK:Documentation/DevGuide/UCB/Documents#Storing_a_Document_Content
-DESCR:UCB - Documents - Storing a Document Content
+LINK:Documentation/DevGuide/Universal_Content_Broker#Storing_a_Document_Content
+DESCR:Universal Content Broker - Documents - Storing a Document Content
 REF:
 com.sun.star.io.XInputStream
 com.sun.star.ucb.InsertCommandArgument
 TOPIC:
 
-LINK:Documentation/DevGuide/Spreadsheets/Other_Table_Operations#Data_Consolidation
-DESCR:Spreadsheets - Other Table Operations - Data Consolidation
+LINK:Documentation/DevGuide/Spreadsheet_Documents#Data_Consolidation
+DESCR:Spreadsheet Documents - Other Table Operations - Data Consolidation
 REF:
 com.sun.star.sheet.GeneralFunction
 com.sun.star.sheet.ConsolidationDescriptor
@@ -7323,8 +7323,8 @@ TOPIC:
 com.sun.star.sheet.XConsolidatable
 com.sun.star.sheet.XConsolidationDescriptor
 
-LINK:Documentation/DevGuide/Scripting/Integration_with_Extension_Manager#Implementation_of_LanguageScriptProvider_with_support_for_Package_Manager
-DESCR:Scripting - Integration with Extension Manager - Overview of how ScriptingFramework integrates with the Extension Manager API - Implementation of LanguageScriptProvider with support for Package Manager
+LINK:Documentation/DevGuide/Scripting_Framework#Implementation_of_LanguageScriptProvider_with_support_for_Package_Manager
+DESCR:Scripting Framework - Integration with Extension Manager - Overview of how ScriptingFramework integrates with the Extension Manager API - Implementation of LanguageScriptProvider with support for Package Manager
 REF:
 com.sun.star.deployment.XPackage
 com.sun.star.container.XNameContainer
diff --git a/odk/docs/idl/wikilinks.py b/odk/docs/idl/wikilinks.py
index 4f775d29b550..4f44710b2daa 100644
--- a/odk/docs/idl/wikilinks.py
+++ b/odk/docs/idl/wikilinks.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
 #
 # This file is part of the LibreOffice project.
@@ -10,19 +11,24 @@
 # wikilinks.py:
 # This throwaway program can be used to convert idl_chapter_refs.txt to a
 # "fake" IDL file that can be fed to doxygen to get the DevGuide Wiki links.
+#
+# Usage:
+#
+# In core, generate a file letting us know what kinds of entities to declare:
+# cat <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR_FOR_BUILD)/program $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/unoidl-read --summary $(INSTDIR)/program/types.rdb') <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR_FOR_BUILD)/program $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/unoidl-read --summary $(INSTDIR)/program/types.rdb $(INSTDIR)/program/types/offapi.rdb') | LC_ALL=C sort | LC_ALL=C uniq > /tmp/kinds
+#
+# Run the script while feeding it the chapter references and output the fake IDL:
+# python wikilinks.py < idl_chapter_refs.txt > generated_idl_chapter_refs.idl
 
 import sys
 
-devguidewww = "http://wiki.openoffice.org/wiki/"
+devguidewww = "https://wiki.documentfoundation.org/"
 in_topic = False
 link = None
 description = None
 allthings = {}
 allkinds = {}
 
-# unfortunately we need to know what kind of entity to declare...
-# generate this file like so:
-# cat <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR_FOR_BUILD)/program $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/unoidl-read --summary $(INSTDIR)/program/types.rdb') <(make -s cmd cmd='LD_LIBRARY_PATH=$(INSTDIR_FOR_BUILD)/program $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/unoidl-read --summary $(INSTDIR)/program/types.rdb $(INSTDIR)/program/types/offapi.rdb') | LC_ALL=C sort | LC_ALL=C uniq > /tmp/kinds
 for line in open("/tmp/kinds") :
     (kind,_,name) = line.strip().partition(" ")
     allkinds[name] = kind
@@ -43,7 +49,8 @@ for line in sys.stdin :
         else:
             allthings[sline] = [(link, description)]
 
-print("/* this file was generated from idl_chapter_refs.txt by wikilinks.py */")
+print("""/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* this file was generated from idl_chapter_refs.txt by wikilinks.py */""")
 
 for key in allthings:
     kind = allkinds[key]