[Libreoffice-commits] .: 7 commits - jvmaccess/util sal/osl
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Nov 25 12:13:13 PST 2010
jvmaccess/util/cc5_solaris_sparc.map | 4 ++--
jvmaccess/util/gcc3.map | 4 ++--
jvmaccess/util/msvc_win32_intel.map | 4 ++--
sal/osl/w32/file_dirvol.cxx | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 0932259065e27ab91af9345a8b4f947292d98299
Merge: 9de227b... a828e9f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 21:00:57 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/ure
commit 9de227b160f58bdafba04b3bbd9ea6f726803651
Merge: 4a1aee9... dde669b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 14:27:05 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
commit dde669b58ee617860158bfb020f37ea6c504dbdf
Merge: 3bfb8f8... 79d99be...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 14:04:09 2010 +0100
Merge commit 'ooo/OOO330_m16' into libreoffice-3-3
commit 3bfb8f8d4bbedbdd5ee2355d54b17a564663dcf0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Nov 23 21:16:39 2010 +0200
Expression in OSL_PRECOND was inverted
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 282ce24..85d067f 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -691,7 +691,7 @@ static int path_make_parent(sal_Unicode* path)
If there are no more parents 0 will be returned,
e.g. 'c:\' or '\\Share' have no more parents */
- OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
+ OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) == -1, "Path must not contain slashes");
OSL_PRECOND(has_path_parent(path), "Path must have a parent");
sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
commit f6dd33db015d23f30c4934ad05d5b2838b42ac48
Author: sb <sb at openoffice.org>
Date: Wed Nov 17 15:17:56 2010 +0100
sb136: #i114155# partially revert fix for i108776 to avoid ABI incompatibility of jvmaccess library
diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index 3072290..09d7ba7 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -25,7 +25,7 @@
#
#*************************************************************************
-UDK_3_0_0 {
+UDK_3.1 {
global:
# jvmaccess/virtualmachine.hxx:
__1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -52,7 +52,7 @@ UDK_3.2 {
__1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException *
__1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const *
__1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1
-} UDK_3_0_0;
+} UDK_3.1;
UDK_3.3 {
global:
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 2a888d9..6702986 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -25,7 +25,7 @@
#
#*************************************************************************
-UDK_3_0_0 {
+UDK_3.1 {
global:
# jvmaccess/virtualmachine.hxx:
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -59,7 +59,7 @@ UDK_3.2 {
# We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
_*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
_*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3_0_0;
+} UDK_3.1;
UDK_3.3 {
global:
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index 4620b1c..fd148b1 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,4 +1,4 @@
-UDK_3_0_0 {
+UDK_3.1 {
global:
# jvmaccess/virtualmachine.hxx:
??0CreationException at AttachGuard@VirtualMachine at jvmaccess@@QAE at XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -15,7 +15,7 @@ UDK_3_0_0 {
UDK_3.2 {
global:
-} UDK_3_0_0;
+} UDK_3.1;
UDK_3.3 {
global:
commit 79d99be4b5a05e8ce1f74acdfd730201bc517720
Merge: 77f4315... 59e3a44...
Author: obo <obo at openoffice.org>
Date: Thu Nov 18 18:39:08 2010 +0100
CWS-TOOLING: integrate CWS sb136
commit 59e3a44c4c7d06f04c1516c50a0231697840dcc5
Author: sb <sb at openoffice.org>
Date: Wed Nov 17 15:17:56 2010 +0100
sb136: #i114155# partially revert fix for i108776 to avoid ABI incompatibility of jvmaccess library
diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index 3072290..09d7ba7 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -25,7 +25,7 @@
#
#*************************************************************************
-UDK_3_0_0 {
+UDK_3.1 {
global:
# jvmaccess/virtualmachine.hxx:
__1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -52,7 +52,7 @@ UDK_3.2 {
__1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException *
__1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const *
__1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1
-} UDK_3_0_0;
+} UDK_3.1;
UDK_3.3 {
global:
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 2a888d9..6702986 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -25,7 +25,7 @@
#
#*************************************************************************
-UDK_3_0_0 {
+UDK_3.1 {
global:
# jvmaccess/virtualmachine.hxx:
_ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -59,7 +59,7 @@ UDK_3.2 {
# We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
_*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
_*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3_0_0;
+} UDK_3.1;
UDK_3.3 {
global:
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index 4620b1c..fd148b1 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,4 +1,4 @@
-UDK_3_0_0 {
+UDK_3.1 {
global:
# jvmaccess/virtualmachine.hxx:
??0CreationException at AttachGuard@VirtualMachine at jvmaccess@@QAE at XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -15,7 +15,7 @@ UDK_3_0_0 {
UDK_3.2 {
global:
-} UDK_3_0_0;
+} UDK_3.1;
UDK_3.3 {
global:
More information about the Libreoffice-commits
mailing list