diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:35:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:35:40 +0100 |
| commit | 353e3e1019429f6693f0067d9a067d0baa220dbe (patch) | |
| tree | 579af276559c658b010511b27fd2b2a16415baad | |
| parent | e5d11d33eb0adfc0a9c2d9c4e07b92d0219004e6 (diff) | |
| parent | a4a6e2b1858958dbd088a6f52bcafbfcc6825670 (diff) | |
xmlfix3: merge to-be-m100 DEV300_next
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 14 | ||||
| -rwxr-xr-x | postprocess/rebase/coffbase.txt | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 9f5caac..57ff61c 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -54,17 +54,22 @@ my_components = \ chartmodel \ charttools \ chartview \ - comphelp4 \ + component/comphelper/util/comphelp \ component/framework/util/fwk \ component/framework/util/fwl \ component/framework/util/fwm \ + component/vbahelper/util/msforms \ component/sfx2/util/sfx \ + component/sot/util/sot \ component/svl/source/fsstor/fsstorage \ component/svl/source/passwordcontainer/passwordcontainer \ component/svl/util/svl \ component/svtools/source/hatchwindow/hatchwindowfactory \ component/svtools/source/productregistration/productregistration.uno \ component/svtools/util/svt \ + component/svx/util/svx \ + component/svx/util/svxcore \ + component/svx/util/textconversiondlgs \ component/sw/util/msword \ component/sw/util/sw \ component/sw/util/swd \ @@ -78,7 +83,6 @@ my_components = \ ctl \ date \ dba \ - dbacfg \ dbase \ dbaxml \ dbmm \ @@ -111,7 +115,7 @@ my_components = \ log \ mcnttype \ migrationoo2 \ - msforms \ + msfilter \ mysql \ odbc \ offacc \ @@ -144,17 +148,13 @@ my_components = \ sm \ smd \ solver \ - sot \ spell \ spl \ srtrs1 \ stringresource \ svgfilter \ - svx \ - svxcore \ syssh \ t602filter \ - textconversiondlgs \ tvhlp1 \ ucb1 \ ucpchelp1 \ diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index 16be853..27999d2 100755 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -55,7 +55,6 @@ cppuhelper3msc.dll 0x00000000656c0000 0x00070000 ctlmi.dll 0x0000000065680000 0x00030000 cuimi.dll 0x00000000654a0000 0x001d0000 datemi.dll 0x0000000065470000 0x00020000 -dbacfgmi.dll 0x0000000065440000 0x00020000 dbami.dll 0x00000000652e0000 0x00150000 dbasemi.dll 0x0000000065280000 0x00050000 dbaxmlmi.dll 0x0000000065230000 0x00040000 |