diff options
| -rwxr-xr-x | configure.in | 5 | ||||
| -rwxr-xr-x | download | 2 | ||||
| -rw-r--r-- | ooo.lst.in | 1 | ||||
| -rw-r--r-- | scp2/source/extensions/directory_extensions.scp | 5 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 1 | ||||
| -rwxr-xr-x | set_soenv.in | 1 |
6 files changed, 11 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 0f2c594d7a5b..720dd22f4ff1 100755 --- a/configure.in +++ b/configure.in @@ -7603,7 +7603,7 @@ if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; t AC_MSG_RESULT([no integration]) else SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF" - lightproof_supported_langs="en-US hu" + lightproof_supported_langs="en-US hu ru" if test "z$enable_ext_lightproof" = "zyes" ; then wanted_lightproof="$lightproof_supported_langs" else @@ -7617,6 +7617,7 @@ else fi LIGHTPROOF_LANG= LIGHTPROOF_HU_PACK= + LIGHTPROOF_RU_PACK= LIGHTPROOF_EN_US_PACK= # check whether the langs are requested at all for lang in $wanted_lightproof ; do @@ -7624,6 +7625,7 @@ else LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang" case $lang in "hu") LIGHTPROOF_HU_PACK="76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt";; + "ru") LIGHTPROOF_RU_PACK="673860e8649cff2ebdc68bd46f2f7f1a-lightproof-ru_0.1.oxt";; "en-US") LIGHTPROOF_EN_US_PACK="0ab55ac8e88f04258f1d3e79e984382f-lightproof-en-US_0.1.oxt";; esac fi @@ -7632,6 +7634,7 @@ else fi AC_SUBST(LIGHTPROOF_LANG) AC_SUBST(LIGHTPROOF_HU_PACK) +AC_SUBST(LIGHTPROOF_RU_PACK) AC_SUBST(LIGHTPROOF_EN_US_PACK) dnl =================================================================== @@ -277,7 +277,7 @@ for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLAT done # Extensions copy -for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do +for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_RU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do check_file $TARFILE_LOCATION/$pack packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _` echo "Copy extension: '$pack' as '$packfilename.oxt' ..." diff --git a/ooo.lst.in b/ooo.lst.in index 9a5c4085a16c..1f631c0d7769 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -111,6 +111,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOBLOGGER_EXTENSION_PACK@ @LIGHTPROOF_EN_US_PACK@ @LIGHTPROOF_HU_PACK@ +@LIGHTPROOF_RU_PACK@ @SUNTEMPLATES_DE_PACK@ @SUNTEMPLATES_EN_US_PACK@ @SUNTEMPLATES_ES_PACK@ diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index a36885d3d47c..755bcc65b052 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -100,8 +100,9 @@ End Directory gid_Brand_Dir_Share_Extensions_LightProof ParentID = gid_Brand_Dir_Share_Extensions; - DosName (en-US) = "lightproof-en-US-0.1"; - DosName (hu) = "lightproof-hu-1.2"; + DosName (en-US) = "lightproof-en-US"; + DosName (hu) = "lightproof-hu"; + DosName (ru) = "lightproof-ru"; DosName = "lightproof"; End diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index a2b48ecbac26..d8989d786e23 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -114,6 +114,7 @@ File gid_File_Oxt_LightProof Dir = gid_Brand_Dir_Share_Extensions_LightProof; Name (en-US) = "lightproof-en-US.oxt"; Name (hu) = "lightproof-hu.oxt"; + Name (ru) = "lightproof-ru.oxt"; End #endif diff --git a/set_soenv.in b/set_soenv.in index 729241c79915..e7906b77d0bc 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1901,6 +1901,7 @@ ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" ); ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" ); ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" ); ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" ); +ToFile( "LIGHTPROOF_RU_PACK", "@LIGHTPROOF_RU_PACK@","e" ); ToFile( "LIGHTPROOF_LANG", "@LIGHTPROOF_LANG@", "e" ); ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" ); ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" ); |