[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 4 commits - dbaccess/Module_dbaccess.mk external/poppler sw/source

[Michael Stahl]

 dbaccess/Module_dbaccess.mk                 |    2 ++
 external/poppler/ExternalProject_poppler.mk |    1 +
 sw/source/core/txtnode/ndtxt.cxx            |   11 +++++------
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 5152c52de76bc650cceb6fcf2fce060b3e765f86
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 15 22:01:09 2014 +0100

    fdo#74981: sw: fix input field handling when splitting paragraphs
    
    The SwInputFld is copied because it doesn't have HasDummyChar() set
    although it has 2 dummy characters; TODO why is that...
    
    Change-Id: Iee91c1d0cf7a7a928e7383c1839f8192e8d4d5b0
    (cherry picked from commit a1718045bd6218e07caebda7c4cacdcb853eabd3)

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5e0fd19..db941ba 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1575,11 +1575,12 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx,
             const sal_Int32 *const pEndIdx = pHt->GetEnd();
             if ( pEndIdx && !pHt->HasDummyChar() )
             {
-                if ( ( *pEndIdx > nTxtStartIdx
-                       || ( *pEndIdx == nTxtStartIdx
-                            && nAttrStartIdx == nTxtStartIdx ) ) )
+                sal_uInt16 const nWhich = pHt->Which();
+                if (RES_TXTATR_INPUTFIELD != nWhich // fdo#74981 skip fields
+                    && (    *pEndIdx > nTxtStartIdx
+                        || (*pEndIdx == nTxtStartIdx
+                            && nAttrStartIdx == nTxtStartIdx)))
                 {
-                    sal_uInt16 const nWhich = pHt->Which();
                     if ( RES_TXTATR_REFMARK != nWhich )
                     {
                         // attribute in the area => copy
commit d1f4dc626cab09c8ab7e37f6f7b695267bef78c2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 15 21:19:01 2014 +0100

    fdo#85876: Revert "fdo#74981: cutting nothing should do nothing, ...
    
    ... should fix field dupes"
    
    This reverts commit f384598d8eec91c3c0f84a07ff3e59b8e3e13b3f.
    
    The attributes have to be copied in case splitting a paragraph creates
    an empty paragraph.
    
    Change-Id: Icd5730dd9ab8a68f737492645988a4d2f07af7a0
    (cherry picked from commit 0f78ae1ca33f83737553ad204c869a63498b7d2d)

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5b347df..5e0fd19 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2014,8 +2014,6 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
 void SwTxtNode::CutText( SwTxtNode * const pDest,
             const SwIndex & rStart, const sal_Int32 nLen )
 {
-    if(nLen == 0)
-        return;
     if(pDest)
     {
         SwIndex aDestStt(pDest, pDest->GetTxt().getLength());
commit adaf8d3b84720f3417072049d1d38c8b56c54ed4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 15 20:29:30 2014 +0100

    dbaccess: the PythonTest requires Java for hsqldb
    
    Change-Id: Idaea12aae68ad21ee06f785167cdf1867101ec4b
    (cherry picked from commit 6d8ab70f1da785767e539383087258bd666fbf62)

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 2dccdf8..5ac463a 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -69,10 +69,12 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 ))
 
 ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	PythonTest_dbaccess_python \
 ))
 endif
+endif
 
 endif
 
commit 35aab33a864cc98dd186ad6842ab366fd66b5d96
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 15 17:42:45 2014 +0100

    poppler: let's disable Qt5 too
    
    Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7
    (cherry picked from commit aaf717a8fad0b097b84cbd803acea1330bd925a5)

diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk
index 5d9c56b..278807e 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,poppler,build) :
 			--disable-cairo-output \
 			--disable-poppler-glib \
 			--disable-poppler-qt4 \
+			--disable-poppler-qt5 \
 			--disable-gtk-test \
 			--disable-utils \
 			--disable-cms \