diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-14 16:20:27 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-14 16:23:55 +0100 |
| commit | 5142e628b563a9876e8884c5dd4914eff4a2f307 (patch) | |
| tree | 36041fe6ccd1da7a8301d0a9fc19041ed3d6d52c /postprocess | |
| parent | 813a57cb1afa16bb306ced96d367fa1f55906620 (diff) | |
fdo#47246: fpicker: merge fop library into fps:
Since nobody seems to know why these are separate, merge fop into fps.
In case this untested change doesn't work out it should be reverted :)
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 3 | ||||
| -rw-r--r-- | postprocess/rebase/coffbase.txt | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1954666e39cb..47a7d7c8b9ad 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -334,8 +334,7 @@ my_components += \ component/dtrans/util/dnd \ component/dtrans/util/ftransl \ component/dtrans/util/sysdtrans \ - component/fpicker/util/fop \ - component/fpicker/util/fps \ + component/fpicker/source/win32/fps \ component/vcl/vcl.windows .IF "$(SOLAR_JAVA)" == "TRUE" my_components += \ diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index 76e2ef304208..2aa982359ade 100644 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -97,7 +97,6 @@ filterconfig1.dll 0x00000000640f0000 0x00040000 filtertracermi.dll 0x00000000640d0000 0x00010000 flashmi.dll 0x0000000064090000 0x00030000 flatmi.dll 0x0000000064040000 0x00040000 -fop.dll 0x0000000064020000 0x00010000 fpicker.uno.dll 0x0000000064000000 0x00010000 fps.dll 0x0000000063fc0000 0x00030000 fps_office.uno.dll 0x0000000063f70000 0x00040000 |