diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-26 09:37:20 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-07-26 17:05:56 +0000 |
| commit | c2d73ecf305213672b35ee73e58e9db0fadccbc5 (patch) | |
| tree | 1f24ff6db69b9a2d593de8315772d5ae78869194 | |
| parent | d68f45565ea0d16c67149b6eeeed3261522c9ec4 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | connectivity/source/drivers/mork/MNSFolders.cxx | 4 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index 0abfad7f8918..1ea558ca12e4 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 46e0f31dded0..88b28ddc7518 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 |