diff options
| author | sb <sb@openoffice.org> | 2010-02-05 09:17:48 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-05 09:17:48 +0100 |
| commit | d440fd022bd1a15d160003317cee4efd3b5276f3 (patch) | |
| tree | aa5d64be0dc3a8848e7d3dcf672d40ac49d3aabd /scp2 | |
| parent | 9505cfaca3f4ce2e91ba814a3c7f524cd2d717d1 (diff) | |
| parent | e13a74bf91e438a28b4f01979d22997c27693238 (diff) | |
sb111: merged in DEV300_m71
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/prj/build.lst | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 46 |
2 files changed, 24 insertions, 24 deletions
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst index abf5f14740da..f3fbbec38273 100644 --- a/scp2/prj/build.lst +++ b/scp2/prj/build.lst @@ -1,4 +1,4 @@ -cp scp2 : l10n i18npool setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL +cp scp2 : l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL cp scp2 usr1 - all cp_mkout NULL cp scp2\macros nmake - all cp_langmacros NULL cp scp2\source\templates nmake - all cp_langtemplates NULL diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index faa679409e22..7e0b884519ad 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -346,7 +346,7 @@ File gid_Brand_File_Desktophelper_Txt Styles = (PACKED); Dir = gid_Brand_Dir_Program; Name = "desktophelper.txt"; - ComponentCondition = "CREATEDESKTOPLINK=1"; + ComponentCondition = "CREATEDESKTOPLINK=1"; End #endif @@ -377,17 +377,17 @@ End #ifdef WNT File gid_Brand_File_Bin_Rebaseoo - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - Name = "rebaseoo.exe"; + BIN_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Styles = (PACKED); + Name = "rebaseoo.exe"; End File gid_Brand_File_Bin_Rebasegui - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - Name = "rebasegui.exe"; + BIN_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Styles = (PACKED); + Name = "rebasegui.exe"; End #endif @@ -505,37 +505,37 @@ End #if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_Calc - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Name = "calc.desktop"; + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Xdg; + Name = "calc.desktop"; Styles = (PACKED,SCPZIP_REPLACE); End #endif #if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_Draw - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Name = "draw.desktop"; + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Xdg; + Name = "draw.desktop"; Styles = (PACKED,SCPZIP_REPLACE); End #endif #if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_Impress - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Name = "impress.desktop"; + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Xdg; + Name = "impress.desktop"; Styles = (PACKED,SCPZIP_REPLACE); End #endif #if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_Math - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Name = "math.desktop"; - Styles = (PACKED,SCPZIP_REPLACE); + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Xdg; + Name = "math.desktop"; + Styles = (PACKED,SCPZIP_REPLACE); End #endif @@ -979,7 +979,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl Section = "Version"; Order = 18; Key = "ExtensionUpdateURL"; - Value = "http://updateext.services.openoffice.org/ProductUpdateService/check.Update"; + Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update"; End ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir |