[Libreoffice-commits] .: 2 commits - sw/source

[Libreoffice Gerrit user]

 sw/source/core/layout/trvlfrm.cxx      |    2 ++
 sw/source/ui/docvw/HeaderFooterWin.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 3ec5db65a7b1dfde8246ed9855716916d6cc468e
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Oct 5 18:20:01 2012 +0200

    SwHeaderFooterWin: check if we are on the first page
    
    Change-Id: Ib61effb43c2b029c92886319d3a96612b9732878

diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 482ec7d..6b96627 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -400,6 +400,8 @@ bool SwHeaderFooterWin::IsEmptyHeaderFooter( )
     const SwFrmFmt* pFmt = pDesc->GetLeftFmt();
     if ( GetPageFrame()->OnRightPage() )
          pFmt = pDesc->GetRightFmt();
+    if ( GetPageFrame()->OnFirstPage() )
+         pFmt = pDesc->GetFirstFmt();
 
     if ( pFmt )
     {
commit 02a934d03b101ce463a232f9cbb7b43e684de37e
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Oct 5 18:19:41 2012 +0200

    SwFrm::OnFirstPage: if there are no previous pages, we are on the first page
    
    Change-Id: I9e3a77bfeb314eb48f2a4185b8751e370357c7e0

diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 3f7cc79..7fb7d30 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1824,6 +1824,8 @@ bool SwFrm::OnFirstPage() const
             const SwPageDesc* pDesc = pPage->GetPageDesc();
             bRet = pPrevFrm->GetPageDesc() != pDesc && !pDesc->IsFirstShared();
         }
+        else
+            bRet = true;
     }
     return bRet;
 }