diff options
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 2 | ||||
| -rw-r--r-- | desktop/test/deployment/dependencies/maxversion33.oxt | bin | 0 -> 1740 bytes | |||
| -rw-r--r-- | desktop/test/deployment/dependencies/maxversion34.oxt | bin | 0 -> 1741 bytes | |||
| -rw-r--r-- | desktop/test/deployment/dependencies/maxversion35.oxt | bin | 0 -> 1741 bytes | |||
| -rw-r--r-- | desktop/test/deployment/dependencies/maxversion36.oxt | bin | 0 -> 1739 bytes | |||
| -rw-r--r-- | desktop/test/deployment/dependencies/version34.oxt | bin | 0 -> 1721 bytes | |||
| -rw-r--r-- | desktop/test/deployment/dependencies/version35.oxt | bin | 0 -> 1721 bytes | |||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 8 |
9 files changed, 10 insertions, 1 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index b16831703730..f2a997fe42b9 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -63,7 +63,7 @@ bool versionIsNot(dp_misc::Order order, rtl::OUString const & version) { rtl::OUString oooVersion( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") - ":Version:OOOPackageVersion}")); + ":Version:ReferenceOOoMajorMinor}")); rtl::Bootstrap::expandMacros(oooVersion); //TODO: check for failure return dp_misc::compareVersions(oooVersion, version) != order; } diff --git a/desktop/test/deployment/dependencies/maxversion33.oxt b/desktop/test/deployment/dependencies/maxversion33.oxt Binary files differnew file mode 100644 index 000000000000..fe0998c81f4c --- /dev/null +++ b/desktop/test/deployment/dependencies/maxversion33.oxt diff --git a/desktop/test/deployment/dependencies/maxversion34.oxt b/desktop/test/deployment/dependencies/maxversion34.oxt Binary files differnew file mode 100644 index 000000000000..0a284b388d5b --- /dev/null +++ b/desktop/test/deployment/dependencies/maxversion34.oxt diff --git a/desktop/test/deployment/dependencies/maxversion35.oxt b/desktop/test/deployment/dependencies/maxversion35.oxt Binary files differnew file mode 100644 index 000000000000..e95b97cd68cc --- /dev/null +++ b/desktop/test/deployment/dependencies/maxversion35.oxt diff --git a/desktop/test/deployment/dependencies/maxversion36.oxt b/desktop/test/deployment/dependencies/maxversion36.oxt Binary files differnew file mode 100644 index 000000000000..786ed4ce1732 --- /dev/null +++ b/desktop/test/deployment/dependencies/maxversion36.oxt diff --git a/desktop/test/deployment/dependencies/version34.oxt b/desktop/test/deployment/dependencies/version34.oxt Binary files differnew file mode 100644 index 000000000000..ee2a82d93671 --- /dev/null +++ b/desktop/test/deployment/dependencies/version34.oxt diff --git a/desktop/test/deployment/dependencies/version35.oxt b/desktop/test/deployment/dependencies/version35.oxt Binary files differnew file mode 100644 index 000000000000..6e99cf1b26c7 --- /dev/null +++ b/desktop/test/deployment/dependencies/version35.oxt diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 13716347302b..b8e2ef75a7c2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -8,6 +8,7 @@ Globals OOOPACKAGEVERSION 3.5.0 UREPACKAGEVERSION 3.5.0 URELAYERVERSION 1 + REFERENCEOOOMAJORMINOR 3.4 UNIXBASISROOTNAME libreoffice3.5 SERVICETAG_PRODUCTNAME LibreOffice 3.5 SERVICETAG_PRODUCTVERSION 3.5 diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 794359cc429d..71135b267bbf 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1099,6 +1099,14 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update"; End +ProfileItem gid_Brand_Profileitem_Version_ReferenceOOoMajorMinor + ProfileID = gid_Brand_Profile_Version_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Version"; + Key = "ReferenceOOoMajorMinor"; + Value = "${REFERENCEOOOMAJORMINOR}"; +End + ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir ModuleID = gid_Module_Root_Brand; ProfileID = gid_Brand_Profile_Fundamental_Ini; |