Kaydet (Commit) e51864be authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Andras Timar

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/17350Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 81349f48
...@@ -47,7 +47,7 @@ namespace ...@@ -47,7 +47,7 @@ namespace
::osl::Security aSecurity; ::osl::Security aSecurity;
OUString aConfigPath; OUString aConfigPath;
#if defined(XP_WIN) || defined(MACOSX) #if defined(WNT) || defined(MACOSX)
aSecurity.getConfigDir( aConfigPath ); aSecurity.getConfigDir( aConfigPath );
#else #else
//This is to find the dir under which .mozilla/.thunderbird is created. //This is to find the dir under which .mozilla/.thunderbird is created.
...@@ -69,7 +69,7 @@ namespace ...@@ -69,7 +69,7 @@ namespace
// DO NOT CHANGE THE ORDER; ADD ONLY TO THE END // DO NOT CHANGE THE ORDER; ADD ONLY TO THE END
static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
{ {
#if defined(XP_WIN) #if defined(WNT)
{ "Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Mozilla/SeaMonkey/", NULL, NULL, NULL },
{ "Mozilla/Firefox/", NULL, NULL, NULL }, { "Mozilla/Firefox/", NULL, NULL, NULL },
{ "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL }
......
...@@ -292,17 +292,10 @@ $(eval $(call gb_Rdb_add_components,services,\ ...@@ -292,17 +292,10 @@ $(eval $(call gb_Rdb_add_components,services,\
) \ ) \
)) ))
ifeq ($(OS),WNT)
ifneq ($(WITH_MOZAB4WIN),) ifneq ($(WITH_MOZAB4WIN),)
$(eval $(call gb_Rdb_add_components,services,\ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/mozab/mozab \ connectivity/source/drivers/mozab/mozab \
)) ))
else
$(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
))
endif
else else
...@@ -313,7 +306,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ...@@ -313,7 +306,7 @@ $(eval $(call gb_Rdb_add_components,services,\
)) ))
endif # DESKTOP endif # DESKTOP
endif # WNT endif # WITH_MOZAB4WIN
endif # DBCONNECTIVITY endif # DBCONNECTIVITY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment