connectivity/source/drivers/mork/MNSFolders.cxx | 4 ++-- postprocess/Rdb_services.mk | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-)
New commits: commit c2d73ecf305213672b35ee73e58e9db0fadccbc5 Author: David Ostrovsky <[email protected]> Date: Sun Jul 26 09:37:20 2015 +0200 tdf#92792: Register mork driver on windows 64bit and make it work Mork service wasn't registred on windows as it was generally excluded on this platform not matter what architecture was used. Pofile discovery was broken, as XP_WIN wasn't define and the code fall back to use UNIX directories for profile discovery on windows that obviously cannot work. Change-Id: I823378a1a094a2172ba2cb3bf9bdacedb27b36a2 Reviewed-on: https://gerrit.libreoffice.org/17350 Tested-by: Jenkins <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index 0abfad7..1ea558c 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -47,7 +47,7 @@ namespace ::osl::Security aSecurity; OUString aConfigPath; - #if defined(XP_WIN) || defined(MACOSX) + #if defined(WNT) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); #else //This is to find the dir under which .mozilla/.thunderbird is created. @@ -69,7 +69,7 @@ namespace // DO NOT CHANGE THE ORDER; ADD ONLY TO THE END static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = { - #if defined(XP_WIN) + #if defined(WNT) { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Mozilla/Firefox/", NULL, NULL, NULL }, { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 46e0f31..88b28dd 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -292,17 +292,10 @@ $(eval $(call gb_Rdb_add_components,services,\ ) \ )) -ifeq ($(OS),WNT) - ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Rdb_add_components,services,\ connectivity/source/drivers/mozab/mozab \ )) -else -$(eval $(call gb_Rdb_add_components,services,\ - connectivity/source/drivers/mozab/bootstrap/mozbootstrap \ -)) -endif else @@ -313,7 +306,7 @@ $(eval $(call gb_Rdb_add_components,services,\ )) endif # DESKTOP -endif # WNT +endif # WITH_MOZAB4WIN endif # DBCONNECTIVITY _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
