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

2014-05-27 Thread 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 mst...@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 
21 | $GREP -i 64-bit` =  /dev/null; then
commit 747bcdc14386978f2a98a452e52c8dcc2459d319
Author: Michael Stahl mst...@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 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Miklos Vajna 
 configure.ac  |2 +-
 sw/source/core/inc/frame.hxx  |2 +-
 sw/source/core/layout/layact.cxx  |2 +-
 sw/source/core/layout/pagechg.cxx |7 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit ed1a26565898a6461503468b1fba008328019055
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jun 6 19:59:04 2013 +0200

configure: --with-system-libs should imply --with-system-harfbuzz

Change-Id: I704f0e679382f6d4b08fcdda99337d2376c21fe3

diff --git a/configure.ac b/configure.ac
index 999db29..ff19a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8388,7 +8388,7 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
 if test $_os != WINNT -a $_os != Darwin; then
 AC_MSG_RESULT([yes])
 ENABLE_HARFBUZZ=TRUE
-if test $with_system_harfbuzz = yes; then
+if test $with_system_harfbuzz = yes -o $with_system_libs = yes; 
then
if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu = 
0.9.18])
else
commit 97035c95c27b34313eadd09692804045f67f440a
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jun 6 20:12:56 2013 +0200

Revert bnc#382137 SwFrm::CheckPageDescs: notify clients about deleted 
SwPageFrm

I can't reprodue this in a product build and I'm not sure this was the
right fix for the problem.

This reverts commit bb4d5d96f4daf1dc1b92f823171ac567f6cf95a8.

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 7d91e79..f93ae67 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -588,7 +588,7 @@ public:
 inline void SetFixSize( sal_Bool bNew ) { mbFixSize = bNew; }
 
 // check all pages (starting from the given) and correct them if needed
-static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = 
sal_True, SwPageFrm** ppPrev = 0);
+static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = 
sal_True );
 
 // might return 0, with and without const
 SwFrm   *GetNext()  { return mpNext; }
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 37c77f4..71659ce 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -562,7 +562,7 @@ void SwLayAction::InternalAction()
 SwPageFrm *pTmp = pPage-GetPrev() ?
 (SwPageFrm*)pPage-GetPrev() : pPage;
 SetCheckPages( sal_True );
-SwFrm::CheckPageDescs( pPage, sal_True, pTmp );
+SwFrm::CheckPageDescs( pPage );
 SetCheckPages( sal_False );
 nCheckPageNum = USHRT_MAX;
 pPage = pTmp;
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 1bf4522..304bbcb 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1061,7 +1061,7 @@ void SwPageFrm::PrepareRegisterChg()
 |*  einfache zu bereinigen.
 |*
 |*/
-void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, 
SwPageFrm** ppPrev )
+void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields )
 {
 OSL_ENSURE( pStart, Keine Startpage. );
 
@@ -1136,15 +1136,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool 
bNotifyFields, SwPageFrm
 {
 SwPageFrm *pTmp = (SwPageFrm*)pPage-GetNext();
 pPage-Cut();
-bool bUpdatePrev = false;
-if (ppPrev  *ppPrev == pPage)
-bUpdatePrev = true;
 delete pPage;
 if ( pStart == pPage )
 pStart = pTmp;
 pPage = pTmp;
-if (bUpdatePrev)
-*ppPrev = pTmp;
 continue;
 }
 else if ( pPage-IsEmptyPage()  !pFmtWish   //2.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits