configure.ac | 9 +++++---- sw/qa/core/data/ww8/fail/forcepoint-44.doc |binary sw/source/core/layout/pagechg.cxx | 4 ++-- sw/source/filter/xml/xmlbrsh.cxx | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-)
New commits: commit 6ed498a71482109fea731bb84f288f978bea12dc Author: Caolán McNamara <[email protected]> AuthorDate: Tue Sep 18 12:50:33 2018 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Nov 8 18:01:05 2018 +0100 tdf#118820 fix table background fill Change-Id: I50a65d56251f978785fa446515cb374167c604e8 Reviewed-on: https://gerrit.libreoffice.org/60682 Tested-by: Jenkins Tested-by: Xisco Faulí <[email protected]> Reviewed-by: Xisco Faulí <[email protected]> (cherry picked from commit 65d727548740afae7175fb04a12f50e119514497) Reviewed-on: https://gerrit.libreoffice.org/62513 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index c9ed33c53dc7..aebefd159b8f 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -135,10 +135,14 @@ void SwXMLBrushItemImportContext::EndElement() m_xGraphic = GetImport().loadGraphicFromBase64(m_xBase64Stream); m_xBase64Stream = nullptr; } + if (m_xGraphic.is()) { Graphic aGraphic(m_xGraphic); + SvxGraphicPosition eOldGraphicPos = pItem->GetGraphicPos(); pItem->SetGraphic(aGraphic); + if (GPOS_NONE == eOldGraphicPos && GPOS_NONE != pItem->GetGraphicPos()) + pItem->SetGraphicPos(GPOS_TILED); } if (!(pItem->GetGraphic())) commit 8e5bbad9800eb9a2e2f1a17cc372d1a8bcc80498 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Nov 2 10:52:42 2018 +0000 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Nov 8 17:58:57 2018 +0100 ENABLE_FIREBIRD_SDBC no defined in system-firebird case Change-Id: Ibfd5c7f0eb931faf00e40d349176237c12bfbdbf Reviewed-on: https://gerrit.libreoffice.org/62778 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/configure.ac b/configure.ac index df9441656bfe..dd0fd29c0753 100644 --- a/configure.ac +++ b/configure.ac @@ -8687,7 +8687,7 @@ AC_SUBST(POSTGRESQL_LIB) dnl =================================================================== dnl Check for Firebird stuff dnl =================================================================== -ENABLE_FIREBIRD_SDBC="" +ENABLE_FIREBIRD_SDBC= if test "$enable_firebird_sdbc" = "yes" ; then SCPDEFS="$SCPDEFS -DWITH_FIREBIRD_SDBC" @@ -8735,7 +8735,8 @@ int fb_api_is_30(void) { return 0; } #endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 3.0.x is installed])) CFLAGS="${__save_CFLAGS}" fi - ENABLE_FIREBIRD_SDBC="TRUE" + ENABLE_FIREBIRD_SDBC=TRUE + AC_DEFINE([ENABLE_FIREBIRD_SDBC],1) elif test "$enable_database_connectivity" != yes; then AC_MSG_RESULT([none]) elif test "$cross_compiling" = "yes"; then @@ -8781,8 +8782,8 @@ int fb_api_is_30(void) { return 0; } fi BUILD_TYPE="$BUILD_TYPE FIREBIRD" - ENABLE_FIREBIRD_SDBC="TRUE" - AC_DEFINE(ENABLE_FIREBIRD_SDBC) + ENABLE_FIREBIRD_SDBC=TRUE + AC_DEFINE([ENABLE_FIREBIRD_SDBC],1) fi fi AC_SUBST(ENABLE_FIREBIRD_SDBC) commit ba4861a0dfdf97448925130995d69b4c516f0644 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jun 5 21:37:00 2018 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Nov 8 17:58:26 2018 +0100 tdf#121005 forcepoint#44 merge into isDeleteForbidden Reviewed-on: https://gerrit.libreoffice.org/55355 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit c6222fb6b8b429fa2e767c73ad616147f95ab1b9) Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32 Reviewed-on: https://gerrit.libreoffice.org/62629 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/qa/core/data/ww8/fail/forcepoint-44.doc b/sw/qa/core/data/ww8/fail/forcepoint-44.doc new file mode 100644 index 000000000000..100422a2249c Binary files /dev/null and b/sw/qa/core/data/ww8/fail/forcepoint-44.doc differ diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index ac6c74f4fc57..f3b80311c52f 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -1238,6 +1238,8 @@ namespace { bool isDeleteForbidden(const SwPageFrame *pDel) { + if (pDel->IsDeleteForbidden()) + return true; const SwLayoutFrame* pBody = pDel->FindBodyCont(); const SwFrame* pBodyContent = pBody ? pBody->Lower() : nullptr; return pBodyContent && pBodyContent->IsDeleteForbidden(); @@ -1265,8 +1267,6 @@ namespace !pSibling->FindFirstBodyContent() && (!pRefPage || !isDeleteForbidden(pSibling)) ) { - if (pSibling->IsDeleteForbidden()) - throw uno::RuntimeException("bad layout"); pRoot->RemovePage( pRefSibling, SwRemoveResult::Next ) ; return false; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
