diff options
| -rw-r--r-- | postprocess/Rdb_services.mk | 5 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b1ff3186ea81..840aaee2e059 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -142,9 +142,12 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(filter headless,$(GUIBASE)), \ vcl/vcl.headless \ ) \ + $(if $(filter-out WNT,$(OS)), \ + embeddedobj/source/msole/emboleobj \ + ) \ $(if $(DISABLE_ATL),, \ - embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows) \ $(if $(filter WNT,$(OS)), \ + embeddedobj/source/msole/emboleobj.windows \ embedserv/util/emser \ extensions/source/ole/oleautobridge \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f6699e650ac6..8feb75d46328 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) -#ifndef DISABLE_ATL +/* fdo#60491 always need emboleobj library on non-WNT platforms */ +#if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif |