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

[Libreoffice Gerrit user]

 sw/inc/pagedesc.hxx            |    2 ++
 sw/source/core/doc/doclay.cxx  |    2 +-
 sw/source/core/doc/poolfmt.cxx |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d79cd86e2e2b1e6a8f94794946752909ed7e7a7f
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Aug 27 12:40:38 2012 +0200

    sw, FIRSTSHARE flag wasn't set in defaults and copied in SetUseOn
    
    Change-Id: Ib0fd2097af4f45ec838b96e8214dfe913a3b47df

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index e83452f..4e21c55 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -287,6 +287,8 @@ inline void SwPageDesc::SetUseOn( UseOnPage eNew )
         eTmp = nsUseOnPage::PD_HEADERSHARE;
     if ( eUse & nsUseOnPage::PD_FOOTERSHARE )
         eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE);
+    if ( eUse & nsUseOnPage::PD_FIRSTSHARE )
+        eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FIRSTSHARE);
     eUse = (UseOnPage) (eTmp | eNew);
 
 }
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index ccd9670..9343ef3 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1486,7 +1486,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
             aSet.Put( aLR );
             aSet.Put( aUL );
             if( pNewPgDsc )
-                pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
+                pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL | nsUseOnPage::PD_FIRSTSHARE );
         }
         break;
 
commit 61acb79808a641e49e4db3a106807045dd744704
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Aug 27 10:25:46 2012 +0200

    sw: fixed STL conversion from 1015cd4ff73ee25e55b4da8c8bc55a41e652da87
    
    Bad integer cast made reserve throw an std::length_error exception
    
    Change-Id: Iafdf859dd13e8b44ad61ee7e02eb11370f8260fb

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 5f6e55f..33e7d56 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -2053,7 +2053,7 @@ void SwDoc::SetAllUniqueFlyNames()
     if( 255 < ( n = GetSpzFrmFmts()->size() ))
         n = 255;
     SwFrmFmts aArr;
-    aArr.reserve( (sal_Int8)n );
+    aArr.reserve( n );
     SwFrmFmt* pFlyFmt;
     sal_Bool bLoadedFlag = sal_True;            // something for the Layout