[Open Office] Bug 162979 - Hang on .sxi import
Jian Hua Jiao
jjiao at novell.com
Tue Apr 25 00:08:28 EDT 2006
Patch for Bug 162979 - Hang on .sxi import
loop-layout-layact.diff patch for enhence the fault tolerent
loop-layput-swfrm.diff patch for header and footer detect and deal the
condition.
please test
Jiao Jianhua
-------------- next part --------------
--- layact.cxx.m163 2006-04-24 21:48:57.000000000 +0800
+++ layact.cxx 2006-04-25 03:21:52.000000000 +0800
@@ -2266,6 +2266,7 @@
( !bBrowse && pPage->IsInvalidLayout() ) ||
// OD 07.05.2003 #109435# - consider interrupt formatting
( IS_FLYS && IS_INVAFLY && !mbFormatCntntOnInterrupt )
+ && pCntnt->GetNextCntntFrm()
)
return FALSE;
}
-------------- next part --------------
--- wsfrm.cxx.m163 2006-04-25 03:09:50.000000000 +0800
+++ wsfrm.cxx 2006-04-25 11:34:49.000000000 +0800
@@ -517,6 +517,18 @@
return;
SwRootFrm *pRoot = (SwRootFrm*)pPage->GetUpper();
+ const SwFrm* pFrm = FindFooterOrHeader();
+ if ( IsHeaderFrm() || IsFooterFrm() )
+ {
+ if ( pFrm->GetDrawObjs() )
+ pPage->InvalidateCntnt();
+ if ( this == pFrm )
+ {
+ pRoot->SetIdleFlags();
+ return;
+ }
+ }
+
const SwFlyFrm *pFly = FindFlyFrm();
if ( IsCntntFrm() )
{
More information about the Openoffice
mailing list