summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-09 13:31:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-09 13:37:00 +0100
commit4bfde371a893a3d6902c995d62a167e5c81ab0a2 (patch)
treee25e61ec31ec9f663ae5b508e15e0ac015105708 /desktop
parentdebc96051f15652bc8d1b8aa5406f7760c5feed7 (diff)
OOo reference version for extension dependencies is still at 3.4.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx2
-rw-r--r--desktop/test/deployment/dependencies/maxversion33.oxtbin0 -> 1740 bytes
-rw-r--r--desktop/test/deployment/dependencies/maxversion34.oxtbin0 -> 1741 bytes
-rw-r--r--desktop/test/deployment/dependencies/maxversion35.oxtbin0 -> 1741 bytes
-rw-r--r--desktop/test/deployment/dependencies/maxversion36.oxtbin0 -> 1739 bytes
-rw-r--r--desktop/test/deployment/dependencies/version34.oxtbin0 -> 1721 bytes
-rw-r--r--desktop/test/deployment/dependencies/version35.oxtbin0 -> 1721 bytes
7 files changed, 1 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
new file mode 100644
index 000000000000..fe0998c81f4c
--- /dev/null
+++ b/desktop/test/deployment/dependencies/maxversion33.oxt
Binary files differ
diff --git a/desktop/test/deployment/dependencies/maxversion34.oxt b/desktop/test/deployment/dependencies/maxversion34.oxt
new file mode 100644
index 000000000000..0a284b388d5b
--- /dev/null
+++ b/desktop/test/deployment/dependencies/maxversion34.oxt
Binary files differ
diff --git a/desktop/test/deployment/dependencies/maxversion35.oxt b/desktop/test/deployment/dependencies/maxversion35.oxt
new file mode 100644
index 000000000000..e95b97cd68cc
--- /dev/null
+++ b/desktop/test/deployment/dependencies/maxversion35.oxt
Binary files differ
diff --git a/desktop/test/deployment/dependencies/maxversion36.oxt b/desktop/test/deployment/dependencies/maxversion36.oxt
new file mode 100644
index 000000000000..786ed4ce1732
--- /dev/null
+++ b/desktop/test/deployment/dependencies/maxversion36.oxt
Binary files differ
diff --git a/desktop/test/deployment/dependencies/version34.oxt b/desktop/test/deployment/dependencies/version34.oxt
new file mode 100644
index 000000000000..ee2a82d93671
--- /dev/null
+++ b/desktop/test/deployment/dependencies/version34.oxt
Binary files differ
diff --git a/desktop/test/deployment/dependencies/version35.oxt b/desktop/test/deployment/dependencies/version35.oxt
new file mode 100644
index 000000000000..6e99cf1b26c7
--- /dev/null
+++ b/desktop/test/deployment/dependencies/version35.oxt
Binary files differ