From 79645404ec15d93c13637a1195b9901158bd714c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Sun, 21 Mar 2010 20:01:33 +0100 Subject: Adding PopupMenuController to allow PopupMenuControllerBase dervivates to be used in toolbars --- scp2/source/ooo/file_library_ooo.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4a39b5da4978..87ffa9e037f3 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1383,7 +1383,7 @@ STD_LIB_FILE( gid_File_Lib_Sts , sts) STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl ) STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) -STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) +STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_LIB_FILE( gid_File_Lib_Editeng, editeng) -- cgit v1.2.3 From 3b1243f66a9d4b695601c7b8ef2c141da70e9332 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 24 Mar 2010 12:05:06 +0100 Subject: slidecopy: initial version of an UCP for browsing the content of the deployed extensions --- scp2/source/ooo/file_library_ooo.scp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scp2') diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f9c247bd6157..7df27137c959 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1597,6 +1597,8 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptext, ucpext.uno) + SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) File gid_File_Lib_Lnth -- cgit v1.2.3 From 990962da23f7de21066cc65d26286aa0b3f36e5d Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 25 Mar 2010 11:40:12 +0100 Subject: slidecopy: type in GID for ucpext.uno --- scp2/source/ooo/file_library_ooo.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 7df27137c959..318f147d2c95 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1597,7 +1597,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1) SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptext, ucpext.uno) +SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) -- cgit v1.2.3 From 6651d25a9b8f7e672e17e3a0794b2d8d65aea58f Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Fri, 23 Apr 2010 15:18:53 +0200 Subject: #i111077# add narrow font family to install set --- scp2/source/ooo/file_font_ooo.scp | 8 ++++++++ scp2/source/ooo/module_hidden_ooo.scp | 4 ++++ 2 files changed, 12 insertions(+) (limited to 'scp2') diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index f26339fe8b1d..78e8aefeeae4 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -115,6 +115,14 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense // Liberation fonts +// Liberation Sans Narrow +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LibSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LibSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LibSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LibSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) +#endif + // Liberation Mono #ifndef WITHOUT_FONTS #ifndef WNT diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index bd0182f95c49..4f28e1eb7d4f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -750,6 +750,10 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, gid_File_Fnt_DejaVuSerifCondensed_Italic, gid_File_Fnt_DejaVuSerifCondensed, + gid_File_Fnt_LibSansNarrow_Regular, + gid_File_Fnt_LibSansNarrow_Bold, + gid_File_Fnt_LibSansNarrow_BoldItalic, + gid_File_Fnt_LibSansNarrow_Italic, gid_File_Fnt_LiberationMono_Bold, gid_File_Fnt_LiberationMono_BoldItalic, gid_File_Fnt_LiberationMono_Italic, -- cgit v1.2.3 From 656fd85b0c10520045923251e60a95365d5396a7 Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Fri, 23 Apr 2010 15:48:00 +0200 Subject: #i111077# simplify as scp2 nowadays allows multiple files per condition --- scp2/source/ooo/file_font_ooo.scp | 83 +-------------------------------------- 1 file changed, 2 insertions(+), 81 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 78e8aefeeae4..88c03cd4f5b3 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -27,6 +27,8 @@ #include "macros.inc" +// OpenSymbol + STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol) // DejaVu fonts @@ -34,17 +36,8 @@ STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol) // DejaVuSans Proportional #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique) #endif @@ -56,51 +49,24 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, Dej // DejaVuSans Condensed #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique) #endif // DejaVuSans Mono #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique) #endif // DejaVuSerif Proportional #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic) -#endif - -#ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic) #endif @@ -127,23 +93,8 @@ STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LibSansNarrow-BoldItalic.t #ifndef WITHOUT_FONTS #ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) #endif #endif @@ -152,23 +103,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic #ifndef WITHOUT_FONTS #ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) #endif #endif @@ -177,23 +113,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic #ifndef WITHOUT_FONTS #ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) -#endif -#endif - -#ifndef WITHOUT_FONTS -#ifndef WNT STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) #endif #endif -- cgit v1.2.3 From 72567ce2692844ab296284af26825e69ee51215d Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Tue, 11 May 2010 16:09:45 +0200 Subject: #i111077# install fc_local.conf file next to app-specific fonts --- scp2/source/ooo/file_font_ooo.scp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'scp2') diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 88c03cd4f5b3..db857af606b3 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -135,3 +135,16 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) #endif +// fontconfig updates to allow proper use of local fonts + +#ifdef UNX +#ifndef WITHOUT_FONTS +File gid_File_FcLocal_Conf + Dir = gid_Dir_Fonts_Truetype; + USER_FILE_BODY; +# Styles = (); + Name = "fc_local.conf"; +End +#endif +#endif + -- cgit v1.2.3 From 31d9a3d34911a8eb99431c1e427a9c41eabf2d35 Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Mon, 17 May 2010 13:58:17 +0200 Subject: #i111077# adjusted to upstream font filename changes --- scp2/source/ooo/file_font_ooo.scp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index db857af606b3..8ad8526d9ef6 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -83,10 +83,10 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense // Liberation Sans Narrow #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LibSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) -STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LibSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) -STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LibSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) -STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LibSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) +STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) #endif // Liberation Mono -- cgit v1.2.3 From b17de9607e59d4ff91fc9f1830b613c1c57cf8c1 Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Tue, 18 May 2010 15:59:03 +0200 Subject: #i111682# remove module fondu for good --- .../macosx/application/PostInstall.applescript | 167 +-------------------- ooo.lst | 1 - scp2/source/ooo/file_ooo.scp | 9 -- 3 files changed, 3 insertions(+), 174 deletions(-) (limited to 'scp2') diff --git a/instsetoo_native/macosx/application/PostInstall.applescript b/instsetoo_native/macosx/application/PostInstall.applescript index 3c302ab2daad..f7927f2d127b 100644 --- a/instsetoo_native/macosx/application/PostInstall.applescript +++ b/instsetoo_native/macosx/application/PostInstall.applescript @@ -27,9 +27,8 @@ -- This is the PostInstall -script for .pkg installation -- --- Currently this script does the following things: --- 1) Uses fondu to extract and convert .dfont -fonts from Mac OS X system to .ttf -fonts for OpenOffice.org - +-- This script used to run fondu, but currently it does nothing +-- Keeping it around as the remaining framework might become useful again (*==== (global variables as get-functions) ====*) @@ -45,51 +44,10 @@ on getOOProgramPath() return (getOOInstallPath() & "MacOS:") end getOOProgramPath --- OSXSystemFontPathList : {"/System/Library/Fonts/", "/Library/Fonts/"} --- OSXUserFontPathList : {"~/Library/Fonts/"} - -on getOSXSystemFontPathList() - return {(path to fonts folder from system domain) as string, Â - (path to fonts folder from local domain) as string} -end getOSXSystemFontPathList - -on getOSXUserFontPathList() - return {(path to fonts folder from user domain) as string} -end getOSXUserFontPathList - -on getOOSystemFontPath() - return (getOOInstallPath() & "share:fonts:truetype:") -end getOOSystemFontPath - on getOOUserSettingsPath() return (((path to home folder) as string) & "Library:Application Support:OpenOffice.org:%USERDIRPRODUCTVERSION:") end getOOUserSettingsPath -on getOOUserFontPath() - return (getOOUserSettingsPath() & "user:fonts:") -end getOOUserFontPath - - -on getOOCookieSystemFondu() - -- nosystemfondu : file does exist if user does not want to use fondu for system fonts - return "no_system_fondu" -end getOOCookieSystemFondu - -on getOOCookieSystemFonduDone() - -- systemfondudone : file does exist if native fonts already extracted from system fonts - return "system_fondu_done" -end getOOCookieSystemFonduDone - -on getOOCookieUserFondu() - -- nouserfondu : file does exist if user does not want to use fondu for user fonts - return "no_user_fondu" -end getOOCookieUserFondu - -on getOOCookieUserFonduDone() - -- userfondudone : file does exist if native fonts already extracted from user fonts - return "user_fondu_done" -end getOOCookieUserFonduDone - -- -- the default handler: run -- @@ -102,9 +60,7 @@ on run end if -- checks are ok, now we can start doing the real stuff - firstLaunch() - runSystemFondu() - runUserFondu() +-- doSomething() return end run @@ -112,123 +68,6 @@ end run ------------------------------------------------------------- - -on runSystemFondu() - -- check if user does not want font conversion - if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then - return - end if - - -- check if font conversion was already run - if (isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then - return - end if - - logEvent("(scripts/PostInstall) Extracting system fonts...") - -- else try to create footprint - if (setCookie(getOOSystemFontPath(), getOOCookieSystemFonduDone())) then - -- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing - fonduConvertFonts(getOOSystemFontPath(), getOSXSystemFontPathList()) - end if - logEvent("(scripts/PostInstall) Extracting system fonts completed.") -end runSystemFondu - - -on runUserFondu() - -- check if user does not want font conversion - if (isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then - return - end if - - -- check if font conversion was already run - if (isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then - return - end if - - logEvent("(scripts/PostInstall) Extracting user fonts...") - -- try to create footprint - if (setCookie(getOOUserFontPath(), getOOCookieUserFonduDone())) then - -- call fondu for each font (i.e. without wildcard), so if it crashes only one font is missing - fonduConvertFonts(getOOUserFontPath(), getOSXUserFontPathList()) - end if - logEvent("(scripts/PostInstall) Extracting user fonts completed.") -end runUserFondu - - -on firstLaunch() - -- continue only if OOSysFontdir exists - if (not isRealPath(getOOSystemFontPath())) then - logEvent("(scripts/PostInstall) ERROR: could not find System font folder from " & POSIX path of getOOSystemFontPath()) - return - end if - - if (setCookie(getOOSystemFontPath(), getOOCookieSystemFondu() & ".in_progress")) then - -- Has user already decided that he does not want to extract system fonts ? - if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFondu())) then - -- Are system fonts already extracted ? - if (not isRealPath(getOOSystemFontPath() & getOOCookieSystemFonduDone())) then - -- ask if the user wants to use fondu to extract system fonts - set yesKey to getMessage("YES_KEY") - set noKey to getMessage("NO_KEY") - display dialog getMessage("OOO_EXTRACT_NATIVE_SYSFONTS") buttons {noKey, yesKey} default button yesKey - set theResult to the button returned of the result - if theResult is noKey then - -- not use fondu for system fonts extraction ! - setCookie(getOOSystemFontPath(), getOOCookieSystemFondu()) - logEvent("(scripts/PostInstall) Setting: no system fonts") - end if - end if - end if - end if - - -- continue only if OOUserFontdir exists - if (not isRealPath(getOOUserFontPath())) then - logEvent("(scripts/PostInstall) ERROR: could not find User font folder from " & POSIX path of getOOUserFontPath()) - return - end if - - -- Has user already decided that he does not want to extract user fonts ? - if (not isRealPath(getOOUserFontPath() & getOOCookieUserFondu())) then - -- Are system fonts already extracted ? - if (not isRealPath(getOOUserFontPath() & getOOCookieUserFonduDone())) then - -- ask if the user wants to use fondu to extract user fonts - set yesKey to getMessage("YES_KEY") - set noKey to getMessage("NO_KEY") - display dialog getMessage("OOO_EXTRACT_NATIVE_USERFONTS") buttons {noKey, yesKey} default button yesKey - set theResult to the button returned of the result - if theResult is noKey then - -- not use fondu for user fonts extraction ! - setCookie(getOOUserFontPath(), getOOCookieUserFondu()) - logEvent("(scripts/PostInstall) Setting: no user fonts") - end if - end if - end if - -end firstLaunch - - -on fonduConvertFonts(targetPath, sourcePathList) - - -- define the location of fondu - set fondu to quoted form of (POSIX path of getOOProgramPath() & "fondu") - - -- first go to the target directory - set fonduCmd to "cd " & (quoted form of POSIX path of targetPath) & "; " - - repeat with q from 1 to number of items in sourcePathList - set aPath to POSIX path of (item q of sourcePathList) - set fonduCmd to fonduCmd & "for i in " & aPath & "*; do " & fondu & " -force \"$i\" >> /dev/null 2>&1; done; " - end repeat - try - -- ignore errors - -- with admin privileges does not work well on panther - do shell script "sh -c " & quoted form of fonduCmd - end try - logEvent("fonduCMD: " & fonduCmd) - -end fonduConvertFonts - - (* ===== (Helper functions) ======= *) -- set a cookiefile. The content is empty. diff --git a/ooo.lst b/ooo.lst index 4d1199fd9ef4..678a4ccdd638 100644 --- a/ooo.lst +++ b/ooo.lst @@ -14,7 +14,6 @@ http://hg.services.openoffice.org/binaries 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -2dfbbf27a5822eeabaeacdf16d7c41e7-fondu_src-051010.tar.gz 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz ef9ab6c1740682fbd730606d5f6922e6-liberation-fonts-ttf-1.05.3.20100427.zip 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 19a15f7fcc11..58f4ee45245a 100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1777,15 +1777,6 @@ File gid_File_Spotlight_Bundle End #endif -#if defined MACOSX && !defined QUARTZ -File gid_File_Bin_Fondu - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Name = "fondu"; - Styles = (PACKED); -End -#endif - File gid_File_Config_Javasettingsunopkginstall USER_FILE_BODY; Dir = gid_Dir_Config; -- cgit v1.2.3