5 files changed, 8 insertions, 0 deletions
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
index 7514cbcb1b7f..c3316ea5dc45 100644
--- a/offapi/com/sun/star/configuration/XUpdate.idl
+++ b/offapi/com/sun/star/configuration/XUpdate.idl
@@ -40,7 +40,13 @@ module com { module sun { module star { module configuration {
 */
 interface XUpdate {
     void insertExtensionXcsFile([in] boolean shared, [in] string fileUri);
+
     void insertExtensionXcuFile([in] boolean shared, [in] string fileUri);
+
+    void removeExtensionXcuFile([in] string fileUri);
+        // fileUri must exactly match corresponding insertExtensionXcuFile
+        // argument
+
     void insertModificationXcuFile(
         [in] string fileUri, [in] sequence< string > includedPaths,
         [in] sequence< string > excludedPaths);
diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
index 94ce75683dea..94ce75683dea 100644..100755
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
index 0f49e29255f0..0f49e29255f0 100644..100755
--- a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
diff --git a/offapi/com/sun/star/task/makefile.mk b/offapi/com/sun/star/task/makefile.mk
index 16b0be56e36c..16b0be56e36c 100644..100755
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab
index b657256d7bfe..31ec3305933b 100644
--- a/sal/textenc/convertadobe.tab
+++ b/sal/textenc/convertadobe.tab
@@ -185,6 +185,7 @@ rtl::textenc::BmpUnicodeToSingleByteRange const unicodeToAdobeSymbolEncoding[]
     { 0x23D0, 0x23D0 - 0x23D0, 0xBE }, { 0x25CA, 0x25CA - 0x25CA, 0xE0 },
     { 0x2660, 0x2660 - 0x2660, 0xAA }, { 0x2663, 0x2663 - 0x2663, 0xA7 },
     { 0x2665, 0x2665 - 0x2665, 0xA9 }, { 0x2666, 0x2666 - 0x2666, 0xA8 },
+    { 0xF000, 0xF0FF - 0xF000, 0x00 }, // symbol aliasing U+F0XX->S+00XX
     { 0xF6D9, 0xF6D9 - 0xF6D9, 0xD3 }, { 0xF6DA, 0xF6DA - 0xF6DA, 0xD2 },
     { 0xF6DB, 0xF6DB - 0xF6DB, 0xD4 }, { 0xF8E5, 0xF8E5 - 0xF8E5, 0x60 },
     { 0xF8E8, 0xF8EA - 0xF8E8, 0xE2 } };
@@ -251,6 +252,7 @@ rtl::textenc::BmpUnicodeToSingleByteRange const unicodeToAdobeDingbatsEncoding[]
     { 0x2756, 0x2756 - 0x2756, 0x76 }, { 0x2758, 0x275E - 0x2758, 0x78 },
     { 0x2761, 0x2767 - 0x2761, 0xA1 }, { 0x2776, 0x2794 - 0x2776, 0xB6 },
     { 0x2798, 0x27AF - 0x2798, 0xD8 }, { 0x27B1, 0x27BE - 0x27B1, 0xF1 },
+    { 0xF000, 0xF0FF - 0xF000, 0x00 }, // symbol aliasing U+F0XX->S+00XX
     { 0xF8D7, 0xF8E4 - 0xF8D7, 0x80 }};
 
 rtl::textenc::BmpUnicodeToSingleByteConverterData const