diff options
Diffstat (limited to 'libreoffice/3.6.0/patches/libreoffice-trinity.diff')
| -rw-r--r-- | libreoffice/3.6.0/patches/libreoffice-trinity.diff | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/libreoffice/3.6.0/patches/libreoffice-trinity.diff b/libreoffice/3.6.0/patches/libreoffice-trinity.diff index ecb62b9..4451807 100644 --- a/libreoffice/3.6.0/patches/libreoffice-trinity.diff +++ b/libreoffice/3.6.0/patches/libreoffice-trinity.diff @@ -264,3 +264,48 @@ Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX)); +--- a/fpicker/source/generic/fpicker.cxx ++++ b/fpicker/source/generic/fpicker.cxx +@@ -57,7 +57,9 @@ + { + #ifdef UNX + OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); +- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) ++ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde"))) ++ return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFilePicker")); ++ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker")); + else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4"))) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker")); +@@ -138,7 +140,9 @@ + { + OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); + #ifdef UNX +- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) ++ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde"))) ++ return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker")); ++ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde"))) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker")); + else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx"))) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker")); +--- a/scp2/InstallModule_ooo.mk ++++ b/scp2/InstallModule_ooo.mk +@@ -46,6 +46,8 @@ + ENABLE_NSPLUGIN \ + ENABLE_ONLINE_UPDATE \ + ENABLE_OPENGL \ ++ ENABLE_TDE \ ++ ENABLE_TDEAB \ + ENABLE_XMLSEC \ + MERGELIBS \ + SYSTEM_BOOST \ +--- a/scp2/InstallModule_tde.mk ++++ b/scp2/InstallModule_tde.mk +@@ -34,6 +34,7 @@ + + $(eval $(call gb_InstallModule_define_if_set,scp2/tde,\ + ENABLE_TDE \ ++ ENABLE_TDEAB \ + )) + + $(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\ |