dba34b: merge after pulling DEV300.m94

1 files changed, 60 insertions, 8 deletions

diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index f915b2989f09..27999d2c4cbb 100755
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -47,7 +47,7 @@ cli_uno.dll      0x0000000065c20000 0x00030000
 collator_data.dll 0x0000000065aa0000 0x00170000
 communimi.dll    0x0000000065a80000 0x00010000
 comphelp4msc.dll 0x0000000065980000 0x000f0000
-configmgr2.uno.dll 0x0000000065800000 0x00170000
+configmgr.uno.dll 0x000000005adb0000 0x00070000
 connector.uno.dll 0x00000000657e0000 0x00010000
 cppcanvasmi.dll  0x0000000065780000 0x00050000
 cppu3.dll        0x0000000065740000 0x00030000
@@ -125,11 +125,11 @@ i18nsearch.uno.dll 0x0000000063570000 0x00010000
 i18nutilmsc.dll  0x0000000063540000 0x00020000
 icdmi.dll        0x0000000063520000 0x00010000
 icgmi.dll        0x00000000634f0000 0x00020000
-icudt36l.dll     0x0000000062b00000 0x009c0000
-icuin36.dll      0x0000000062a20000 0x000d0000
-icule36.dll      0x00000000629d0000 0x00040000
-icutu36.dll      0x00000000629a0000 0x00020000
-icuuc36.dll      0x00000000628b0000 0x000e0000
+icudt40.dll      0x0000000059bb0000 0x00d50000
+icuin40.dll      0x0000000059a90000 0x00110000
+icule40.dll      0x0000000059a40000 0x00040000
+icutu40.dll      0x0000000059a10000 0x00020000
+icuuc40.dll      0x0000000059910000 0x000f0000
 idxmi.dll        0x0000000062880000 0x00020000
 imemi.dll        0x0000000062860000 0x00010000
 index_data.dll   0x00000000627c0000 0x00090000
@@ -179,8 +179,8 @@ localedata_others.dll 0x0000000061aa0000 0x000b0000
 logmi.dll        0x0000000061a70000 0x00020000
 lpsolve55.dll    0x0000000061970000 0x00070000
 mcnttype.dll     0x0000000061950000 0x00010000
-mozab2.dll       0x0000000061900000 0x00020000
-mozabdrv2.dll    0x0000000061880000 0x00070000
+mozabmi.dll      0x00000000597a0000 0x00020000
+mozabdrvmi.dll   0x00000000597d0000 0x00070000
 msci_uno.dll     0x0000000061860000 0x00010000
 mysql2.dll       0x0000000061820000 0x00030000
 namingservice.uno.dll 0x0000000061800000 0x00010000
@@ -347,3 +347,55 @@ npsoplugin.dll   0x000000005b0b0000 0x00010000
 migrationoo2.uno.dll 0x000000005b080000 0x00020000
 inprocserv.dll   0x000000005b060000 0x00010000
 lngmi.dll        0x000000005af50000 0x00100000
+adomi.dll        0x000000005aea0000 0x00080000
+cppunit_dll.dll  0x000000005ad60000 0x00040000
+drawinglayermi.dll 0x000000005ac00000 0x00100000
+editengmi.dll    0x000000005aa80000 0x00170000
+formi.dll        0x000000005aa30000 0x00020000
+foruimi.dll      0x000000005a9f0000 0x00030000
+freebl3.dll      0x000000005a9a0000 0x00040000
+hsqldb.dll       0x000000005a950000 0x00040000
+i18npapermi.dll  0x000000005a930000 0x00010000
+jdbcmi.dll       0x00000000598b0000 0x00050000
+jpipx.dll        0x0000000059890000 0x00010000
+log_uno_uno.dll  0x0000000059870000 0x00010000
+migrationoo3.uno.dll 0x0000000059850000 0x00010000
+msfiltermi.dll   0x00000000596e0000 0x000b0000
+msformsmi.uno.dll 0x0000000059680000 0x00050000
+mswordmi.dll     0x0000000059560000 0x00110000
+mysqlcppconn.dll 0x00000000594c0000 0x00090000
+mysqlmi.dll      0x0000000059480000 0x00030000
+neon.dll         0x0000000059450000 0x00020000
+nspr4.dll        0x0000000059410000 0x00030000
+nss3.dll         0x0000000059330000 0x000d0000
+nssckbi.dll      0x00000000592c0000 0x00060000
+nssdbm3.dll      0x0000000059290000 0x00020000
+nssutil3.dll     0x0000000059260000 0x00020000
+odbcbasemi.dll   0x00000000591f0000 0x00060000
+odbcmi.dll       0x00000000591d0000 0x00010000
+ooofilt_x64.dll  0x0000000059130000 0x00090000
+oooimprovementmi.dll 0x0000000059100000 0x00020000
+plc4.dll         0x00000000590e0000 0x00010000
+plds4.dll        0x00000000590c0000 0x00010000
+propertyhdl.dll  0x0000000059070000 0x00040000
+propertyhdl_x64.dll 0x0000000058fe0000 0x00080000
+python26.dll     0x0000000058da0000 0x00230000
+rebase.dll       0x0000000058d50000 0x00040000
+reg64msi.dll     0x0000000058cc0000 0x00030000
+scfiltmi.dll     0x0000000058aa0000 0x001c0000
+sdfiltmi.dll     0x0000000058a20000 0x00070000
+shlxthdl_x64.dll 0x0000000058940000 0x000d0000
+smime3.dll       0x0000000058910000 0x00020000
+so_activex_x64.dll 0x00000000588c0000 0x00040000
+softokn3.dll     0x0000000058880000 0x00030000
+sqlite3.dll      0x00000000587c0000 0x00070000
+ssl3.dll         0x0000000058780000 0x00030000
+svxcoremi.dll    0x0000000058230000 0x00540000
+test.dll         0x0000000058120000 0x00010000
+test_converter.dll 0x0000000058100000 0x00010000
+ucpext.uno.dll   0x00000000580d0000 0x00020000
+ucpmyucp1.uno.dll 0x00000000580a0000 0x00020000
+vbaeventsmi.uno.dll 0x0000000058070000 0x00020000
+vbahelpermi.dll  0x0000000057fc0000 0x000a0000
+vbaswobjmi.uno.dll 0x0000000057ef0000 0x000c0000
+wpftmi.dll       0x0000000057e50000 0x00060000