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

[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 <vmiklos at 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 <vmiklos at 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.