[Libreoffice-commits] core.git: 2 commits - configure.ac sw/source

[Michael Stahl]

 configure.ac                     |    4 +++-
 sw/source/core/fields/ddefld.cxx |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3935ff3b33404bb859335b2bdbea42e583546bcd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 27 20:52:17 2014 +0200

    configure: don't check JVM bit-ness when cross compiling
    
    Change-Id: Icf3a58257c8c8e90d7e9d38f167a9b9f80d4bf32

diff --git a/configure.ac b/configure.ac
index 4130928..c5508a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6836,7 +6836,9 @@ if test "$ENABLE_JAVA" != ""; then
         else
             AC_MSG_RESULT([no])
         fi
-    else # ? not sure if it's valid for all OS, and all JVMs?
+    elif test "$cross_compiling" != "yes"; then
+        # at least 2 reasons to check: officebean needs to link -ljawt,
+        # and libjpipe.so needs to be loaded by java to run JunitTests.
         case $CPUNAME in
             AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
                 if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
commit 747bcdc14386978f2a98a452e52c8dcc2459d319
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue May 27 20:30:19 2014 +0200

    fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()
    
    Setting 3 separators instead of 2 does not work.
    
    (regression from 263153842741d7ce21cc0bf1c5296a55a1138024)
    
    Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff

diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index f6dbf1b..d947ceb 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -366,7 +366,8 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
             {
                 rVal >>= sToken;
             }
-            sNewCmd += sToken + OUString(sfx2::cTokenSeparator);
+            sNewCmd += (i < 2)
+                ? sToken + OUString(sfx2::cTokenSeparator) : sToken;
         }
         SetCmd( sNewCmd );
     }